Skip to content

Commit 79ca3c8

Browse files
committed
remove winmake.bat
1 parent 905f42d commit 79ca3c8

File tree

2 files changed

+7
-98
lines changed

2 files changed

+7
-98
lines changed

interpreter/Makefile

Lines changed: 7 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# This Makefile uses ocamlbuild but does not rely on ocamlfind or the Opam
1+
# This Makefile uses dune but does not rely on ocamlfind or the Opam
22
# package manager to build. However, Opam package management is available
33
# optionally through the check/install/uninstall targets.
44
#
@@ -15,10 +15,9 @@ OPT = $(NAME)
1515
LIB = $(NAME)
1616
ZIP = $(NAME).zip
1717
JSLIB = wast
18-
WINMAKE = winmake.bat
1918

2019
DIRS = util syntax binary text valid runtime exec script host main tests
21-
LIBS =
20+
LIBS =
2221
FLAGS = -lexflags -ml -cflags '-w +a-4-27-42-44-45-70 -warn-error +a-3'
2322
OCBA = ocamlbuild $(FLAGS) $(DIRS:%=-I %)
2423
OCB = $(OCBA) $(LIBS:%=-libs %)
@@ -28,7 +27,7 @@ JS = # set to JS shell command to run JS tests, empty to skip
2827

2928
# Main targets
3029

31-
.PHONY: default opt unopt libopt libunopt jslib all land zip smallint dunebuild
30+
.PHONY: default opt unopt libopt libunopt jslib all zip smallint dunebuild
3231

3332
default: opt
3433
debug: unopt
@@ -38,10 +37,9 @@ libopt: _build/$(LIB).cmx _build/$(LIB).cmxa
3837
libunopt: _build/$(LIB).cmo _build/$(LIB).cma
3938
jslib: $(JSLIB).js
4039
all: unopt opt libunopt libopt test
41-
land: $(WINMAKE) all
42-
zip: $(ZIP)
40+
zip: $(ZIP)
4341
smallint: smallint.native
44-
ci: land jslib dunebuild
42+
ci: all jslib dunebuild
4543

4644
dunebuild:
4745
dune build
@@ -121,20 +119,6 @@ $(JSLIB).byte: $(JSLIB_DIR)/$(JSLIB).ml
121119
$(JSLIB).js: $(JSLIB).byte
122120
$(JSO) $<
123121
124-
# Building Windows build file
125-
126-
$(WINMAKE): clean
127-
echo rem Auto-generated from Makefile! >$@
128-
echo set NAME=$(NAME) >>$@
129-
echo if \'%1\' neq \'\' set NAME=%1 >>$@
130-
$(OCB) main.byte \
131-
| grep -v ocamldep \
132-
| grep -v mkdir \
133-
| sed s:`which ocaml`:ocaml:g \
134-
| sed s:main/main.d.byte:%NAME%.exe: \
135-
>>$@
136-
137-
138122
# Executing test suite
139123
140124
TESTDIR = ../test/core
@@ -182,8 +166,8 @@ dunetest:
182166
183167
.PHONY: clean
184168
185-
$(ZIP): $(WINMAKE)
186-
git archive --format=zip --prefix=$(NAME)/ -o $@ HEAD
169+
$(ZIP):
170+
git archive --format=zip --prefix=$(NAME)/ -o $@ HEAD
187171
188172
clean:
189173
rm -rf _build/jslib $(LIB).mlpack _tags $(JSLIB).js

interpreter/winmake.bat

Lines changed: 0 additions & 75 deletions
This file was deleted.

0 commit comments

Comments
 (0)