pinokiod 3.3.12 → 3.3.14

package/kernel/bin/vs.js

@@ -125,7 +125,8 @@ class VS {
         PATH: [
 //          "C:\\Windows\\System32",
           "C:\\Windows\\System32\\WindowsPowerShell\\v1.0",
-        ]
+        ],
+        BUILD_PATH: paths.BUILD_PATH
       }
 
       if (paths.MSVC_PATH) env.PATH = env.PATH.concat(paths.MSVC_PATH)

package/kernel/shell.js

@@ -657,14 +657,53 @@ class Shell {
 
 
     if (this.platform === "win32") {
-      const vs_path_env = this.kernel.bin.vs_path_env
-      console.log({ vs_path_env })
-      if (vs_path_env && vs_path_env.PATH) {
-        this.env.VS_RELATED_PATHS = `${vs_path_env.PATH.join(path.delimiter)}${path.delimiter}`
-        const vs = `set PATH=%VS_RELATED_PATHS%${path.delimiter}%PATH%`
-        console.log({ vs })
-        conda_activation.push(vs)
+      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.
+
+        // 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`)
+        }
+      } catch (e) {
       }
+
+//      const vs_path_env = this.kernel.bin.vs_path_env
+//      console.log({ vs_path_env })
+//      if (vs_path_env && vs_path_env.PATH) {
+//        this.env.VS_RELATED_PATHS = `${vs_path_env.PATH.join(path.delimiter)}${path.delimiter}`
+//        const vs = `set PATH=%VS_RELATED_PATHS%${path.delimiter}%PATH%`
+//        console.log({ vs })
+//        conda_activation.push(vs)
+//      }
     }
 
 

package/package.json

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