pinokiod 3.3.22 → 3.3.25

package/kernel/bin/vs.js

@@ -50,6 +50,39 @@ class VS {
           break;  
         }
       }
+
+
+      /*
+      Example:
+      {
+        ROOT_PATH: "C:\Program Files (x86)\Microsoft Visual Studio"
+      },
+      {
+        MSVC_PATH: [
+          'C:\\Program Files (x86)\\Microsoft Visual Studio\\2022\\BuildTools\\VC\\Tools\\MSVC',
+          'C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\BuildTools\\VC\\Tools\\MSVC'
+        ]
+      }
+      {
+        BUILD_PATH: [
+          'C:\\Program Files (x86)\\Microsoft Visual Studio\\2022\\BuildTools\\VC\\Auxiliary\\Build',
+          'C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\BuildTools\\VC\\Auxiliary\\Build'
+        ]
+      }
+      {
+        CMAKE_PATH: [
+          'C:\\Program Files (x86)\\Microsoft Visual Studio\\2022\\BuildTools\\Common7\\IDE\\CommonExtensions\\Microsoft\\CMake\\CMake\\bin',
+          'C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\BuildTools\\Common7\\IDE\\CommonExtensions\\Microsoft\\CMake\\CMake\\bin'
+        ]
+      }
+      {
+        CL_PATH: [
+          'C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\BuildTools\\VC\\Tools\\MSVC\\14.29.30133\\bin\\Hostx64\\x64',
+          'C:\\Program Files (x86)\\Microsoft Visual Studio\\2022\\BuildTools\\VC\\Tools\\MSVC\\14.42.34433\\bin\\Hostx64\\x64'
+        ]
+      }
+      */
+
     }
     console.log({ MSVC_PATH, BUILD_PATH, CMAKE_PATH, CL_PATH })
     return {
@@ -117,7 +150,6 @@ class VS {
 //
 //  }
   async init() {
-    console.log("############################################ vs")
     if (this.kernel.platform === "win32") {
       let paths = await this.getpaths()
 
@@ -134,14 +166,38 @@ 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)
 
+      /*
+      {
+        BUILD_PATH: [
+          'C:\\Program Files (x86)\\Microsoft Visual Studio\\2022\\BuildTools\\VC\\Auxiliary\\Build',
+          'C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\BuildTools\\VC\\Auxiliary\\Build'
+        ]
+      }
+      */
+
       let build_paths = paths.BUILD_PATH
       // look for vcvarsall
+      // try to use 2019 first
       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
+        if (/.*2019.*/.test(p)) {
+          const e = await this.kernel.bin.exists(p)
+          if (e) {
+            let vcvars_path = path.resolve(p, "vcvarsall.bat")
+            env.VCVARSALL_PATH = vcvars_path
+            break
+          }
+        }
+      }
+
+      // only if 2019 doesn't exist try others
+      if (!env.VCVARSALL_PATH) {
+        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
+          }
         }
       }
 

package/kernel/shell.js

@@ -662,11 +662,9 @@ class Shell {
     if (this.platform === "win32") {
       try {
         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
@@ -688,15 +686,13 @@ class Shell {
           }
 
           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 env doesnt exist')
         }
       } catch (e) {
-        console.log('vc vars setup', 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.22",
+  "version": "3.3.25",
   "description": "",
   "main": "index.js",
   "scripts": {

package/server/views/editor.ejs

@@ -46,8 +46,20 @@ body.frozen {
 .xterm {
   height: 100%;
 }
+.containers main {
+  height: 100%;
+  width: 100%;
+}
+.containers.running main {
+  height: 50%;
+  width: 100%;
+}
+.containers {
+  display: block;
+}
 .containers .terminal-container {
-  height: auto !important;
+  height: 50%;
+  width: 100%;
 }
 #table > table {
   border-left: 2px solid black;
@@ -212,7 +224,6 @@ document.addEventListener("DOMContentLoaded", async () => {
       document.querySelector(".run .starting").classList.add("hidden")
     }
     stop() {
-      debugger;
       this.socket.run({
         method: "kernel.api.stop",
         params: {
@@ -226,7 +237,6 @@ document.addEventListener("DOMContentLoaded", async () => {
       return new Promise((resolve, reject) => {
         let cwd = "<%=execUrl%>"
         //let cwd = "~" + location.pathname
-        debugger
         this.socket.close()
         this.socket.run({
           method: "fs.write",
@@ -249,7 +259,7 @@ document.addEventListener("DOMContentLoaded", async () => {
         await this.socket.close()
 //        document.querySelector(".terminal-container").classList.add("hidden")
         let query = Object.fromEntries(new URLSearchParams(location.search))
-        document.querySelector(".containers").classList.add("running")
+//        document.querySelector(".containers").classList.add("running")
 
 
         this.socket.run({
@@ -476,7 +486,6 @@ document.addEventListener("DOMContentLoaded", async () => {
               text: `${packet.data}`,
             })
           } else if (packet.type === "error") {
-            debugger
 //            n.Noty({
 //              text: `${packet.data}`,
 //              type: "error"
@@ -878,7 +887,7 @@ const reloadMemory = async () => {
         </div>
       </div>
     <% } else { %>
-      <div class='containers running'>
+      <div class='containers'>
         <main>
           <!--
           <pre id='response'></pre>