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

.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

CHANGELOG.md

@@ -42,6 +42,7 @@
 #### :house: Internal
 
 - Remove uncurried flag from bsb. https://github.com/rescript-lang/rescript-compiler/pull/7049
+- Build runtime/stdlib files with rescript/bsb instead of ninja.js. https://github.com/rescript-lang/rescript-compiler/pull/7063
 
 # 12.0.0-alpha.3
 

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/core/js_packages_state.ml

@@ -23,13 +23,15 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
 
 let packages_info = ref Js_packages_info.empty
+let make_runtime = ref false
 
 let set_package_name name =
   if Js_packages_info.is_empty !packages_info then
     packages_info := Js_packages_info.from_name name
-  else Bsc_args.bad_arg "duplicated flag for -bs-package-name"
+  else if not !make_runtime then Bsc_args.bad_arg "duplicated flag for -bs-package-name"
 
 let make_runtime () : unit =
+  make_runtime := true;
   packages_info := Js_packages_info.runtime_package_specs
 
 let make_runtime_test () : unit =