pinokiod 3.3.27 → 3.3.29
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 +22 -2
- package/package.json +1 -1
package/kernel/bin/vs.js
CHANGED
|
@@ -38,14 +38,33 @@ class VS {
|
|
|
38
38
|
if (e1) {
|
|
39
39
|
console.log("exists", ROOT_PATH)
|
|
40
40
|
MSVC_PATH = await glob('**/VC/Tools/MSVC', { absolute: true, cwd: ROOT_PATH })
|
|
41
|
-
if (MSVC_PATH.length > 0) {
|
|
41
|
+
if (MSVC_PATH && MSVC_PATH.length > 0) {
|
|
42
|
+
// look for 2019 only
|
|
43
|
+
MSVC_PATH = MSVC_PATH.filter((x) => {
|
|
44
|
+
return /.*2019.*/.test(x)
|
|
45
|
+
})
|
|
42
46
|
console.log({ MSVC_PATH })
|
|
43
47
|
BUILD_PATH = await glob('**/VC/Auxiliary/Build', { absolute: true, cwd: ROOT_PATH })
|
|
48
|
+
if (BUILD_PATH && BUILD_PATH.length > 0) {
|
|
49
|
+
BUILD_PATH = BUILD_PATH.filter((x) => {
|
|
50
|
+
return /.*2019.*/.test(x)
|
|
51
|
+
})
|
|
52
|
+
}
|
|
44
53
|
console.log({ BUILD_PATH })
|
|
45
54
|
CMAKE_PATH = await glob('**/Microsoft/CMake/CMake/bin', { absolute: true, cwd: ROOT_PATH })
|
|
55
|
+
if (CMAKE_PATH && CMAKE_PATH.length > 0) {
|
|
56
|
+
CMAKE_PATH = CMAKE_PATH.filter((x) => {
|
|
57
|
+
return /.*2019.*/.test(x)
|
|
58
|
+
})
|
|
59
|
+
}
|
|
46
60
|
console.log({ CMAKE_PATH })
|
|
47
61
|
//CL_PATH = await glob('**/Hostx64/x64/cl.exe', { absolute: true, cwd: ROOT_PATH })
|
|
48
62
|
CL_PATH = await glob('**/Hostx64/x64', { absolute: true, cwd: ROOT_PATH })
|
|
63
|
+
if (CL_PATH && CL_PATH.length > 0) {
|
|
64
|
+
CL_PATH = CL_PATH.filter((x) => {
|
|
65
|
+
return /.*2019.*/.test(x)
|
|
66
|
+
})
|
|
67
|
+
}
|
|
49
68
|
console.log({ CL_PATH })
|
|
50
69
|
break;
|
|
51
70
|
}
|
|
@@ -230,7 +249,8 @@ class VS {
|
|
|
230
249
|
async installed() {
|
|
231
250
|
if (this.kernel.platform === "win32") {
|
|
232
251
|
let paths = await this.getpaths()
|
|
233
|
-
|
|
252
|
+
console.log("VS INSTALLED CHECK", paths)
|
|
253
|
+
return paths.MSVC_PATH && paths.MSVC_PATH.length > 0 && paths.BUILD_PATH && paths.BUILD_PATH.length > 0 && paths.CMAKE_PATH && paths.CMAKE_PATH.length > 0
|
|
234
254
|
}
|
|
235
255
|
}
|
|
236
256
|
|