add bsc_path helper + use bsc.exe for super-errors test

Author: jchavarri

bsc

@@ -2,14 +2,7 @@
 "use strict";
 
 var child_process = require("child_process");
-var path = require("path");
-var exe = path.join(
- __dirname,
- process.platform === "darwin" && process.arch === "arm64"
- ? process.platform + process.arch
- : process.platform,
- "bsc.exe"
-);
+var exe = require("./scripts/bin_path").bsc_exe;
 var delegate_args = process.argv.slice(2);
 
 try {

jscomp/build_tests/super_errors/input.js

@@ -3,7 +3,7 @@ const path = require('path')
 const child_process = require('child_process')
 
 
-var  bsc = path.join(__dirname,'..','..','..','bsc')
+var bsc = require("../../../scripts/bin_path").bsc_exe;
 // var refmt = path.join(__dirname,'..','..','..','lib','refmt.exe')
 
 

rescript

@@ -11,24 +11,10 @@ var child_process = require("child_process");
 var os = require("os");
 var path = require("path");
 var fs = require("fs");
+var bsc_exe = require("./scripts/bin_path").bsc_exe;
+var rescript_exe = require("./scripts/bin_path").rescript_exe;
 var bsconfig = "bsconfig.json";
 
-/**
- *
- * @type{string}
- */
-var bin_path = path.join(
- __dirname,
- process.platform === "darwin" && process.arch === "arm64"
- ? process.platform + process.arch
- : process.platform
-);
-
-/**
- * @type{string}
- */
-var rescript_exe = path.join(bin_path, "rescript.exe");
-
 var LAST_BUILD_START = 0;
 var LAST_FIRED_EVENT = 0;
 /**
@@ -225,11 +211,6 @@ if (
  maybe_subcommand !== "info"
  // delegate to native
 ) {
- /**
- * @type {string}
- */
- var bsc_exe = path.join(bin_path, "bsc.exe");
-
  switch (maybe_subcommand) {
  case "format":
  require("./scripts/rescript_format.js").main(

scripts/bin_path.js

@@ -0,0 +1,35 @@
+//@ts-check
+
+var path = require("path");
+
+/**
+ *
+ * @type{string}
+ */
+var bin_path = path.join(
+ __dirname,
+ "..",
+ process.platform === "darwin" && process.arch === "arm64"
+ ? process.platform + process.arch
+ : process.platform
+);
+
+/**
+ * @type{string}
+ */
+var bsc_exe = path.join(bin_path, "bsc.exe");
+
+/**
+* @type{string}
+*/
+var ninja_exe = path.join(bin_path, "ninja.exe");
+
+/**
+ * @type{string}
+ */
+var rescript_exe = path.join(bin_path, "rescript.exe");
+
+exports.folder = bin_path;
+exports.bsc_exe = bsc_exe;
+exports.ninja_exe = ninja_exe;
+exports.rescript_exe = rescript_exe;

scripts/install.js

@@ -24,14 +24,10 @@ if (supported_os.indexOf(process.platform) < 0) {
 }
 var is_windows = process.platform === "win32";
 
-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 bsc_exe = require("./bin_path").bsc_exe;
 
 var ninja_bin_filename = process.platform === "win32" ? "ninja.exe" : "ninja";
-var ninja_bin_output = path.join(bin_path, "ninja.exe");
+var ninja_bin_output = require("./bin_path").ninja_exe;
 
 var force_compiler_rebuild = process.argv.includes("-force-compiler-rebuild");
 var force_lib_rebuild = process.argv.includes("-force-lib-rebuild");
@@ -130,7 +126,7 @@ function checkPrebuiltBscCompiler() {
  }
  try {
  var version = String(
- child_process.execFileSync(path.join(bin_path, "bsc.exe"), ["-v"])
+ child_process.execFileSync(bsc_exe, ["-v"])
  );
 
  var myOCamlVersion = version.substr(
@@ -159,7 +155,7 @@ function buildLibs(stdlib) {
  ensureExists(path.join(lib_dir, "es6"));
  process.env.NINJA_IGNORE_GENERATOR = "true";
  var releaseNinja = `
-bsc = ../${my_target}/bsc.exe
+bsc = ${bsc_exe}
 stdlib = ${stdlib}
 subninja runtime/release.ninja
 subninja others/release.ninja

scripts/ninja.js

@@ -28,12 +28,10 @@ var js_package = pseudoTarget("js_pkg");
 var runtimeTarget = pseudoTarget("runtime");
 var othersTarget = pseudoTarget("others");
 var stdlibTarget = pseudoTarget("$stdlib");
-var my_target =
- process.platform === "darwin" && process.arch === "arm64"
- ? process.platform + process.arch
- : process.platform;
+var my_target = require("./bin_path").folder;
+var bsc_exe = require("./bin_path").bsc_exe;
 
-var vendorNinjaPath = path.join(__dirname, "..", my_target, "ninja.exe");
+var vendorNinjaPath = require("./bin_path").ninja_exe;
 
 // Let's enforce a Node version >= 16 to make sure M1 users don't trip up on
 // cryptic issues caused by mismatching assembly architectures Node 16 ships
@@ -666,7 +664,7 @@ function depModulesForBscAsync(files, dir, depsMap) {
  return [
  new Promise((resolve, reject) => {
  cp.exec(
- `../../${my_target}/bsc.exe -modules -bs-syntax-only ${resFiles.join(
+ `${bsc_exe} -modules -bs-syntax-only ${resFiles.join(
  " "
  )} ${reFiles.join(" ")} ${ocamlFiles.join(" ")}`,
  config,
@@ -854,7 +852,7 @@ function generateNinja(depsMap, allTargets, cwd, extraDeps = []) {
  return build_stmts;
 }
 
-var COMPILIER = `../${my_target}/bsc.exe`;
+var COMPILIER = bsc_exe;
 var BSC_COMPILER = `bsc = ${COMPILIER}`;
 
 async function runtimeNinja(devmode = true) {
@@ -1406,7 +1404,7 @@ include body.ninja
  nativeNinja();
  runtimeNinja();
  stdlibNinja(true);
- if (fs.existsSync(path.join(__dirname, "..", my_target, "bsc.exe"))) {
+ if (fs.existsSync(bsc_exe)) {
  testNinja();
  }
  othersNinja();
@@ -1730,14 +1728,14 @@ o core/js_record_map.ml: p4of core/j.ml
 o core/js_record_fold.ml: p4of core/j.ml
  flags = -record-fold
 
-o ../${my_target}/bsc.exe: link ${makeLibs(
+o ${my_target}/bsc.exe: link ${makeLibs(
  bsc_libs
  )} main/rescript_compiler_main.cmx
-o ../${my_target}/rescript.exe: link ${makeLibs(
+o ${my_target}/rescript.exe: link ${makeLibs(
  rescript_libs
  )} main/rescript_main.cmx
  libs = unix.cmxa str.cmxa 
-o ../${my_target}/bsb_helper.exe: link ${makeLibs(
+o ${my_target}/bsb_helper.exe: link ${makeLibs(
  bsb_helper_libs
  )} main/bsb_helper_main.cmx
  libs = unix.cmxa str.cmxa
@@ -1750,7 +1748,7 @@ o ./bin/cmij.exe: link ${makeLibs(cmij_libs)} main/cmij_main.cmx
  
 o ./bin/tests.exe: link ${makeLibs(tests_libs)} main/ounit_tests_main.cmx
  libs = str.cmxa unix.cmxa 
-build native: phony ../${my_target}/bsc.exe ../${my_target}/rescript.exe ../${my_target}/bsb_helper.exe ./bin/bspack.exe ./bin/cmjdump.exe ./bin/cmij.exe ./bin/tests.exe
+build native: phony ${my_target}/bsc.exe ${my_target}/rescript.exe ${my_target}/bsb_helper.exe ./bin/bspack.exe ./bin/cmjdump.exe ./bin/cmij.exe ./bin/tests.exe
 
 
 ${mllRule}

scripts/ninjaFactory.js

@@ -6,13 +6,7 @@
 // # 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.platform;
+var targetDir = require("./bin_path").folder;
 
 /**
  *
@@ -30,11 +24,11 @@ rule cc
  config.isWin ? "" : "&& strip $out"
  }
  description = Making $out
-build ../${targetDir}/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 
-build ../${targetDir}/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
-build ../${targetDir}/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

@@ -52,13 +52,7 @@ 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
-);
+var bin_path = require("./bin_path").folder;
 
 function buildCompiler() {
  var prebuilt = "prebuilt.ninja";