@@ -87,7 +87,7 @@ ClassMethod export(generated = 0, system = 0, percent = 0, mapped = 0, mask = ""
87
87
}
88
88
89
89
/// import all from workdir
90
- ClassMethod import (filemask = " *.* " , qspec = " cku-d" , ByRef err = " " , recurse = 1 , ByRef loaded = " " , verbose = 1 ) As %Status
90
+ ClassMethod import (filemask = " *.xml;*.cls;*.mac;*.int;*.inc;*.dfi " , qspec = " cku-d" , ByRef err = " " , recurse = 1 , ByRef loaded = " " , verbose = 1 ) As %Status
91
91
{
92
92
#define push (%dir ) s dirs ( $i ( dirs ) ) = %dir
93
93
#define next (%i,%dir ) s %i =$o ( dirs ( " " ), 1 , %dir ) k :%i '=" " dirs (%i )
@@ -124,11 +124,20 @@ ClassMethod import(filemask = "*.*", qspec = "cku-d", ByRef err = "", recurse =
124
124
125
125
}
126
126
// compile all the loaded classes to obey dependencies
127
- s sc =$system .OBJ .CompileList ( .loaded , " ckbr -d/multicompile" ,.err )
127
+ s sc =$system .OBJ .CompileList ( .loaded , " cukbr -d/multicompile" ,.err )
128
128
129
129
}
130
+
130
131
if verbose {
131
- if $D (err ) zw err
132
+
133
+ if $D (err ) {
134
+ s i =$Order (err (" " ))
135
+ while i '=" " {
136
+ w !,err (i )
137
+ s i =$O (err (i ))
138
+ }
139
+ }
140
+
132
141
w !,!," #; Imported from " , ..workdir ()
133
142
}
134
143
Q sc
@@ -213,6 +222,8 @@ ClassMethod filename(code)
213
222
}
214
223
215
224
s filename = ##class (%File ).NormalizeFilename ( code , wd )
225
+ #; lowercase file extension
226
+ s $p (filename ," ." ,*)=ext
216
227
//B:code="DPRep.Rest.JSON.cls" "L"
217
228
#; for *.cls Package.Subpackage.ClassName.cls -> Folder/Subfolder/ClassName.cls
218
229
if ext =" cls" {
0 commit comments