Skip to content

Commit d21be91

Browse files
committed
Try without ocaml-env
1 parent 5de2084 commit d21be91

File tree

2 files changed

+46
-46
lines changed

2 files changed

+46
-46
lines changed

.github/workflows/ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
echo "git diff again"
3232
git diff tests/src/expected/Auto.res.txt
3333
echo "make now===="
34-
& $env:CYGWIN_ROOT\\bin\\ocaml-env exec -- make foo
34+
make foo
3535
artifact-folder: win32
3636

3737
runs-on: ${{matrix.os}}

analysis/Makefile

+45-45
Original file line numberDiff line numberDiff line change
@@ -8,51 +8,51 @@ OCAMLDEP = ocamldep.opt
88

99
OUTPUT = rescript-editor-analysis.exe
1010

11-
%.cmi : %.mli
12-
@echo Building $@
13-
@$(OCAMLOPT) $(OCAMLFLAGS) -c $<
14-
%.cmx : %.ml
15-
@echo Building $@
16-
@$(OCAMLOPT) $(OCAMLFLAGS) -c $<
17-
18-
include .depend
19-
depend:
20-
@$(OCAMLDEP) -native $(INCLUDES) `find src -name "*.ml" -o -name "*.mli"` > .depend
21-
22-
SOURCE_FILES = $(shell $(OCAMLDEP) -sort `find src -name "*.ml"` | sed -E "s/\.ml/.cmx/g")
23-
24-
$(OUTPUT): $(SOURCE_FILES)
25-
@echo Linking...
26-
@$(OCAMLOPT) $(OCAMLFLAGS) -O2 -o $(OUTPUT) \
27-
-I +compiler-libs unix.cmxa str.cmxa ocamlcommon.cmxa $(INCLUDES) $(SOURCE_FILES)
28-
@echo Done!
29-
30-
build-native: $(OUTPUT) depend
31-
32-
dce: build-native
33-
@echo "git diff makefile dce 1"
34-
git diff tests/src/expected/Auto.res.txt
35-
../node_modules/.bin/reanalyze -dce-cmt src -suppress src/vendor
36-
@echo "git diff makefile dce 2"
37-
git diff tests/src/expected/Auto.res.txt
38-
39-
tests/node_modules/.bin/rescript:
40-
@echo "git diff makefile rescript 1"
41-
git diff tests/src/expected/Auto.res.txt
42-
@cd tests && npm install
43-
@echo "git diff makefile rescript 2"
44-
git diff tests/src/expected/Auto.res.txt
45-
46-
test: dce tests/node_modules/.bin/rescript
47-
@echo "git diff makefile test 1"
48-
git diff tests/src/expected/Auto.res.txt
49-
@cd tests && node_modules/.bin/rescript
50-
@echo "git diff makefile test 2"
51-
git diff tests/src/expected/Auto.res.txt
52-
./test.sh
53-
54-
clean:
55-
git clean -dfx src
11+
# %.cmi : %.mli
12+
# @echo Building $@
13+
# @$(OCAMLOPT) $(OCAMLFLAGS) -c $<
14+
# %.cmx : %.ml
15+
# @echo Building $@
16+
# @$(OCAMLOPT) $(OCAMLFLAGS) -c $<
17+
18+
# include .depend
19+
# depend:
20+
# @$(OCAMLDEP) -native $(INCLUDES) `find src -name "*.ml" -o -name "*.mli"` > .depend
21+
22+
# SOURCE_FILES = $(shell $(OCAMLDEP) -sort `find src -name "*.ml"` | sed -E "s/\.ml/.cmx/g")
23+
24+
# $(OUTPUT): $(SOURCE_FILES)
25+
# @echo Linking...
26+
# @$(OCAMLOPT) $(OCAMLFLAGS) -O2 -o $(OUTPUT) \
27+
# -I +compiler-libs unix.cmxa str.cmxa ocamlcommon.cmxa $(INCLUDES) $(SOURCE_FILES)
28+
# @echo Done!
29+
30+
# build-native: $(OUTPUT) depend
31+
32+
# dce: build-native
33+
# @echo "git diff makefile dce 1"
34+
# git diff tests/src/expected/Auto.res.txt
35+
# ../node_modules/.bin/reanalyze -dce-cmt src -suppress src/vendor
36+
# @echo "git diff makefile dce 2"
37+
# git diff tests/src/expected/Auto.res.txt
38+
39+
# tests/node_modules/.bin/rescript:
40+
# @echo "git diff makefile rescript 1"
41+
# git diff tests/src/expected/Auto.res.txt
42+
# @cd tests && npm install
43+
# @echo "git diff makefile rescript 2"
44+
# git diff tests/src/expected/Auto.res.txt
45+
46+
# test: dce tests/node_modules/.bin/rescript
47+
# @echo "git diff makefile test 1"
48+
# git diff tests/src/expected/Auto.res.txt
49+
# @cd tests && node_modules/.bin/rescript
50+
# @echo "git diff makefile test 2"
51+
# git diff tests/src/expected/Auto.res.txt
52+
# ./test.sh
53+
54+
# clean:
55+
# git clean -dfx src
5656

5757
foo:
5858
@echo "git diff makefile foo"

0 commit comments

Comments
 (0)