pinokiod 3.3.15 → 3.3.16
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 +11 -0
- package/kernel/shell.js +1 -1
- package/package.json +1 -1
package/kernel/bin/vs.js
CHANGED
|
@@ -134,6 +134,17 @@ class VS {
|
|
|
134
134
|
if (paths.CMAKE_PATH) env.PATH = env.PATH.concat(paths.CMAKE_PATH)
|
|
135
135
|
if (paths.CL_PATH) env.PATH = env.PATH.concat(paths.CL_PATH)
|
|
136
136
|
|
|
137
|
+
let build_paths = paths.BUILD_PATH
|
|
138
|
+
// look for vcvarsall
|
|
139
|
+
for(let p of build_paths) {
|
|
140
|
+
const e = await this.kernel.bin.exists(p)
|
|
141
|
+
if (e) {
|
|
142
|
+
let vcvars_path = path.resolve(p, "vcvarsall.exe")
|
|
143
|
+
env.VCVARSALL_PATH = vcvars_path
|
|
144
|
+
break
|
|
145
|
+
}
|
|
146
|
+
}
|
|
147
|
+
|
|
137
148
|
// const clpaths = await glob('**/bin/Hostx64/x64/cl.exe', { cwd: paths.MSVC_PATH })
|
|
138
149
|
// if (clpaths && clpaths.length > 0) {
|
|
139
150
|
// let win_cl_path = path.resolve(paths.MSVC_PATH, path.dirname(clpaths[0]))
|
package/kernel/shell.js
CHANGED
|
@@ -690,7 +690,7 @@ class Shell {
|
|
|
690
690
|
}
|
|
691
691
|
|
|
692
692
|
if (arg) {
|
|
693
|
-
let vcvars_path =
|
|
693
|
+
let vcvars_path = this.kernel.bin.vs_path_env.VCVARSALL_PATH
|
|
694
694
|
console.log({ arg, vcvars_path })
|
|
695
695
|
conda_activation.push(`${vcvars_path} ${arg} > nul 2>&1`)
|
|
696
696
|
}
|