Build executables with dune

Author: cknitt

.depend

@@ -6,29 +6,40 @@ on:
   pull_request:
     branches: [ master ]
 
+env:
+  OCAML_VERSION: 4.06.1
+  
 jobs:
   test:
-    runs-on: macos-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [macos-latest, ubuntu-latest, windows-latest]
 
+    runs-on: ${{matrix.os}}
+    
     steps:
-    - uses: actions/checkout@v2.3.4
+    - uses: actions/checkout@v3
 
     - name: Cache OCaml's opam
       uses: actions/cache@v2.1.5
       with:
         path: ~/.opam
-        key: macos-latest-ocaml-4.06.1
+        key: ${{matrix.os}}-ocaml-${{env.OCAML_VERSION}}
 
-    - name: Use OCaml
-      uses: ocaml/setup-ocaml@v2
+    - name: Use OCaml ${{env.OCAML_VERSION}}
+      uses: ocaml/setup-ocaml@v2.0.3
       with:
-        ocaml-compiler: 4.06.1
+        ocaml-compiler: ${{env.OCAML_VERSION}}
+        opam-pin: false
+        opam-depext: false
 
-    - name: Use Node.js
-      uses: actions/setup-node@v2.1.5
-      with:
-        node-version: 16
+    - name: Install dependencies
+      run: opam install dune reanalyze
 
-    - run: npm ci
+    - name: Build executables
+      run: opam exec -- dune build
 
-    - run: eval $(opam env) && make roundtrip-test
+    - name: Run roundtrip tests
+      if: runner.os == 'macOS'
+      run: opam exec -- make roundtrip-test

.github/workflows/ci.yml

@@ -1,10 +1,10 @@
 .DS_STORE
-node_modules
 *.cm*
 *.o
 *.s
 lib/*
 !lib/README.md
 .vscode/settings.json
- # each person has its own preferences
- _build
+
+# Dune
+_build

.gitignore

@@ -1,82 +1,24 @@
-OCAMLOPT=ocamlopt.opt
-OCAMLFLAGS=-g -w +a-4-42-40-9-48 -warn-error +a -bin-annot -I +compiler-libs -I src -I tests -absname
-OCAMLDEP=ocamldep.opt
-%.cmi : %.mli
-	$(OCAMLOPT) $(OCAMLFLAGS) -c $<
-%.cmx : %.ml
-	$(OCAMLOPT) $(OCAMLFLAGS) -c $<
-include .depend
-.PHONY: depend
-depend:
-	@$(OCAMLDEP) -native -I tests -I src src/*.ml src/*.mli tests/*.ml tests/*.mli > .depend
+build:
+	dune build
 
-API_FILES = \
-	src/reactjs_jsx_ppx_v3.cmx\
-	src/res_io.cmx\
-	src/res_minibuffer.cmx\
-	src/res_doc.cmx\
-	src/res_comment.cmx\
-	src/res_token.cmx\
-	src/res_grammar.cmx\
-	src/res_reporting.cmx\
-	src/res_diagnostics_printing_utils.cmx \
-	src/res_diagnostics.cmx\
-	src/res_parsetree_viewer.cmx\
-	src/res_parens.cmx\
-	src/res_comments_table.cmx\
-	src/res_utf8.cmx\
-	src/res_printer.cmx\
-	src/res_scanner.cmx\
-	src/res_js_ffi.cmx\
-	src/res_parser.cmx\
-	src/res_core.cmx\
-	src/res_driver.cmx \
-	src/res_ast_conversion.cmx \
-	src/res_driver_ml_parser.cmx \
-	src/res_driver_reason_binary.cmx \
-	src/res_driver_binary.cmx \
-	src/res_ast_debugger.cmx \
-	src/res_outcome_printer.cmx \
-	src/res_multi_printer.cmx
+bootstrap: build
+	dune exec -- ./scripts/bootstrap.sh
 
-CLI_FILES = $(API_FILES) src/res_cli.cmx
+bench: build
+	dune exec -- bench
 
-TEST_FILES = $(API_FILES) tests/res_utf8_test.cmx tests/res_test.cmx
+test: reanalyze
+	dune exec -- tests
+	dune exec -- ./test.sh
 
-.DEFAULT_GOAL := build-native
+roundtrip-test: reanalyze
+	dune exec -- tests
+	ROUNDTRIP_TEST=1 dune exec -- ./test.sh
 
-lib/rescript.exe: $(CLI_FILES)
-	$(OCAMLOPT) $(OCAMLFLAGS) -O2 -o ./lib/rescript.exe -I +compiler-libs ocamlcommon.cmxa  -I src $(CLI_FILES)
-
-build-native: lib/rescript.exe depend
-
-bootstrap: build-native
-	# pack and parse the whole codebase using the compiler itself. Kind of a test
-	ocaml unix.cma ./scripts/bspack.ml -bs-main Res_cli -I src -o ./lib/rescript.ml
-	./lib/rescript.exe ./lib/rescript.ml > ./lib/rescript.res
-	$(OCAMLOPT) -w a -pp "./lib/rescript.exe -print binary" -O2 -o ./lib/rescript.exe -I +compiler-libs ocamlcommon.cmxa -I lib -impl ./lib/rescript.res
-
-bench: lib/bench.exe
-	./lib/bench.exe
-
-lib/bench.exe: benchmarks/Benchmark.ml $(API_FILES)
-	$(OCAMLOPT) $(OCAMLFLAGS) -O2 -o ./lib/bench.exe -bin-annot -I +compiler-libs ocamlcommon.cmxa benchmarks/mac_osx_time.c -I benchmarks -I src $(API_FILES) benchmarks/Benchmark.ml
-
-lib/test.exe: $(TEST_FILES)
-	$(OCAMLOPT) $(OCAMLFLAGS) -O2 -o ./lib/test.exe -bin-annot -I +compiler-libs ocamlcommon.cmxa -I src -I tests $(TEST_FILES)
-
-test: reanalyze build-native lib/test.exe
-	./lib/test.exe
-	./test.sh
-
-roundtrip-test: reanalyze lib/test.exe
-	./lib/test.exe
-	ROUNDTRIP_TEST=1 ./test.sh
-
-reanalyze: build-native lib/test.exe
-	npx reanalyze -all-cmt . -suppress tests
+reanalyze: build
+	reanalyze.exe -all-cmt _build/default -suppress tests
 
 clean:
-	git clean -dfx src benchmarks lib tests
+	dune clean
 
-.PHONY: clean test roundtrip-test reanalyze bootstrap build-native
+.PHONY: bench clean test roundtrip-test reanalyze bootstrap build-native

Makefile

@@ -0,0 +1,11 @@
+(executable
+ (name benchmark)
+ (public_name bench)
+ (enabled_if
+  (= %{system} macosx))
+ (flags
+  (-open Syntax))
+ (foreign_stubs
+  (language c)
+  (names mac_osx_time))
+ (libraries syntax compiler-libs.common))

benchmarks/dune

@@ -0,0 +1,6 @@
+(executable
+ (name res_cli)
+ (public_name rescript)
+ (flags
+  (-open Syntax))
+ (libraries syntax compiler-libs.common))

cli/dune

@@ -0,0 +1,9 @@
+(dirs src cli benchmarks tests scripts)
+
+(env
+ (dev
+  (flags
+   (:standard -w +a-4-42-40-9-48)))
+ (release
+  (flags
+   (:standard -w +a-4-42-40-9-48))))

src/reactjs_jsx_ppx_v3.ml renamed to cli/reactjs_jsx_ppx_v3.ml

@@ -0,0 +1,9 @@
+(lang dune 2.3)
+
+(name rescript-syntax)
+
+(generate_opam_files true)
+
+(package
+ (name rescript-syntax)
+ (synopsis "ReScript parser/printer"))

src/reactjs_jsx_ppx_v3.mli renamed to cli/reactjs_jsx_ppx_v3.mli

@@ -0,0 +1,20 @@
+# This file is generated by dune, edit dune-project instead
+opam-version: "2.0"
+synopsis: "ReScript parser/printer"
+depends: [
+  "dune" {>= "2.3"}
+]
+build: [
+  ["dune" "subst"] {pinned}
+  [
+    "dune"
+    "build"
+    "-p"
+    name
+    "-j"
+    jobs
+    "@install"
+    "@runtest" {with-test}
+    "@doc" {with-doc}
+  ]
+]

src/res_cli.ml renamed to cli/res_cli.ml

@@ -0,0 +1,6 @@
+#!/bin/zsh
+
+# pack and parse the whole codebase using the compiler itself. Kind of a test
+ocaml unix.cma ./scripts/bspack.ml -bs-main Res_cli -I cli -I src -o ./lib/rescript.ml
+rescript ./lib/rescript.ml > ./lib/rescript.res
+ocamlopt.opt -w a -pp "rescript -print binary" -O2 -o rescript -I +compiler-libs ocamlcommon.cmxa -I lib -impl ./lib/rescript.res

dune

@@ -0,0 +1,3 @@
+(library
+ (name syntax)
+ (libraries compiler-libs.common))