pinokiod 3.3.13 → 3.3.15

package/kernel/shell.js

@@ -657,40 +657,46 @@ class Shell {
 
 
     if (this.platform === "win32") {
-      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}`)
-      }
+      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}`)
+        }
 
-      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) {
+          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`)
+        }
+        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.13",
+  "version": "3.3.15",
   "description": "",
   "main": "index.js",
   "scripts": {