fix prebuilt scripts

Author: bobzhang

scripts/ninjaFactory.js

@@ -7,13 +7,13 @@
 // ../native/4.06.1/bin/ocamlopt.opt -c -O2 -nodynlink -I 4.06.1 -g -w a+32  4.06.1/whole_compiler.mli 4.06.1/whole_compiler.ml  &> warning.log
 /**
  *
- * @param {{ocamlopt : string ; ext : string ; INCL : string, isWin : boolean}} config
+ * @param {{ocamlopt : string ;  INCL : string, isWin : boolean}} config
  *
  */
 function libNinja(config) {
   return `
 ocamlopt = ${config.ocamlopt}
-ext = ${config.ext}
+ext = .exe
 INCL = ${config.INCL}
 flags = -nodynlink -I $INCL -g -w -a ../jscomp/stubs/ext_basic_hash_stubs.c
 rule cc

scripts/prebuilt.js

@@ -2,26 +2,18 @@
 //@ts-check
 var cp = require("child_process");
 var path = require("path");
-var { sys_extension, is_windows } = require("./config.js");
+var { is_windows } = require("./config.js");
 
 var root = path.join(__dirname, "..");
-var root_config = { cwd: root, stdio: [0, 1, 2], encoding: 'utf8' };
+var root_config = { cwd: root, stdio: [0, 1, 2], encoding: "utf8" };
 process.env.BS_RELEASE_BUILD = "true";
 
 var ocamlVersion = require("./buildocaml.js").getVersionPrefix();
 var fs = require("fs");
 var hostPlatform = "darwin";
 
 function rebuild() {
-  cp.execSync(`node ${path.join(__dirname, "ninja.js")} clean`, {
-    cwd: __dirname,
-    stdio: [0, 1, 2]
-  });
-  cp.execSync(`node ${path.join(__dirname, "ninja.js")} config`, {
-    cwd: __dirname,
-    stdio: [0, 1, 2]
-  });
-  cp.execSync(`node ${path.join(__dirname, "ninja.js")} build`, {
+  cp.execSync(`node ${path.join(__dirname, "ninja.js")} cleanbuild`, {
     cwd: __dirname,
     stdio: [0, 1, 2]
   });
@@ -36,22 +28,24 @@ function buildCompiler() {
     ocamlopt: is_windows
       ? `ocamlopt.opt.exe`
       : `../native/${ocamlVersion}/bin/ocamlopt.opt`,
-    ext: sys_extension,
     INCL: ocamlVersion,
     isWin: is_windows
   });
 
   fs.writeFileSync(path.join(root, "lib", prebuilt), content, "ascii");
-  process.env.PATH=
-    `${path.join(__dirname,'..','vendor','ninja','snapshot')}${path.delimiter}${process.env.PATH}`
-  let ninjaPath = `ninja${sys_extension}`
+  process.env.PATH = `${path.join(__dirname, "..", process.platform)}${
+    path.delimiter
+  }${process.env.PATH}`;
+  let ninjaPath = `ninja.exe`;
   cp.execSync(
-    `${ninjaPath} -C lib -f ${prebuilt} -t clean && ${ninjaPath} -v -C lib -f ${prebuilt}`,
+    `${ninjaPath} -C lib -f ${prebuilt} -v -t clean && ${ninjaPath} -v -C lib -f ${prebuilt}`,
     root_config
   );
 }
 if (!is_windows) {
-  rebuild();
+  if (!process.argv.includes("-noclean")) {
+    rebuild();
+  }
   require("./ninja.js").updateRelease();
 }
 var os = require("os");