Skip to content

Commit f8a161f

Browse files
authored
Merge pull request #333 from worldbank/v7.2
Merging V7.2 to main
2 parents 903b2d8 + b6e45e9 commit f8a161f

27 files changed

+196
-121
lines changed

run/ieboilstart.do

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,28 @@
22

33
global rieboil "${runoutput}/ieboilstart"
44

5-
//cap which iefieldkit
6-
//if _rc == 111 ssc install iefieldkit
7-
85
* Load the command from file and utils
96
qui do "${ietoolkit_clone}/src/ado_files/ieboilstart.ado"
107
qui do "${ietoolkit_clone}/src/ado_files/ietoolkit.ado"
118

9+
10+
* Testing old "default" syntax
11+
cap ieboilstart , version(13.1) adopath("${rieboil}/ado1")
12+
assert _rc == 198
13+
14+
* Load the command from file and utils
15+
qui do "${ietoolkit_clone}/src/ado_files/ieboilstart.ado"
16+
qui do "${ietoolkit_clone}/src/ado_files/ietoolkit.ado"
17+
1218
* Set PERSONAL path
13-
ieboilstart , version(13.1) adopath("${rieboil}/ado1")
19+
ieboilstart , version(13.1) adopath("${rieboil}/ado1", nostrict)
1420
`r(version)'
1521

1622
*Test mock command in this ado path
1723
ado1
1824

25+
* NOTE THAT THIS LINE WILL CAUSE AN ERROR IF THIS RUN FILE IS RAN TWICE
26+
* WITHOUT RESTARTING STATA INBETWEEN
1927
iefieldkit
2028

2129

src/ado_files/iebaltab.ado

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*! version 7.1 19JAN2023 DIME Analytics dimeanalytics@worldbank.org
1+
*! version 7.2 04APR2023 DIME Analytics dimeanalytics@worldbank.org
22

33
capture program drop iebaltab,
44
program define iebaltab, rclass

src/ado_files/ieboilstart.ado

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*! version 7.1 19JAN2023 DIME Analytics dimeanalytics@worldbank.org
1+
*! version 7.2 04APR2023 DIME Analytics dimeanalytics@worldbank.org
22

33
capture program drop ieboilstart
44
program ieboilstart , rclass
@@ -78,8 +78,14 @@
7878
local apath = trim("`apath'")
7979
local aoption = trim(subinstr("`aoption'",",","",1))
8080
81-
if !missing("`aoption'") & "`aoption'" != "strict" {
82-
noi di as error `"{phang}The suboption [`aoption'] in the option [`adopath'] is not a valid suboption. See help file for more details.{p_end}"'
81+
if missing("`aoption'") | !inlist("`aoption'", "strict", "nostrict") {
82+
if missing("`aoption'") {
83+
local aopterr `"You did not provide any sub-option."'
84+
}
85+
else {
86+
local aopterr `"You provided the sub-option [`aoption']."'
87+
}
88+
noi di as error `"{phang}The option [`adopath'] requires one of the sub-options [strict] or [nostrict]. `aopterr' See help file for more details.{p_end}"'
8389
error 198
8490
}
8591
@@ -106,6 +112,9 @@
106112
if _rc local morepaths 0
107113
}
108114
115+
* Update the paths where mata search for commands to mirror adopath
116+
mata: mata mlib index
117+
109118
local aoutput `"`aoutput'PLUS adopath was set to [`apath']. All adopaths other than this and BASE have been removed. Only programs and ado-files in this PLUS folder are accessible to Stata until the end of this session."'
110119
}
111120
else {

src/ado_files/ieddtab.ado

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*! version 7.1 19JAN2023 DIME Analytics dimeanalytics@worldbank.org
1+
*! version 7.2 04APR2023 DIME Analytics dimeanalytics@worldbank.org
22

33
cap program drop ieddtab
44
program define ieddtab, rclass

src/ado_files/iedorep.ado

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*! version 7.1 19JAN2023 DIME Analytics dimeanalytics@worldbank.org
1+
*! version 7.2 04APR2023 DIME Analytics dimeanalytics@worldbank.org
22

33
cap program drop iedorep
44
program define iedorep, rclass

src/ado_files/iedropone.ado

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*! version 7.1 19JAN2023 DIME Analytics dimeanalytics@worldbank.org
1+
*! version 7.2 04APR2023 DIME Analytics dimeanalytics@worldbank.org
22

33
capture program drop iedropone
44
program define iedropone ,

src/ado_files/iefolder.ado

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*! version 7.1 19JAN2023 DIME Analytics dimeanalytics@worldbank.org
1+
*! version 7.2 04APR2023 DIME Analytics dimeanalytics@worldbank.org
22

33
cap program drop iefolder
44
program define iefolder

src/ado_files/iegitaddmd.ado

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*! version 7.1 19JAN2023 DIME Analytics dimeanalytics@worldbank.org
1+
*! version 7.2 04APR2023 DIME Analytics dimeanalytics@worldbank.org
22

33
cap program drop iegitaddmd
44
program define iegitaddmd

src/ado_files/iegraph.ado

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*! version 7.1 19JAN2023 DIME Analytics dimeanalytics@worldbank.org
1+
*! version 7.2 04APR2023 DIME Analytics dimeanalytics@worldbank.org
22

33
cap program drop iegraph
44
program define iegraph, rclass

src/ado_files/iekdensity.ado

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*! version 7.1 19JAN2023 DIME Analytics dimeanalytics@worldbank.org
1+
*! version 7.2 04APR2023 DIME Analytics dimeanalytics@worldbank.org
22

33
cap prog drop iekdensity
44
prog define iekdensity

0 commit comments

Comments
 (0)