Various Windows fixes

Author: cknitt

scripts/buildocaml.js

@@ -58,7 +58,7 @@ function build(config) {
   if (config) {
     var { make } = require("./config.js");
     cp.execSync(
-      './configure  --disable-naked-pointers --enable-flambda -prefix ' +
+      "bash ./configure --disable-naked-pointers --enable-flambda -prefix " +
         prefix +
         ` && ${make} clean`,
       { cwd: ocamlSrcDir, stdio: [0, 1, 2] }

scripts/ciTest.js

@@ -93,7 +93,7 @@ function runTests() {
       }
     );
 
-    cp.execSync(`./test.exe`, { cwd: binDir, stdio: [0, 1, 2] });
+    cp.execSync(path.join(binDir, 'test.exe'), { cwd: binDir, stdio: [0, 1, 2] });
   }
 
   // running generated js tests

scripts/install.js

@@ -30,6 +30,7 @@ var my_target =
     : process.platform;
 var bin_path = path.join(root_dir, my_target);
 
+var ninja_bin_filename = process.platform === "win32" ? "ninja.exe" : "ninja";
 var ninja_bin_output = path.join(bin_path, "ninja.exe");
 
 var force_compiler_rebuild = process.argv.includes("-force-compiler-rebuild");
@@ -56,11 +57,11 @@ function provideNinja() {
         cwd: ninja_source_dir,
         stdio: [0, 1, 2],
       });
-      fs.copyFileSync(path.join(ninja_source_dir, "ninja"), ninja_bin_output);
+      fs.copyFileSync(path.join(ninja_source_dir, ninja_bin_filename), ninja_bin_output);
     } else {
       console.log(`ninja.tar.gz not availble in CI mode`);
       require("../ninja/snapshot").build();
-      fs.copyFileSync(path.join(root_dir, "ninja", "ninja"), ninja_bin_output);
+      fs.copyFileSync(path.join(root_dir, "ninja", ninja_bin_filename), ninja_bin_output);
     }
 
     console.log("ninja binary is ready: ", ninja_bin_output);

scripts/ninjaFactory.js

@@ -19,7 +19,7 @@ var targetDir = process.platform === 'darwin' && process.arch === 'arm64' ? proc
  */
 function libNinja(config) {
   return `
-ocamlopt = ${config.ocamlopt}
+ocamlopt = ${config.ocamlopt}${config.isWin ? ".exe" : ""}
 ext = .exe
 INCL = ${config.INCL}
 flags = -nodynlink -I $INCL -g -w -a ../jscomp/stubs/ext_basic_hash_stubs.c

scripts/prebuilt.js

@@ -61,10 +61,9 @@ function buildCompiler() {
   // delete process.env.OCAMLLIB
   var prebuilt = "prebuilt.ninja";
   var content = require("./ninjaFactory.js").libNinja({
-    ocamlopt: is_windows
-      ? `ocamlopt.opt.exe` :
-      (use_env_compiler ? `ocamlopt.opt`
-        : `../native/${ocamlVersion}/bin/ocamlopt.opt`),
+    ocamlopt: use_env_compiler
+      ? `ocamlopt.opt`
+      : `../native/${ocamlVersion}/bin/ocamlopt.opt`,
     INCL: ocamlVersion,
     isWin: is_windows,
   });