pinokiod 3.3.15 → 3.3.17

package/kernel/bin/vs.js

@@ -134,6 +134,17 @@ class VS {
       if (paths.CMAKE_PATH) env.PATH = env.PATH.concat(paths.CMAKE_PATH)
       if (paths.CL_PATH) env.PATH = env.PATH.concat(paths.CL_PATH)
 
+      let build_paths = paths.BUILD_PATH
+      // look for vcvarsall
+      for(let p of build_paths) {
+        const e = await this.kernel.bin.exists(p)
+        if (e) {
+          let vcvars_path = path.resolve(p, "vcvarsall.bat")
+          env.VCVARSALL_PATH = vcvars_path
+          break
+        }
+      }
+
 //      const clpaths = await glob('**/bin/Hostx64/x64/cl.exe', { cwd: paths.MSVC_PATH })
 //      if (clpaths && clpaths.length > 0) {
 //        let win_cl_path = path.resolve(paths.MSVC_PATH, path.dirname(clpaths[0]))

package/kernel/shell.js

@@ -658,43 +658,48 @@ class Shell {
 
     if (this.platform === "win32") {
       try {
-        const architecture = os.arch().toLowerCase();  // 'x64', 'ia32' (32-bit), etc.
-        const armArchitecture = process.arch.toLowerCase(); // For ARM-based architectures (on Windows), process.arch might be 'arm64', 'arm', etc.
-        console.log({ architecture, armArchitecture })
-
-        // Map architectures to vcvarsall.bat argument
-        let arg
-        if (architecture === 'x64' || armArchitecture === 'arm64') {
-          arg = 'x64';  // 64-bit architecture
-        } else if (architecture === 'ia32' || armArchitecture === 'arm') {
-          arg = 'x86';  // 32-bit architecture
-        } else if (armArchitecture === 'amd64_arm') {
-          arg = 'amd64_arm';  // ARM-specific 64-bit
-        } else if (armArchitecture === 'x86_arm') {
-          arg = 'x86_arm';  // ARM-based 32-bit
-        }
-        if (architecture === 'x64' || armArchitecture === 'arm64') {
-          arg = 'amd64';  // Native 64-bit architecture
-        } else if (architecture === 'ia32' || armArchitecture === 'arm') {
-          arg = 'x86';    // Native 32-bit architecture
-        } else if (armArchitecture === 'x86_arm64') {
-          arg = 'x86_arm64';  // ARM64 on x86
-        } else if (armArchitecture === 'x86_arm') {
-          arg = 'x86_arm';    // ARM on x86
-        } else if (armArchitecture === 'amd64_arm64') {
-          arg = 'amd64_arm64'; // ARM64 on x64
-        } else if (armArchitecture === 'amd64_arm') {
-          arg = 'amd64_arm';   // ARM on x64
-        } else {
-          console.log(`Unsupported arch: os.arch()=${architecture}, process.arch=${armArchitecture}`)
-        }
+        let vcvars_path = this.kernel.bin.vs_path_env.VCVARSALL_PATH
+        console.log({ vcvars_path })
+        if (vcvars_path) {
+          const architecture = os.arch().toLowerCase();  // 'x64', 'ia32' (32-bit), etc.
+          const armArchitecture = process.arch.toLowerCase(); // For ARM-based architectures (on Windows), process.arch might be 'arm64', 'arm', etc.
+          console.log({ architecture, armArchitecture })
+
+          // Map architectures to vcvarsall.bat argument
+          let arg
+          if (architecture === 'x64' || armArchitecture === 'arm64') {
+            arg = 'x64';  // 64-bit architecture
+          } else if (architecture === 'ia32' || armArchitecture === 'arm') {
+            arg = 'x86';  // 32-bit architecture
+          } else if (armArchitecture === 'amd64_arm') {
+            arg = 'amd64_arm';  // ARM-specific 64-bit
+          } else if (armArchitecture === 'x86_arm') {
+            arg = 'x86_arm';  // ARM-based 32-bit
+          }
+          if (architecture === 'x64' || armArchitecture === 'arm64') {
+            arg = 'amd64';  // Native 64-bit architecture
+          } else if (architecture === 'ia32' || armArchitecture === 'arm') {
+            arg = 'x86';    // Native 32-bit architecture
+          } else if (armArchitecture === 'x86_arm64') {
+            arg = 'x86_arm64';  // ARM64 on x86
+          } else if (armArchitecture === 'x86_arm') {
+            arg = 'x86_arm';    // ARM on x86
+          } else if (armArchitecture === 'amd64_arm64') {
+            arg = 'amd64_arm64'; // ARM64 on x64
+          } else if (armArchitecture === 'amd64_arm') {
+            arg = 'amd64_arm';   // ARM on x64
+          } else {
+            console.log(`Unsupported arch: os.arch()=${architecture}, process.arch=${armArchitecture}`)
+          }
 
-        if (arg) {
-          let vcvars_path = path.resolve(this.kernel.bin.vs_path_env.BUILD_PATH, "vcvarsall.exe")
-          console.log({ arg, vcvars_path })
-          conda_activation.push(`${vcvars_path} ${arg} > nul 2>&1`)
+          if (arg) {
+            console.log({ arg, vcvars_path })
+            conda_activation.push(`${vcvars_path} ${arg} > nul 2>&1`)
+          }
+          console.log('vc vars setup successful')
+        } else {
+          console.log('vc vars env doesnt exist')
         }
-        console.log('vc vars setup successful')
       } catch (e) {
         console.log('vc vars setup', e)
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pinokiod",
-  "version": "3.3.15",
+  "version": "3.3.17",
   "description": "",
   "main": "index.js",
   "scripts": {