Rename runtime build scripts

Author: cknitt

.github/workflows/ci.yml

@@ -332,12 +332,12 @@ jobs:
 
       - name: Build runtime/stdlib with rewatch
         if: ${{ runner.os != 'Windows' }}
-        run: ./scripts/buildRuntimeRewatch.sh
+        run: ./scripts/buildRuntime.sh
         shell: bash
 
       - name: Build runtime/stdlib with bsb (Windows)
         if: ${{ runner.os == 'Windows' }}
-        run: ./scripts/buildRuntime.sh
+        run: ./scripts/buildRuntimeLegacy.sh
         shell: bash
 
       - name: Check for changes in lib folder
@@ -510,7 +510,7 @@ jobs:
       - name: Build website
         if: steps.diffcheck.outputs.clean == 'false'
         run: |
-          npm ci 
+          npm ci
           npm run build
 
       - name: Commit and push

Makefile

@@ -52,10 +52,10 @@ reanalyze:
 	reanalyze.exe -set-exit-code -all-cmt _build/default/compiler _build/default/tests -exclude-paths compiler/outcome_printer,compiler/ml,compiler/frontend,compiler/ext,compiler/depends,compiler/core,compiler/common,compiler/cmij,compiler/bsb_helper,compiler/bsb
 
 lib-bsb:
-	./scripts/buildRuntime.sh
+	./scripts/buildRuntimeLegacy.sh
 
 lib:
-	./scripts/buildRuntimeRewatch.sh
+	./scripts/buildRuntime.sh
 
 artifacts: lib
 	./scripts/npmPack.js --updateArtifactList

scripts/buildRuntime.sh

@@ -2,7 +2,7 @@
 set -e
 shopt -s extglob
 
-(cd runtime && ../cli/rescript-legacy.js clean && ../cli/rescript-legacy.js build)
+(cd runtime && ../cli/rescript.js clean && ../cli/rescript.js build)
 
 rm -f lib/es6/*.js lib/js/*.js lib/ocaml/*
 mkdir -p lib/es6 lib/js lib/ocaml
@@ -11,3 +11,6 @@ cp runtime/lib/es6/*.js lib/es6
 cp runtime/lib/js/*.js lib/js
 cp runtime/lib/bs/*.@(cmi|cmj|cmt|cmti) lib/ocaml/
 cp runtime/*.@(res|resi) lib/ocaml/
+# overwrite the stdlib build artifacts to the testrepo
+mkdir -p rewatch/testrepo/node_modules/rescript/lib/ocaml
+cp -rf lib/ocaml rewatch/testrepo/node_modules/rescript/lib/ocaml

scripts/buildRuntimeRewatch.sh scripts/buildRuntimeLegacy.shscripts/buildRuntimeRewatch.sh renamed to scripts/buildRuntimeLegacy.sh

@@ -2,7 +2,7 @@
 set -e
 shopt -s extglob
 
-(cd runtime && ../cli/rescript.js clean && ../cli/rescript.js build)
+(cd runtime && ../cli/rescript-legacy.js clean && ../cli/rescript-legacy.js build)
 
 rm -f lib/es6/*.js lib/js/*.js lib/ocaml/*
 mkdir -p lib/es6 lib/js lib/ocaml
@@ -11,6 +11,3 @@ cp runtime/lib/es6/*.js lib/es6
 cp runtime/lib/js/*.js lib/js
 cp runtime/lib/bs/*.@(cmi|cmj|cmt|cmti) lib/ocaml/
 cp runtime/*.@(res|resi) lib/ocaml/
-# overwrite the stdlib build artifacts to the testrepo
-mkdir -p rewatch/testrepo/node_modules/rescript/lib/ocaml
-cp -rf lib/ocaml rewatch/testrepo/node_modules/rescript/lib/ocaml