pinokiod 3.3.14 → 3.3.16

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.exe")
+          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

@@ -660,6 +660,7 @@ class Shell {
       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
@@ -689,11 +690,13 @@ class Shell {
         }
 
         if (arg) {
-          let vcvars_path = path.resolve(this.kernel.bin.vs_path_env.BUILD_PATH, "vcvarsall.exe")
+          let vcvars_path = this.kernel.bin.vs_path_env.VCVARSALL_PATH
           console.log({ arg, vcvars_path })
           conda_activation.push(`${vcvars_path} ${arg} > nul 2>&1`)
         }
+        console.log('vc vars setup successful')
       } catch (e) {
+        console.log('vc vars setup', e)
       }
 
 //      const vs_path_env = this.kernel.bin.vs_path_env

package/package.json

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