Build the whole compiler with dune

Author: cknitt

.github/workflows/ci.yml

@@ -40,12 +40,18 @@ jobs:
           opam-pin: false
           opam-depext: false
 
+      - name: "Install OPAM dependencies"
+        run: opam install . --deps-only
+
+      - name: "Build compiler (pass 1 - dev)"
+        run: opam exec -- dune build
+
       - name: Use Node.js
         uses: actions/setup-node@v3
         with:
           node-version: 16
 
-      - name: NPM install
+      - name: Install npm packages
         run: opam exec -- npm ci --ignore-scripts
 
       - name: "Check if syntax subfolder has changed"
@@ -58,14 +64,6 @@ jobs:
             echo "syntax_status=changed" >> $GITHUB_ENV
           fi
 
-      - name: "Syntax: install OPAM dependencies"
-        if: env.syntax_status == 'changed'
-        run: opam install . --deps-only
-
-      - name: "Syntax: build CLI"
-        if: env.syntax_status == 'changed'
-        run: opam exec -- dune build
-
       - name: "Syntax: Run roundtrip tests"
         if: ${{ env.syntax_status == 'changed' && runner.os != 'Windows' }}
         run: opam exec -- make test-syntax-roundtrip
@@ -84,10 +82,13 @@ jobs:
       - name: Build ninja
         run: node scripts/buildNinjaBinary.js
 
-      - name: Run install script
-        run: opam exec -- node scripts/install.js
-        env:
-          RESCRIPT_FORCE_REBUILD: 1
+      - name: Build runtime/stdlib
+        # if: runner.os != 'Windows'
+        run: |
+          node scripts/copyExes.js
+          opam exec -- node ./scripts/ninja.js config
+          opam exec -- node ./scripts/ninja.js build
+          node scripts/prebuilt.js
 
       - name: Run tests
         if: runner.os != 'Windows'
@@ -113,17 +114,6 @@ jobs:
           name: lib-ocaml
           path: lib/ocaml
 
-      # Important: the ninja build must run after the artifact upload because for some reason
-      # the bsc.exe created by the ninja build does not find the Pervasives module.
-      # So this is run here just to test the normal dev workflow, too.
-      - name: ninja config
-        if: runner.os != 'Windows'
-        run: opam exec -- node ./scripts/ninja.js config
-
-      - name: ninja build
-        if: runner.os != 'Windows'
-        run: opam exec -- node ./scripts/ninja.js build
-
       - name: Check for changes in lib folder
         run: git diff --exit-code lib/js lib/es6
 

Makefile

@@ -2,6 +2,7 @@ SHELL = /bin/bash
 
 build:
 	dune build
+	./scripts/copyExes.js
 
 watch:
 	dune build -w
@@ -12,8 +13,11 @@ bench: build
 dce: build
 	opam exec reanalyze.exe -- -dce-cmt _build
 
+ninja/ninja:
+	node scripts/buildNinjaBinary.js
+
 test: build
-	npm test
+	dune exec -- node scripts/ciTest.js -all
 
 test-syntax: build
 	dune exec -- syntax_tests
@@ -36,7 +40,8 @@ test-all: test test-gentype
 # 	reanalyze.exe -set-exit-code -all-cmt _build/default -suppress syntax_tests,syntax_compiler_libs -exclude-paths syntax_compiler_libs 
 
 lib: build
-	node scripts/install -force-lib-rebuild
+	node scripts/ninja.js config
+	node scripts/ninja.js build
 
 artifacts: lib
 	./scripts/makeArtifactList.js

jscomp/bsb_exe/dune

@@ -1,7 +1,6 @@
 (executable
  (name rescript_main)
  (public_name rescript)
- (modes exe)
  (flags
   (:standard -w +a-d-4-9-40-41-42-70))
  (libraries bsb common ext str unix))

jscomp/bsb_helper_exe/dune

@@ -1,7 +1,6 @@
 (executable
  (name bsb_helper_main)
  (public_name bsb_helper)
- (modes exe)
  (flags
   (:standard -w +a-9-40-42))
  (libraries bsb_helper))

jscomp/bsc/dune

@@ -1,7 +1,6 @@
 (executable
  (name rescript_compiler_main)
  (public_name bsc)
- (modes exe)
  (flags
   (:standard -w +a-4-9-30-40-41-42-48-70))
  (libraries

jscomp/bspack/dune

@@ -1,7 +1,6 @@
 (executable
  (name bspack_main)
  (public_name bspack)
- (modes exe)
  (flags
   (:standard -w +a-50))
  (libraries unix))

jscomp/cmij/dune

@@ -1,7 +1,6 @@
 (executable
  (name cmij_main)
  (public_name cmij)
- (modes exe)
  (flags
   (:standard -w +a-4-9-40-42))
  (libraries core))

jscomp/cmjdump/dune

@@ -1,7 +1,6 @@
 (executable
  (name cmjdump_main)
  (public_name cmjdump)
- (modes exe)
  (flags
   (:standard -w +a-40-42))
  (libraries core))

jscomp/common/dune

@@ -1,6 +1,9 @@
 (library
  (name common)
  (wrapped false)
+ (preprocess
+  (action
+   (run %{bin:cppo} %{env:CPPO_FLAGS=} %{input-file})))
  (flags
   (:standard -w +a-9-40-42))
  (libraries napkin))

jscomp/common/js_config.ml

@@ -1,4 +1,3 @@
-# 1 "common/js_config.pp.ml"
 (* Copyright (C) 2015-2016 Bloomberg Finance L.P.
  *
  * This program is free software: you can redistribute it and/or modify
@@ -35,11 +34,10 @@ let diagnose = ref false
 
 let get_diagnose () =
   !diagnose
-  
-# 38 "common/js_config.pp.ml"
+#ifndef RELEASE
   || Sys.getenv_opt "RES_DEBUG_FILE" <> None
+#endif
 
-# 41 "common/js_config.pp.ml"
 (* let (//) = Filename.concat *)
 
 (* let get_packages_info () = !packages_info *)