pinokiod 3.3.25 → 3.3.26
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/kernel/bin/vs.js +15 -4
- package/kernel/shell.js +1 -1
- package/package.json +1 -1
package/kernel/bin/vs.js
CHANGED
|
@@ -181,10 +181,15 @@ class VS {
|
|
|
181
181
|
for(let p of build_paths) {
|
|
182
182
|
if (/.*2019.*/.test(p)) {
|
|
183
183
|
const e = await this.kernel.bin.exists(p)
|
|
184
|
+
console.log(">1 e", {e, p})
|
|
184
185
|
if (e) {
|
|
185
186
|
let vcvars_path = path.resolve(p, "vcvarsall.bat")
|
|
186
|
-
|
|
187
|
-
|
|
187
|
+
const e2 = await this.kernel.bin.exists(vcvars_path)
|
|
188
|
+
console.log(">1 e2", e2)
|
|
189
|
+
if (e2) {
|
|
190
|
+
env.VCVARSALL_PATH = vcvars_path
|
|
191
|
+
break
|
|
192
|
+
}
|
|
188
193
|
}
|
|
189
194
|
}
|
|
190
195
|
}
|
|
@@ -193,13 +198,19 @@ class VS {
|
|
|
193
198
|
if (!env.VCVARSALL_PATH) {
|
|
194
199
|
for(let p of build_paths) {
|
|
195
200
|
const e = await this.kernel.bin.exists(p)
|
|
201
|
+
console.log(">2 e", { e, p})
|
|
196
202
|
if (e) {
|
|
197
203
|
let vcvars_path = path.resolve(p, "vcvarsall.bat")
|
|
198
|
-
|
|
199
|
-
|
|
204
|
+
const e2 = await this.kernel.bin.exists(vcvars_path)
|
|
205
|
+
console.log(">2 e2", e2)
|
|
206
|
+
if (e2) {
|
|
207
|
+
env.VCVARSALL_PATH = vcvars_path
|
|
208
|
+
break
|
|
209
|
+
}
|
|
200
210
|
}
|
|
201
211
|
}
|
|
202
212
|
}
|
|
213
|
+
console.log(">>> env", env)
|
|
203
214
|
|
|
204
215
|
// const clpaths = await glob('**/bin/Hostx64/x64/cl.exe', { cwd: paths.MSVC_PATH })
|
|
205
216
|
// if (clpaths && clpaths.length > 0) {
|
package/kernel/shell.js
CHANGED