Put back most things

Author: chenglou

.github/workflows/ci.yml

@@ -31,8 +31,7 @@ jobs:
               echo "cat -A Auto.res.txt"
               cat -A tests/src/expected/Auto.res.txt
               echo "make now===="
-              & $env:CYGWIN_ROOT\\bin\\ocaml-env exec -- make foo
-              # make foo
+              & $env:CYGWIN_ROOT\\bin\\ocaml-env exec -- make test
             artifact-folder: win32
 
     runs-on: ${{matrix.os}}

analysis/Makefile

@@ -8,57 +8,57 @@ OCAMLDEP = ocamldep.opt
 
 OUTPUT = rescript-editor-analysis.exe
 
-# %.cmi : %.mli
-# 	@echo Building $@
-# 	@$(OCAMLOPT) $(OCAMLFLAGS) -c $<
-# %.cmx : %.ml
-# 	@echo Building $@
-# 	@$(OCAMLOPT) $(OCAMLFLAGS) -c $<
+%.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
+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")
+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) \
-# 		-I +compiler-libs unix.cmxa str.cmxa ocamlcommon.cmxa $(INCLUDES) $(SOURCE_FILES)
-# 	@echo Done!
+$(OUTPUT): $(SOURCE_FILES)
+	@echo Linking...
+	@$(OCAMLOPT) $(OCAMLFLAGS) -O2 -o $(OUTPUT) \
+		-I +compiler-libs unix.cmxa str.cmxa ocamlcommon.cmxa $(INCLUDES) $(SOURCE_FILES)
+	@echo Done!
 
-# build-native: $(OUTPUT) depend
+build-native: $(OUTPUT) depend
 
-# dce: build-native
-# 	@echo "git diff makefile dce 1"
-# 	git diff tests/src/expected/Auto.res.txt
-# 	../node_modules/.bin/reanalyze -dce-cmt src -suppress src/vendor
-# 	@echo "git diff makefile dce 2"
-# 	git diff tests/src/expected/Auto.res.txt
+dce: build-native
+	@echo "git diff makefile dce 1"
+	git diff tests/src/expected/Auto.res.txt
+	../node_modules/.bin/reanalyze -dce-cmt src -suppress src/vendor
+	@echo "git diff makefile dce 2"
+	git diff tests/src/expected/Auto.res.txt
 
-# tests/node_modules/.bin/rescript:
-# 	@echo "git diff makefile rescript 1"
-# 	git diff tests/src/expected/Auto.res.txt
-# 	@cd tests && npm install
-# 	@echo "git diff makefile rescript 2"
-# 	git diff tests/src/expected/Auto.res.txt
+tests/node_modules/.bin/rescript:
+	@echo "git diff makefile rescript 1"
+	git diff tests/src/expected/Auto.res.txt
+	@cd tests && npm install
+	@echo "git diff makefile rescript 2"
+	git diff tests/src/expected/Auto.res.txt
 
-# test: dce tests/node_modules/.bin/rescript
-# 	@echo "git diff makefile test 1"
-# 	git diff tests/src/expected/Auto.res.txt
-# 	@cd tests && node_modules/.bin/rescript
-# 	@echo "git diff makefile test 2"
-# 	git diff tests/src/expected/Auto.res.txt
-# 	./test.sh
+test: dce tests/node_modules/.bin/rescript
+	@echo "git diff makefile test 1"
+	git diff tests/src/expected/Auto.res.txt
+	@cd tests && node_modules/.bin/rescript
+	@echo "git diff makefile test 2"
+	git diff tests/src/expected/Auto.res.txt
+	./test.sh
 
-# clean:
-# 	git clean -dfx src
+clean:
+	git clean -dfx src
 
-foo:
-	@echo "git diff makefile foo"
-	git diff tests/src/expected/Auto.res.txt
-	@echo "cat -A Auto.res.txt in makefile"
-	cat -A tests/src/expected/Auto.res.txt
+# foo:
+# 	@echo "git diff makefile foo"
+# 	git diff tests/src/expected/Auto.res.txt
+# 	@echo "cat -A Auto.res.txt in makefile"
+# 	cat -A tests/src/expected/Auto.res.txt
 
 .DEFAULT_GOAL := build-native
 

analysis/test.sh

@@ -2,6 +2,9 @@ function exp {
   echo "$(dirname $1)/expected/$(basename $1).txt"
 }
 
+echo "cat -A test.sh"
+cat -A tests/src/expected/Auto.res.txt
+echo "done---------"
 echo "git diff test.sh"
 git diff tests/src/expected/Auto.res.txt
 echo "done---------"
@@ -26,6 +29,14 @@ if [[ $diff = "" ]]; then
 else
   printf "${warningYellow}⚠️ There are unstaged differences in tests/! Did you break a test?\n${diff}\n${reset}"
   # node ./checkErrors.js
+
+  echo "cat -A test.sh last"
+  cat -A tests/src/expected/Auto.res.txt
+  echo "done cat last---------"
+  echo "git diff test.sh last"
+  git diff tests/src/expected/Auto.res.txt
+  echo "done git last---------"
+
   git --no-pager diff --word-diff-regex=. tests/src/expected/Auto.res.txt
   exit 1
 fi