Skip to content

Commit 4d6454b

Browse files
committed
Build runtime/stdlib files with rescript/bsb instead of ninja.js
1 parent e8489bb commit 4d6454b

File tree

212 files changed

+49
-1580
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

212 files changed

+49
-1580
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -316,15 +316,13 @@ jobs:
316316
run: opam exec -- make test-syntax
317317

318318
- name: Build runtime/stdlib
319-
if: runner.os != 'Windows'
320-
run: |
321-
opam exec -- node ./scripts/ninja.js config
322-
opam exec -- node ./scripts/ninja.js build
319+
run: ./scripts/buildRuntime.sh
320+
shell: bash
323321

324322
- name: Check for changes in lib folder
325323
run: git diff --exit-code lib/js lib/es6
326324

327-
- name: Populate lib/ocaml
325+
- name: Version Check
328326
run: ./scripts/prebuilt.js
329327

330328
- name: Run tests

CHANGELOG.md

Lines changed: 1 addition & 0 deletions

Makefile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,7 @@ reanalyze:
5151
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
5252

5353
lib: build node_modules/.bin/semver
54-
node scripts/ninja.js config
55-
node scripts/ninja.js build
54+
./scripts/buildRuntime.sh
5655
./scripts/prebuilt.js
5756

5857
artifacts: lib
@@ -86,8 +85,8 @@ clean-rewatch:
8685
cargo clean --manifest-path rewatch/Cargo.toml && rm -f rewatch/rewatch
8786

8887
clean:
88+
(cd runtime && ../rescript clean)
8989
dune clean
90-
./scripts/ninja.js clean && rm -f ninja/ninja
9190

9291
clean-all: clean clean-gentype clean-rewatch
9392

jscomp/others/Design.md

Lines changed: 0 additions & 54 deletions
This file was deleted.

jscomp/others/README.md

Lines changed: 0 additions & 32 deletions
This file was deleted.

jscomp/others/intro.txt

Lines changed: 0 additions & 37 deletions
This file was deleted.

jscomp/others/release.ninja

Lines changed: 0 additions & 147 deletions
This file was deleted.

jscomp/runtime/Readme.md

Lines changed: 0 additions & 3 deletions
This file was deleted.

jscomp/runtime/release.ninja

Lines changed: 0 additions & 58 deletions
This file was deleted.

runtime/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
lib/

0 commit comments

Comments
 (0)