fix

Author: cometkim

.github/workflows/ci.yml

@@ -27,14 +27,19 @@ jobs:
         include:
           - os: macos-13 # x64
             rust-target: x86_64-apple-darwin
+            node-target: darwin-x64
           - os: macos-14 # ARM
             rust-target: aarch64-apple-darwin
+            node-target: darwin-arm64
           - os: ubuntu-24.04 # x64
             rust-target: x86_64-unknown-linux-musl
+            node-target: linux-x64
           - os: ubuntu-24.04-arm # ARM
             rust-target: aarch64-unknown-linux-musl
+            node-target: linux-arm64
           - os: windows-latest
             rust-target: x86_64-pc-windows-gnu
+            node-target: win32-x64
 
     runs-on: ${{matrix.os}}
 
@@ -66,25 +71,22 @@ jobs:
         uses: dtolnay/rust-toolchain@master
         with:
           toolchain: stable
-          targets: ${{matrix.rust-target}}
+          targets: ${{ matrix.rust-target }}
 
       - name: Build rewatch
         if: steps.build-cache.outputs.cache-hit != 'true'
-        run: cargo build --manifest-path rewatch/Cargo.toml --target ${{matrix.rust-target}} --release
+        run: cargo build --manifest-path rewatch/Cargo.toml --target ${{ matrix.rust-target }} --release
 
       - name: Copy rewatch exe to platform bin dir
         run: |
-          cp rewatch/target/${{matrix.rust-target}}/release/rewatch${{ runner.os == 'Windows' && '.exe' || '' }} rewatch
-          node ./scripts/copyExes.js -rewatch
-
-      - name: Get artifact dir name
-        run: node .github/workflows/get_artifact_dir_name.js
+          cp rewatch/target/${{ matrix.rust-target }}/release/rewatch${{ runner.os == 'Windows' && '.exe' || '' }} rewatch
+          node scripts/copyExes.js --rewatch
 
       - name: "Upload artifact: rewatch binary"
         uses: actions/upload-artifact@v4
         with:
-          name: rewatch-${{env.artifact_dir_name}}
-          path: ${{ env.artifact_dir_name }}
+          name: rewatch-${{ matrix.node-target }}
+          path: packages/@rescript/${{ matrix.node-target }}/bin/rewatch.exe
 
   build-compiler:
     strategy:
@@ -95,21 +97,26 @@ jobs:
             ocaml_compiler: ocaml-variants.5.3.0+options,ocaml-option-static
             upload_binaries: true
             upload_libs: true
+            node-target: linux-x64
           - os: ubuntu-24.04-arm # ARM
             ocaml_compiler: ocaml-variants.5.3.0+options,ocaml-option-static
             upload_binaries: true
             # Build the playground compiler and run the benchmarks on the fastest runner
             build_playground: true
             benchmarks: true
+            node-target: linux-arm64
           - os: macos-13 # x64
             ocaml_compiler: 5.3.0
             upload_binaries: true
+            node-target: darwin-x64
           - os: macos-14 # ARM
             ocaml_compiler: 5.3.0
             upload_binaries: true
+            node-target: darwin-arm64
           - os: windows-latest
             ocaml_compiler: 5.3.0
             upload_binaries: true
+            node-target: win32-x64
 
           # Verify that the compiler still builds with older OCaml versions
           - os: ubuntu-24.04
@@ -144,9 +151,6 @@ jobs:
           cache: yarn
           node-version-file: .nvmrc
 
-      - name: Get artifact dir name
-        run: node .github/workflows/get_artifact_dir_name.js
-
       - name: Install dependencies (Linux)
         if: runner.os == 'Linux'
         uses: awalsh128/[email protected]
@@ -303,13 +307,13 @@ jobs:
         run: yarn install
 
       - name: Copy compiler exes to platform bin dir
-        run: node ./scripts/copyExes.js -compiler
+        run: node scripts/copyExes.js --compiler
 
       - name: Restore ninja build cache
         id: ninja-build-cache
         uses: actions/cache@v4
         with:
-          path: ${{ env.artifact_dir_name }}/ninja.exe
+          path: packages/@rescript/${{ matrix.node-target }}/bin/ninja.exe
           key: ninja-build-v1-${{ matrix.os }}-${{ hashFiles('ninja/src/**') }}
 
       - name: Setup Python for ninja build
@@ -336,7 +340,7 @@ jobs:
 
       - name: Copy ninja exe to platform bin dir
         if: steps.ninja-build-cache.outputs.cache-hit != 'true'
-        run: node ./scripts/copyExes.js -ninja
+        run: node scripts/copyExes.js --ninja
 
       - name: "Syntax: Run roundtrip tests"
         if: ${{ runner.os != 'Windows' }}
@@ -423,8 +427,8 @@ jobs:
         if: matrix.upload_binaries
         uses: actions/upload-artifact@v4
         with:
-          name: binaries-${{ env.artifact_dir_name }}
-          path: ${{ env.artifact_dir_name }}
+          name: binaries-${{ matrix.node-target }}
+          path: packages/@rescript/${{ matrix.node-target }}/bin
 
       - name: "Upload artifacts: lib/ocaml"
         if: matrix.upload_libs
@@ -491,15 +495,15 @@ jobs:
       matrix:
         include:
           - os: macos-13
-            target: darwin-x64
+            node-target: darwin-x64
           - os: macos-14
-            target: darwin-arm64
+            node-target: darwin-arm64
           - os: ubuntu-24.04
-            target: linux-x64
+            node-target: linux-x64
           - os: ubuntu-24.04-arm
-            target: linux-arm64
+            node-target: linux-arm64
           - os: windows-latest
-            target: win32-x64
+            node-target: win32-x64
 
     runs-on: ${{ matrix.os }}
 
@@ -535,7 +539,7 @@ jobs:
         run: |
           npm i --ignore-scripts --no-audit \
             rescript-${{ needs.package.outputs.rescript_version }}.tgz \
-            rescript-${{ matrix.target }}-${{ needs.package.outputs.rescript_version }}.tgz
+            rescript-${{ matrix.node-target }}-${{ needs.package.outputs.rescript_version }}.tgz
         shell: bash
         working-directory: ${{ steps.tmp-dir.outputs.path }}
 

.github/workflows/get_artifact_dir_name.js

@@ -25,22 +25,16 @@ check_statically_linked() {
     fi
 }
 
-clean_dir() {
-    local dir="$1"
-    rm -rf "$dir" && mkdir -p "$dir"
-    echo -n "$dir"
-}
-
 # rescript
 mv lib-ocaml lib/ocaml
 
 # @rescript/{target}
 chmod +x binaries-*/*.exe rewatch-*/*.exe
-mv -f binaries-darwin/* rewatch-darwin/* "$(clean_dir "packages/@rescript/darwin-x64/bin")"
-mv -f binaries-darwinarm64/* rewatch-darwinarm64/* "$(clean_dir "packages/@rescript/darwin-arm64/bin")"
-mv -f binaries-linux/* rewatch-linux/* "$(clean_dir "packages/@rescript/linux-x64/bin")"
-mv -f binaries-linuxarm64/* rewatch-linuxarm64/* "$(clean_dir "packages/@rescript/linux-arm64/bin")"
-mv -f binaries-win32/* rewatch-win32/* "$(clean_dir "packages/@rescript/win32-x64/bin")"
+mv -f binaries-darwin-x64/* rewatch-darwin-x64/* "packages/@rescript/darwin-x64/bin"
+mv -f binaries-darwin-arm64/* rewatch-darwin-arm64/* "packages/@rescript/darwin-arm64/bin"
+mv -f binaries-linux-x64/* rewatch-linux-x64/* "packages/@rescript/linux-x64/bin"
+mv -f binaries-linux-arm64/* rewatch-linux-arm64/* "packages/@rescript/linux-arm64/bin"
+mv -f binaries-win32-x64/* rewatch-win32-x64/* "packages/@rescript/win32-x64/bin"
 check_statically_linked "packages/@rescript/linux-x64/bin"
 check_statically_linked "packages/@rescript/linux-arm64/bin"
 

.github/workflows/moveArtifacts.sh

@@ -4,7 +4,7 @@ DUNE_BIN_DIR = ./_build/install/default/bin
 
 build: ninja rewatch
 	dune build
-	./scripts/copyExes.js -compiler
+	./scripts/copyExes.js --compiler
 
 watch:
 	dune build -w
@@ -18,11 +18,11 @@ dce:
 rewatch:
 	cargo build --manifest-path rewatch/Cargo.toml
 	cp rewatch/target/debug/rewatch rewatch
-	./scripts/copyExes.js -rewatch
+	./scripts/copyExes.js --rewatch
 
 ninja/ninja:
 	./scripts/buildNinjaBinary.js
-	./scripts/copyExes.js -ninja
+	./scripts/copyExes.js --ninja
 
 ninja: ninja/ninja
 

Makefile

@@ -1,16 +1,23 @@
 let version = "4.06.1+BS"
 
+(* FIXME: Unreliable resolution *)
 let standard_library =
   let ( // ) = Filename.concat in
   let exe_path = Sys.executable_name in
   if Ext_string.contain_substring exe_path ("node_modules" // "@rescript") then
-    (* node_modules/@rescirpt/{platform}/bins *)
+    (* node_modules/@rescript/{platform}/bin *)
     Filename.dirname exe_path // Filename.parent_dir_name
     // Filename.parent_dir_name // Filename.parent_dir_name // "rescript"
     // "lib" // "ocaml"
-  else
-    (* node_modules/rescirpt/{platform} *)
+  else if Ext_string.contain_substring exe_path ("node_modules" // "rescript")
+  then
+    (* node_modules/rescript/{platform} *)
     Filename.dirname exe_path // Filename.parent_dir_name // "lib" // "ocaml"
+  else
+    (* git repo: rescript/packages/@rescript/{platform}/bin *)
+    Filename.dirname exe_path // Filename.parent_dir_name
+    // Filename.parent_dir_name // Filename.parent_dir_name
+    // Filename.parent_dir_name // "lib" // "ocaml"
 
 let standard_library_default = standard_library
 

compiler/ext/config.ml

@@ -7,9 +7,48 @@
 import * as child_process from "node:child_process";
 import * as fs from "node:fs";
 import * as path from "node:path";
+import { parseArgs } from "node:util";
 import { binDir } from "#cli/bins";
 import { compilerBinDir, ninjaDir, rewatchDir } from "#dev/paths";
 
+const args = parseArgs({
+  args: process.argv.slice(2),
+  options: {
+    all: {
+      type: "boolean",
+    },
+    compiler: {
+      type: "boolean",
+    },
+    ninja: {
+      type: "boolean",
+    },
+    rewatch: {
+      type: "boolean",
+    },
+  },
+});
+
+const shouldCopyCompiler = args.values.all || args.values.compiler;
+const shouldCopyNinja = args.values.all || args.values.ninja;
+const shouldCopyRewatch = args.values.all || args.values.rewatch;
+
+if (shouldCopyCompiler) {
+  copyExe(compilerBinDir, "rescript");
+  copyExe(compilerBinDir, "rescript-editor-analysis");
+  copyExe(compilerBinDir, "rescript-tools");
+  copyExe(compilerBinDir, "bsc");
+  copyExe(compilerBinDir, "bsb_helper");
+}
+
+if (shouldCopyNinja) {
+  copyExe(ninjaDir, "ninja");
+}
+
+if (shouldCopyRewatch) {
+  copyExe(rewatchDir, "rewatch");
+}
+
 /**
  * @param {string} dir
  * @param {string} exe
@@ -39,19 +78,3 @@ function copyExe(dir, exe) {
     fs.chmodSync(dest, mode);
   }
 }
-
-if (process.argv.includes("-all") || process.argv.includes("-compiler")) {
-  copyExe(compilerBinDir, "rescript");
-  copyExe(compilerBinDir, "rescript-editor-analysis");
-  copyExe(compilerBinDir, "rescript-tools");
-  copyExe(compilerBinDir, "bsc");
-  copyExe(compilerBinDir, "bsb_helper");
-}
-
-if (process.argv.includes("-all") || process.argv.includes("-ninja")) {
-  copyExe(ninjaDir, "ninja");
-}
-
-if (process.argv.includes("-all") || process.argv.includes("-rewatch")) {
-  copyExe(rewatchDir, "rewatch");
-}