tweak to support arm64

node ./scripts/prebuilt.js -no-clean -use-env-compiler

Author: bobzhang

rescript

@@ -12,7 +12,17 @@ var os = require("os");
 var path = require("path");
 var fs = require("fs");
 var bsconfig = "bsconfig.json";
-var bsb_exe = path.join(__dirname, process.platform, "rescript.exe");
+
+/**
+ * 
+ * @type{string}
+ */
+var bin_path = path.join(__dirname, process.platform === 'darwin' && process.arch === 'arm64' ? process.platform + process.arch : process.platform)
+
+/**
+ * @type{string}
+ */
+var bsb_exe = path.join(bin_path, "rescript.exe");
 
 var LAST_BUILD_START = 0;
 var LAST_FIRED_EVENT = 0;
@@ -175,7 +185,7 @@ function releaseBuild() {
   if (is_building) {
     try {
       fs.unlinkSync(lockFileName);
-    } catch (err) {}
+    } catch (err) { }
     is_building = false;
   }
 }
@@ -206,7 +216,11 @@ if (
   maybe_subcommand !== "info"
   // delegate to native
 ) {
-  var bsc_exe = path.join(__dirname, process.platform, "bsc.exe");
+  /**
+   * @type {string}
+   */
+  var bsc_exe = path.join(bin_path, "bsc.exe")
+
   switch (maybe_subcommand) {
     case "format":
       require("./scripts/rescript_format.js").main(

scripts/install.js

@@ -24,8 +24,14 @@ if (supported_os.indexOf(process.platform) < 0) {
 }
 var is_windows = process.platform === "win32";
 
-var ninja_bin_output = path.join(root_dir, process.platform, "ninja.exe");
+var my_target = process.platform === 'darwin' && process.arch === 'arm64' ? process.platform + process.arch : process.platform;
+var bin_path =
+  path.join(root_dir, my_target);
+
+var ninja_bin_output = path.join(bin_path, "ninja.exe");
 var use_env_compiler = process.argv.includes("-use-env-compiler");
+var force_compiler_rebuild = process.argv.includes('-force-compiler-rebuild');
+var force_lib_rebuild = process.argv.includes('-force-lib-rebuild');
 /**
  * Make sure `ninja_bin_output` exists
  * The installation of `ninja.exe` is re-entrant, since we always pre-check if it is already installed
@@ -109,12 +115,12 @@ function ensureExists(dir) {
  * @returns {string|undefined}
  */
 function checkPrebuiltBscCompiler() {
-  if (process.env.BS_TRAVIS_CI) {
+  if (process.env.BS_TRAVIS_CI || force_compiler_rebuild) {
     return;
   }
   try {
     var version = String(
-      cp.execFileSync(path.join(root_dir, process.platform, "bsc.exe"), ["-v"])
+      cp.execFileSync(path.join(bin_path, "bsc.exe"), ["-v"])
     );
 
     var myOCamlVersion = version.substr(
@@ -143,7 +149,7 @@ function buildLibs(stdlib) {
   ensureExists(path.join(lib_dir, "es6"));
   process.env.NINJA_IGNORE_GENERATOR = "true";
   var releaseNinja = `
-bsc = ../${process.platform}/bsc.exe
+bsc = ../${my_target}/bsc.exe
 stdlib = ${stdlib}
 subninja runtime/release.ninja
 subninja others/release.ninja
@@ -223,7 +229,7 @@ provideCompiler();
 
 var stdlib = "stdlib-406";
 
-if (process.env.BS_TRAVIS_CI) {
+if (process.env.BS_TRAVIS_CI || force_lib_rebuild) {
   buildLibs(stdlib);
   require("./installUtils.js").install();
 }

scripts/ninjaFactory.js

@@ -5,6 +5,13 @@
 // # test case of our optimizations
 // # build bsdep.exe: cc bsdep.mli bsdep.ml
 // ../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
+
+/**
+ * @type{string}
+ */
+var targetDir = process.platform === 'darwin' && process.arch === 'arm64' ? process.platform + process.arch : process.arch
+
+
 /**
  *
  * @param {{ocamlopt : string ;  INCL : string, isWin : boolean}} config
@@ -21,15 +28,11 @@ rule cc
       config.isWin ? "" : "&& strip $out"
     }
     description = Making $out
-# build bspp.exe:  cc bspp.mli bspp.ml
-# build ../${process.platform}/bsb$ext:  cc $INCL/bsb.mli $INCL/bsb.ml
-#    flags = $flags -unboxed-types unix.cmxa str.cmxa
-build ../${process.platform}/rescript$ext:  cc $INCL/rescript.mli $INCL/rescript.ml
+build ../${targetDir}/rescript$ext:  cc $INCL/rescript.mli $INCL/rescript.ml
     flags = $flags -unboxed-types unix.cmxa str.cmxa    
-o ../${process.platform}/bsb_helper$ext:  cc $INCL/bsb_helper.mli $INCL/bsb_helper.ml
+build ../${targetDir}/bsb_helper$ext:  cc $INCL/bsb_helper.mli $INCL/bsb_helper.ml
     flags = $flags  -unboxed-types -w -a
-
-o ../${process.platform}/bsc$ext: cc $INCL/whole_compiler.mli $INCL/whole_compiler.ml
+build ../${targetDir}/bsc$ext: cc $INCL/whole_compiler.mli $INCL/whole_compiler.ml
     flags = $flags -w A-4-9-48-40-45-41-44-50-21-30-32-34-37-27-60-42 
 `;
 }

scripts/prebuilt.js

@@ -51,36 +51,43 @@ function rebuild() {
   });
 }
 
+var use_env_compiler = process.argv.includes('-use-env-compiler')
+var bin_path =
+  path.join(__dirname, '..', process.platform === 'darwin' && process.arch === 'arm64' ? process.platform + process.arch : process.platform)
+
 function buildCompiler() {
   // for 4.02.3 it relies on OCAMLLIB to find stdlib path
   // for 4.06.1 OCAMLLIB is another PATH
   // delete process.env.OCAMLLIB
   var prebuilt = "prebuilt.ninja";
   var content = require("./ninjaFactory.js").libNinja({
     ocamlopt: is_windows
-      ? `ocamlopt.opt.exe`
-      : `../native/${ocamlVersion}/bin/ocamlopt.opt`,
+      ? `ocamlopt.opt.exe` :
+      (use_env_compiler ? `ocamlopt.opt`
+        : `../native/${ocamlVersion}/bin/ocamlopt.opt`),
     INCL: ocamlVersion,
     isWin: is_windows,
   });
 
   fs.writeFileSync(path.join(root, "lib", prebuilt), content, "ascii");
-  process.env.PATH = `${path.join(__dirname, "..", process.platform)}${
-    path.delimiter
-  }${process.env.PATH}`;
+  // This is for ninja access
+  process.env.PATH = `${bin_path}${path.delimiter}${process.env.PATH}`;
   let ninjaPath = `ninja.exe`;
+  console.log(`start build`)
   cp.execSync(
     `${ninjaPath} -C lib -f ${prebuilt} -v -t clean && ${ninjaPath} -v -C lib -f ${prebuilt}`,
     root_config
   );
+  console.log('compiler built done')
 }
 if (!is_windows) {
-  if (!process.argv.includes("-noclean")) {
+  if (!process.argv.includes("-no-clean")) {
     require("./pack").updateThemes();
     rebuild();
+    require("./ninja.js").updateRelease();
   }
 
-  require("./ninja.js").updateRelease();
+
 }
 
 function createOCamlTar() {