PR review feedback

Author: cknitt

.github/workflows/ci.yml

@@ -32,7 +32,7 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Apply static linking patch
-        run: git apply scripts/static-linking.patch
+        run: git apply scripts/dune-static-linking.patch
 
       - name: Build compiler binaries
         run: opam exec -- dune build

scripts/ciTest.js

@@ -3,14 +3,7 @@ var cp = require("child_process");
 var path = require("path");
 var fs = require("fs");
 
-var duneBinDir = path.join(
-  __dirname,
-  "..",
-  "_build",
-  "install",
-  "default",
-  "bin"
-);
+var duneBinDir = require("./dune").duneBinDir;
 
 var ounitTest = false;
 var mochaTest = false;

scripts/copyExes.js

@@ -4,17 +4,10 @@
 const path = require("path");
 const fs = require("fs");
 const child_process = require("child_process");
+const { duneBinDir } = require("./dune");
+const { absolutePath: platformBinDir } = require("./bin_path");
 
-const { absolutePath: platformBinDir, ninja_exe } = require("./bin_path");
 const ninjaDir = path.join(__dirname, "..", "ninja");
-const duneBinDir = path.join(
-  __dirname,
-  "..",
-  "_build",
-  "install",
-  "default",
-  "bin"
-);
 
 if (!fs.existsSync(platformBinDir)) {
   fs.mkdirSync(platformBinDir);

scripts/static-linking.patch scripts/dune-static-linking.patch

@@ -0,0 +1,12 @@
+var path = require("path");
+
+var duneBinDir = path.join(
+  __dirname,
+  "..",
+  "_build",
+  "install",
+  "default",
+  "bin"
+);
+
+exports.duneBinDir = duneBinDir;

scripts/dune.js

@@ -13,14 +13,7 @@ var othersDir = path.join(jscompDir, "others");
 var testDir = path.join(jscompDir, "test");
 
 var jsDir = path.join(__dirname, "..", "lib", "js");
-var duneBinDir = path.join(
-  __dirname,
-  "..",
-  "_build",
-  "install",
-  "default",
-  "bin"
-);
+var duneBinDir = require("./dune").duneBinDir;
 
 var runtimeFiles = fs.readdirSync(runtimeDir, "ascii");
 var runtimeMlFiles = runtimeFiles.filter(