pinokiod 3.3.7 → 3.3.9
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/api/fs/index.js +2 -1
- package/kernel/bin/vs.js +3 -1
- package/kernel/index.js +1 -1
- package/kernel/shell.js +10 -9
- package/package.json +1 -1
package/kernel/api/fs/index.js
CHANGED
|
@@ -280,7 +280,8 @@ class FS {
|
|
|
280
280
|
} else if (res[name].vcs_info) {
|
|
281
281
|
let info = res[name].vcs_info
|
|
282
282
|
log(["> VCS: ", { url, info }], ondata)
|
|
283
|
-
|
|
283
|
+
let id = info.commit_id || info.requested_revision
|
|
284
|
+
namespace = `${name}/${version}-${info.vcs}-${id.slice(0, 4)}`
|
|
284
285
|
} else if (res[name].dir_info) {
|
|
285
286
|
let info = res[name].dir_info
|
|
286
287
|
log(["> Directory: ", { url, info }], ondata)
|
package/kernel/bin/vs.js
CHANGED
|
@@ -44,7 +44,8 @@ class VS {
|
|
|
44
44
|
console.log({ BUILD_PATH })
|
|
45
45
|
CMAKE_PATH = await glob('**/Microsoft/CMake/CMake/bin', { absolute: true, cwd: ROOT_PATH })
|
|
46
46
|
console.log({ CMAKE_PATH })
|
|
47
|
-
CL_PATH = await glob('**/Hostx64/x64/cl.exe', { absolute: true, cwd: ROOT_PATH })
|
|
47
|
+
//CL_PATH = await glob('**/Hostx64/x64/cl.exe', { absolute: true, cwd: ROOT_PATH })
|
|
48
|
+
CL_PATH = await glob('**/Hostx64/x64', { absolute: true, cwd: ROOT_PATH })
|
|
48
49
|
console.log({ CL_PATH })
|
|
49
50
|
break;
|
|
50
51
|
}
|
|
@@ -116,6 +117,7 @@ class VS {
|
|
|
116
117
|
//
|
|
117
118
|
// }
|
|
118
119
|
async init() {
|
|
120
|
+
console.log("############################################ vs")
|
|
119
121
|
if (this.kernel.platform === "win32") {
|
|
120
122
|
let paths = await this.getpaths()
|
|
121
123
|
|
package/kernel/index.js
CHANGED
package/kernel/shell.js
CHANGED
|
@@ -656,15 +656,16 @@ class Shell {
|
|
|
656
656
|
// }
|
|
657
657
|
|
|
658
658
|
|
|
659
|
-
|
|
660
|
-
|
|
661
|
-
|
|
662
|
-
|
|
663
|
-
|
|
664
|
-
|
|
665
|
-
|
|
666
|
-
|
|
667
|
-
|
|
659
|
+
if (this.platform === "win32") {
|
|
660
|
+
const vs_path_env = this.kernel.bin.vs_path_env
|
|
661
|
+
console.log({ vs_path_env })
|
|
662
|
+
if (vs_path_env && vs_path_env.PATH) {
|
|
663
|
+
this.env.VS_RELATED_PATHS = `${vs_path_env.PATH.join(path.delimiter)}${path.delimiter}`
|
|
664
|
+
const vs = `set PATH=%VS_RELATED_PATHS${path.delimiter}%PATH%`
|
|
665
|
+
console.log({ vs })
|
|
666
|
+
conda_activation.push(vs)
|
|
667
|
+
}
|
|
668
|
+
}
|
|
668
669
|
|
|
669
670
|
|
|
670
671
|
// Update env setting
|