Build runtime/stdlib files with rescript/bsb instead of ninja.js

Author: cknitt

.github/workflows/ci.yml

@@ -316,15 +316,13 @@ jobs:
         run: opam exec -- make test-syntax
 
       - name: Build runtime/stdlib
-        if: runner.os != 'Windows'
-        run: |
-          opam exec -- node ./scripts/ninja.js config
-          opam exec -- node ./scripts/ninja.js build
+        run: ./scripts/buildRuntime.sh
+        shell: bash
 
       - name: Check for changes in lib folder
         run: git diff --exit-code lib/js lib/es6
 
-      - name: Populate lib/ocaml
+      - name: Version Check
         run: ./scripts/prebuilt.js
 
       - name: Run tests

Makefile

@@ -51,8 +51,7 @@ reanalyze:
 	reanalyze.exe -set-exit-code -all-cmt _build/default/jscomp -suppress jscomp/syntax/testrunner -exclude-paths jscomp/outcome_printer,jscomp/ounit_tests,jscomp/ml,jscomp/js_parser,jscomp/frontend,jscomp/ext,jscomp/depends,jscomp/core,jscomp/common,jscomp/cmij,jscomp/bsb_helper,jscomp/bsb
 
 lib: build node_modules/.bin/semver
-	node scripts/ninja.js config
-	node scripts/ninja.js build
+	./scripts/buildRuntime.sh
 	./scripts/prebuilt.js
 
 artifacts: lib
@@ -86,8 +85,8 @@ clean-rewatch:
 	cargo clean --manifest-path rewatch/Cargo.toml && rm -f rewatch/rewatch
 
 clean:
+	(cd runtime && ../rescript clean)
 	dune clean
-	./scripts/ninja.js clean && rm -f ninja/ninja
 
 clean-all: clean clean-gentype clean-rewatch 
 

jscomp/others/release.ninja

@@ -1,8 +1,8 @@
 
 
 import * as List from "./list.js";
-import * as Primitive_array from "./primitive_array.js";
-import * as Primitive_exceptions from "./primitive_exceptions.js";
+import * as Primitive_array from "rescript/lib/es6/primitive_array.js";
+import * as Primitive_exceptions from "rescript/lib/es6/primitive_exceptions.js";
 
 let init = ((length, f) => Array.from({ length }, f));
 

jscomp/runtime/Readme.md

@@ -1,7 +1,7 @@
 
 
-import * as Primitive_int from "./primitive_int.js";
-import * as Primitive_option from "./primitive_option.js";
+import * as Primitive_int from "rescript/lib/es6/primitive_int.js";
+import * as Primitive_option from "rescript/lib/es6/primitive_option.js";
 
 function get(arr, i) {
   if (i >= 0 && i < arr.length) {

jscomp/runtime/release.ninja

@@ -1,6 +1,6 @@
 
 
-import * as Primitive_option from "./primitive_option.js";
+import * as Primitive_option from "rescript/lib/es6/primitive_option.js";
 import * as Belt_internalBuckets from "./belt_internalBuckets.js";
 import * as Belt_internalBucketsType from "./belt_internalBucketsType.js";
 

lib/es6/array.js

@@ -1,7 +1,7 @@
 
 
-import * as Primitive_hash from "./primitive_hash.js";
-import * as Primitive_option from "./primitive_option.js";
+import * as Primitive_hash from "rescript/lib/es6/primitive_hash.js";
+import * as Primitive_option from "rescript/lib/es6/primitive_option.js";
 import * as Belt_internalBuckets from "./belt_internalBuckets.js";
 import * as Belt_internalBucketsType from "./belt_internalBucketsType.js";
 

lib/es6/belt_Array.js

@@ -1,7 +1,7 @@
 
 
-import * as Primitive_hash from "./primitive_hash.js";
-import * as Primitive_option from "./primitive_option.js";
+import * as Primitive_hash from "rescript/lib/es6/primitive_hash.js";
+import * as Primitive_option from "rescript/lib/es6/primitive_option.js";
 import * as Belt_internalBuckets from "./belt_internalBuckets.js";
 import * as Belt_internalBucketsType from "./belt_internalBucketsType.js";