Enable building the whole compiler with dune

Author: cknitt

.github/workflows/ci.yml

@@ -53,22 +53,18 @@ jobs:
       - name: "Syntax: install OPAM dependencies"
         if: env.syntax_status == 'changed'
         run: opam install . --deps-only
-        working-directory: res_syntax
 
       - name: "Syntax: build CLI"
         if: env.syntax_status == 'changed'
         run: opam exec -- dune build
-        working-directory: res_syntax
 
       - name: "Syntax: Run roundtrip tests"
         if: ${{ env.syntax_status == 'changed' && runner.os != 'Windows' }}
-        run: opam exec -- make roundtrip-test
-        working-directory: res_syntax
+        run: opam exec -- make test-syntax-roundtrip
 
       - name: "Syntax: Run tests (Windows)"
         if: ${{ env.syntax_status == 'changed' && runner.os == 'Windows' }}
-        run: opam exec -- make test
-        working-directory: res_syntax
+        run: opam exec -- make test-syntax
 
       # Required for ninja build
       - name: "Windows: Use MSVC"
@@ -77,14 +73,14 @@ jobs:
         with:
           arch: x64
 
-      - name: Build ninja
-        run: node scripts/buildNinjaBinary.js
-
       - name: Use Node.js
         uses: actions/setup-node@v3
         with:
           node-version: 16
 
+      - name: Build ninja
+        run: node scripts/buildNinjaBinary.js
+
       - name: NPM install
         run: opam exec -- npm ci
         env:

Makefile

@@ -1,32 +1,52 @@
 SHELL = /bin/bash
 
-config:
-	./scripts/ninja.js config
-
-build: config
-	./scripts/ninja.js build
+build:
 	dune build
 
-watch: config
+watch:
 	dune build -w
 
+bench: build
+	dune exec -- syntax_benchmarks
+
 dce: build
 	opam exec reanalyze.exe -- -dce-cmt _build
 
 test: build
 	npm test
 
+test-syntax: build
+	dune exec -- syntax_tests
+	dune exec -- bash ./scripts/test_syntax.sh
+#	make reanalyze
+	bash ./scripts/testok.sh
+
+test-syntax-roundtrip: build
+	dune exec -- syntax_tests
+	ROUNDTRIP_TEST=1 dune exec -- bash ./scripts/test.sh
+#	make reanalyze
+	bash ./scripts/testok.sh
+
 test-gentype: build
 	make -C jscomp/gentype_tests/typescript-react-example test
 
 test-all: test test-gentype
 
+# reanalyze: build
+# 	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
 
 artifacts: lib
 	./scripts/makeArtifactList.js
 
+# format:
+# 	dune build @fmt --auto-promote
+
+# checkformat:
+# 	dune build @fmt
+
 clean-gentype:
 	make -C jscomp/gentype_tests/typescript-react-example clean
 
@@ -38,4 +58,4 @@ clean-all: clean clean-gentype
 
 .DEFAULT_GOAL := build
 
-.PHONY: build clean clean-gentype clean-all config lib test test-all test-gentype
+.PHONY: build watch bench dce test test-syntax test-syntax-roundtrip test-gentype test-all lib artifacts clean-gentype clean clean-all

docs/Syntax.md

@@ -22,14 +22,19 @@ Required:
 - OCaml 4.10 or later
 - OS: macOS, Linux or Windows
 
-The syntax source code is located in the directory `res_syntax`. All following commands are meant to be executed in that directory.
+In the root of the rescript-compiler repo, run
 
 ```sh
 opam install . --deps-only --with-test
+```
+
+To build the syntax sources, run
+
+```sh
 make # or "dune build"
 ```
 
-This will produce the three binaries `rescript`, `tests` and `bench` (with `.exe` extension on Windows).
+This will produce the three binaries `res_parser`, `syntax_tests` and `syntax_benchmarks` (with `.exe` extension on Windows).
 
 We only build production binaries, even in dev mode. No need for a separate dev binary when the build is fast enough. Plus, this encourages proper benchmarking of the (production) binary each diff.
 

dummy.opam

@@ -1 +1 @@
-(dirs jscomp res_syntax)
+(dirs jscomp)

dune

@@ -1,3 +1,31 @@
-(lang dune 2.0)
- (name rescript) 
- 
+(lang dune 2.3)
+
+(name rescript)
+
+(generate_opam_files true)
+
+(license LGPL-3.0-or-later)
+
+(authors "Hongbo Zhang <[email protected]>")
+
+(maintainers "Hongbo Zhang <[email protected]>" "Cristiano Calcagno")
+
+(homepage "https://github.com/rescript-lang/rescript-compiler")
+
+(bug_reports "https://github.com/rescript-lang/rescript-compiler/issues")
+
+(package
+ (name rescript)
+ (synopsis "ReScript compiler")
+ (depends
+  (ocaml
+   (>= 4.10))
+  (ocamlformat
+   (= 0.22.4))
+  (cppo
+   (= 1.6.9))
+  (js_of_ocaml-compiler
+   (= 4.0.0))
+  (reanalyze
+   (= 2.23.0))
+  dune))

dune-project

@@ -0,0 +1,6 @@
+(library
+ (name bsb)
+ (wrapped false)
+ (flags
+  (:standard -w +a-d-4-9-40-41-42-70))
+ (libraries common ext str unix))

jscomp/bsb/dune

@@ -0,0 +1,9 @@
+(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))
+
+(copy_files# ../main/rescript_main.{ml,mli})

jscomp/bsb_exe/dune

@@ -0,0 +1,6 @@
+(library
+ (name bsb_helper)
+ (wrapped false)
+ (flags
+  (:standard -w +a-9-40-42))
+ (libraries ext))

jscomp/bsb_helper/dune

@@ -0,0 +1,9 @@
+(executable
+ (name bsb_helper_main)
+ (public_name bsb_helper)
+ (modes exe)
+ (flags
+  (:standard -w +a-9-40-42))
+ (libraries bsb_helper))
+
+(copy_files# ../main/bsb_helper_main.{ml,mli})