Build with dune.

Author: cristianoc

.github/workflows/ci.yml

@@ -53,6 +53,7 @@ jobs:
         node-version: 14.4.0
 
     - run: npm ci
+    - run: opam install dune
     - run: npm run compile
 
     # These 2 runs (or just the second?) are for when you have opam dependencies. We don't.
@@ -69,7 +70,7 @@ jobs:
       run: |
         cd analysis
         mkdir ${{matrix.artifact-folder}}
-        mv rescript-editor-analysis.exe ${{matrix.artifact-folder}}
+        mv _build/install/default/bin/rescript-editor-analysis.exe ${{matrix.artifact-folder}}
         tar -cvf binary.tar ${{matrix.artifact-folder}}
 
     - uses: actions/upload-artifact@v2

.gitignore

@@ -4,12 +4,5 @@ node_modules
 examples/*/lib
 analysis/tests/lib
 analysis/tests/.bsb.lock
+analysis/_build
 analysis/tests/.merlin
-# artifacts from binary compilation
-*.exe
-*.cmi
-*.cmt
-*.cmti
-*.cmx
-*.o
-*.install

analysis/.merlin

@@ -1,36 +1,11 @@
 SHELL = /bin/bash
-MAKEFLAGS += --jobs 4
-INCLUDES = -I src -I src/vendor/res_outcome_printer -I src/vendor -I src/vendor/compiler-libs-406
 
-OCAMLOPT = ocamlopt.opt
-OCAMLFLAGS = -g -w +26+27+32+33+39 -bin-annot $(INCLUDES)
-OCAMLDEP = ocamldep.opt
+build-native:
+	dune build
 
-OUTPUT = rescript-editor-analysis.exe
-
-%.cmi : %.mli
-	@echo Building $@
-	@$(OCAMLOPT) $(OCAMLFLAGS) -c $<
-%.cmx : %.ml
-	@echo Building $@
-	@$(OCAMLOPT) $(OCAMLFLAGS) -c $<
-
-include .depend
-depend:
-	@$(OCAMLDEP) -native $(INCLUDES) `find src -name "*.ml" -o -name "*.mli"` > .depend
-
-SOURCE_FILES = $(shell $(OCAMLDEP) -sort `find src -name "*.ml"` | sed -E "s/\.ml/.cmx/g")
-
-$(OUTPUT): $(SOURCE_FILES)
-	@echo Linking...
-	@$(OCAMLOPT) $(OCAMLFLAGS) -O2 -o $(OUTPUT) \
-		unix.cmxa str.cmxa $(INCLUDES) $(SOURCE_FILES)
-	@echo Done!
-
-build-native: $(OUTPUT) depend
-
-dce: build-native
-	../../reanalyze/_build/install/default/bin/reanalyze.exe -dce-cmt src -suppress src/vendor
+dce:
+	dune build @check @all
+	../../reanalyze/_build/install/default/bin/reanalyze.exe -dce-cmt _build -suppress src/vendor
 
 tests/node_modules/.bin/rescript:
 	@cd tests && npm install
@@ -39,9 +14,10 @@ test: build-native tests/node_modules/.bin/rescript
 	@cd tests && node_modules/.bin/rescript
 	./test.sh
 
-clean:
-	git clean -dfx .
+clean: tests/node_modules/.bin/rescript
+	@cd tests && node_modules/.bin/rescript clean
+	dune clean
 
 .DEFAULT_GOAL := build-native
 
-.PHONY: depend clean build-native dce test
+.PHONY: clean build-native dce test

analysis/Makefile

@@ -0,0 +1 @@
+(dirs :standard \ examples tests)

analysis/dummy.opam

@@ -0,0 +1,3 @@
+(lang dune 1.7)
+ (name rescript-vscode) 
+ 

analysis/dune

@@ -0,0 +1,17 @@
+(copy_files# vendor/*.{ml,mli})
+(copy_files# vendor/compiler-libs-406/*.{ml,mli})
+(copy_files# vendor/res_outcome_printer/*.{ml,mli})
+(
+  executable
+    (public_name rescript-editor-analysis.exe)
+
+    ; The main module that will become the binary.
+    (name Cli)
+
+    (flags "-w" "+26+27+32+33+39")
+
+    ; Depends on:
+    (libraries unix str)
+
+    (modules_without_implementation asttypes outcometree parsetree)
+)

analysis/dune-project

@@ -1,6 +1,6 @@
 for file in tests/src/*.{res,resi}; do
   output="$(dirname $file)/expected/$(basename $file).txt"
-  ./rescript-editor-analysis.exe test $file &> $output
+  ./_build/install/default/bin/rescript-editor-analysis.exe test $file &> $output
   # CI. We use LF, and the CI OCaml fork prints CRLF. Convert.
   if [ "$RUNNER_OS" == "Windows" ]; then
     perl -pi -e 's/\r\n/\n/g' -- $output