projects
/
tatoo.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cherry pick use of menhir features from branch feature/menhir.
[tatoo.git]
/
Remakefile.in
diff --git
a/Remakefile.in
b/Remakefile.in
index
627f79c
..
2a32aa2
100644
(file)
--- a/
Remakefile.in
+++ b/
Remakefile.in
@@
-1,24
+1,28
@@
-OCAMLFINDPACKAGES = "ulex,unix,expat,camlp4.macro"
+.OPTIONS = variable-propagation
+
+OCAMLFINDPACKAGES = "ulex,unix,expat,camlp4.macro,bigarray"
OCAMLFINDSYNTAX = camlp4o
OCAMLFINDPPOPTS = $(addprefix "-ppopt ", @CAMLP4FLAGS@ -I include)
OCAMLFINDINCLUDES = $(addprefix "-I ", src)
OCAMLFINDSYNTAX = camlp4o
OCAMLFINDPPOPTS = $(addprefix "-ppopt ", @CAMLP4FLAGS@ -I include)
OCAMLFINDINCLUDES = $(addprefix "-I ", src)
-OCAMLFINDFLAGS
= -syntax $(OCAMLFINDSYNTAX) -package $(OCAMLFINDPACKAGES) \
-
$(OCAMLFINDPPOPTS) $(OCAMLFINDINCLUDES
)
+OCAMLFINDFLAGS
NOSYNTAX = -package $(OCAMLFINDPACKAGES) $(OCAMLFINDPPOPTS) $(OCAMLFINDINCLUDES)
+
OCAMLFINDFLAGS = -syntax $(OCAMLFINDSYNTAX) $(OCAMLFINDFLAGSNOSYNTAX
)
OCAMLFINDLINKFLAGS = -linkpkg
PACKAGE = @PACKAGE_TARNAME@
SRC = src
BIN = src/@PACKAGE_TARNAME@.native@EXE@
OCAMLFINDLINKFLAGS = -linkpkg
PACKAGE = @PACKAGE_TARNAME@
SRC = src
BIN = src/@PACKAGE_TARNAME@.native@EXE@
+BYTE = src/@PACKAGE_TARNAME@.byte@EXE@
EXE = @EXE@
REMAKE = @REMAKE@
EXE = @EXE@
REMAKE = @REMAKE@
-OCAMLDEP = @OCAMLDEP@
-ODEPS = tools/odeps.sh $(OCAMLDEP)
OCAMLC = @OCAMLC@
OCAMLOPT = @OCAMLOPT@
OCAMLC = @OCAMLC@
OCAMLOPT = @OCAMLOPT@
+OCAMLDEP = @OCAMLDEP@
OCAMLFLAGS = @OCAMLFLAGS@
OCAMLOPTFLAGS = @OCAMLOPTFLAGS@
OCAMLCFLAGS = @OCAMLCFLAGS@
OCAMLFLAGS = @OCAMLFLAGS@
OCAMLOPTFLAGS = @OCAMLOPTFLAGS@
OCAMLCFLAGS = @OCAMLCFLAGS@
-OCAMLYACC = @OCAMLYACC@
+MENHIR = @MENHIR@
+
+.PHONY:clean real_test test_native test
all: $(BIN)
all: $(BIN)
@@
-35,7
+39,7
@@
clean:
for dir in src tools; do
find $dir -name '*.cm*' -o -name '*.o' -o -name '*.byte' -o \
-name '*.native' -o -name '*.mll' -o -name '*.mly' -o \
for dir in src tools; do
find $dir -name '*.cm*' -o -name '*.o' -o -name '*.byte' -o \
-name '*.native' -o -name '*.mll' -o -name '*.mly' -o \
- -name '*.class' -o -name '*.dep' | while read file; do
+ -name '*.class' -o -name '*.dep
o' -o -name '*.depx' -o -name '*.ml.str
' | while read file; do
case "$file" in
*.mll)
rm -f "${file%.mll}.ml"
case "$file" in
*.mll)
rm -f "${file%.mll}.ml"
@@
-43,8
+47,11
@@
clean:
*.mly)
rm -f "${file%.mly}.ml" "${file%.mly}.mli"
;;
*.mly)
rm -f "${file%.mly}.ml" "${file%.mly}.mli"
;;
+ *.ml.str)
+ rm -f "${file%.ml.str}.ml"
+ ;;
*)
*)
- rm -f "$file"
+
rm -f "$file"
;;
esac
done
;;
esac
done
@@
-56,39
+63,57
@@
distclean: clean test_clean
%.class: %.java
javac $<
%.class: %.java
javac $<
-%.native$(EXE): %.cmx %.dep
- objects=`cat $*.dep | xargs | sed 's/[.]dep/.cmx/g'`
- $(OCAMLOPT) -o $@ $(OCAMLFLAGS) $(OCAMLOPTFLAGS) $(OCAMLFINDLINKFLAGS) $(OCAMLFINDFLAGS) $objects $<
+%.native$(EXE):
+ $(REMAKE) OCAMLNATIVE="-native" $*.cmx $*.depx
+ objects=`cat $*.depx | xargs | sed 's/[.]depx/.cmx/g'`
+ $(REMAKE) OCAMLNATIVE="-native" $objects #ensure all objects have been built
+ $(OCAMLOPT) -o $@ $(OCAMLFLAGS) $(OCAMLOPTFLAGS) $(OCAMLFINDLINKFLAGS) $(OCAMLFINDFLAGS) $objects $*.cmx
+
-%.byte$(EXE): %.cmo %.dep
- objects=`cat $*.dep | xargs | sed 's/[.]dep/.cmo/g'`
- $(OCAMLC) -o $@ $(OCAMLFLAGS) $(OCAMLCFLAGS) $(OCAMLFINDLINKFLAGS) $(OCAMLFINDFLAGS) $objects $<
+%.byte$(EXE):
+ $(REMAKE) OCAMLNATIVE="" $*.cmo $*.depo
+ objects=`cat $*.depo | xargs | sed 's/[.]depo/.cmo/g'`
+ $(REMAKE) OCAMLNATIVE="" $objects #ensure all objects have been built
+ $(OCAMLC) -o $@ $(OCAMLFLAGS) $(OCAMLCFLAGS) $(OCAMLFINDLINKFLAGS) $(OCAMLFINDFLAGS) $objects $*.cmo
%.ml:
if test -f $*.mly; then
$(REMAKE) $*.mly
%.ml:
if test -f $*.mly; then
$(REMAKE) $*.mly
- $(OCAMLYACC) $*.mly
+ #Work around menhir warning
+ $(MENHIR) $*.mly 2>&1 | grep -v -- 'you are\|--infer'
+ #Work around crazy ulex chocking on identifier 'lexer', generated by menhir.
+ cat $*.ml | sed -e 's/\blexer\b/__lexer/g' > $*.tmp
+ mv $*.tmp $*.ml
elif test -f $*.mll; then
$(REMAKE) $*.mll
$(OCAMLLEX) $*.mll
elif test -f $*.mll; then
$(REMAKE) $*.mll
$(OCAMLLEX) $*.mll
+ elif test -f $*.ml.str; then
+ $(REMAKE) $*.ml.str
+ echo -n 'let content = "' > $*.ml
+ sed -e 's/\(["\\]\)/\\\1/g' $*.ml.str | sed -e 's/^\(.*\)$/\1\\n\\/g' >> $*.ml
+ echo '' >> $*.ml
+ echo '"' >> $*.ml
fi
fi
-%.cmx %.dep:
+%.cmx %.dep
x
:
base=$*
target=$@
base=$*
target=$@
- NATIVE=-native
- REMAKE="$(REMAKE)
-v OCAMLNATIVE=$NATIVE
"
+ DEPEXT=depx
+ REMAKE="$(REMAKE)"
OCAMLDEP="$(OCAMLDEP) $(OCAMLFINDFLAGS)"
OCAMLDEP="$(OCAMLDEP) $(OCAMLFINDFLAGS)"
+ OCAMLNATIVE=$(OCAMLNATIVE)
SRC=$(SRC)
COMPILE="$(OCAMLOPT) $(OCAMLFLAGS) $(OCAMLOPTFLAGS) $(OCAMLFINDFLAGS)"
. tools/ocamldriver.sh
SRC=$(SRC)
COMPILE="$(OCAMLOPT) $(OCAMLFLAGS) $(OCAMLOPTFLAGS) $(OCAMLFINDFLAGS)"
. tools/ocamldriver.sh
-%.cmo %.dep:
+
+%.cmo %.depo:
base=$*
target=$@
base=$*
target=$@
- NATIVE=
- REMAKE="$(REMAKE)
-v OCAMLNATIVE=$NATIVE
"
+ DEPEXT=depo
+ REMAKE="$(REMAKE)"
OCAMLDEP="$(OCAMLDEP) $(OCAMLFINDFLAGS)"
OCAMLDEP="$(OCAMLDEP) $(OCAMLFINDFLAGS)"
+ OCAMLNATIVE=$(OCAMLNATIVE)
SRC=$(SRC)
COMPILE="$(OCAMLC) $(OCAMLFLAGS) $(OCAMLCFLAGS) $(OCAMLFINDFLAGS)"
. tools/ocamldriver.sh
SRC=$(SRC)
COMPILE="$(OCAMLC) $(OCAMLFLAGS) $(OCAMLCFLAGS) $(OCAMLFINDFLAGS)"
. tools/ocamldriver.sh
@@
-96,41
+121,53
@@
distclean: clean test_clean
%.cmi:
base=$*
target=$@
%.cmi:
base=$*
target=$@
- NATIVE=$(OCAMLNATIVE)
- REMAKE="$(REMAKE) -v OCAMLNATIVE=$NATIVE"
+ REMAKE="$(REMAKE)"
OCAMLDEP="$(OCAMLDEP) $(OCAMLFINDFLAGS)"
SRC=$(SRC)
OCAMLDEP="$(OCAMLDEP) $(OCAMLFINDFLAGS)"
SRC=$(SRC)
- if test -z "$NATIVE"; then
+ OCAMLNATIVE=$(OCAMLNATIVE)
+ if test -z "$OCAMLNATIVE"; then
+ DEPEXT=.depo
COMPILE="$(OCAMLC) $(OCAMLFLAGS) $(OCAMLCFLAGS) $(OCAMLFINDFLAGS)"
else
COMPILE="$(OCAMLOPT) $(OCAMLFLAGS) $(OCAMLOPTFLAGS) $(OCAMLFINDFLAGS)"
COMPILE="$(OCAMLC) $(OCAMLFLAGS) $(OCAMLCFLAGS) $(OCAMLFINDFLAGS)"
else
COMPILE="$(OCAMLOPT) $(OCAMLFLAGS) $(OCAMLOPTFLAGS) $(OCAMLFINDFLAGS)"
+ DEPEXT=.depx
fi
. tools/ocamldriver.sh
## Tests
fi
. tools/ocamldriver.sh
## Tests
-test:
+
+real_test:
+ echo $(TEST)
for i in tests/*.xml
do
for j in 1 2 3
do
for i in tests/*.xml
do
for j in 1 2 3
do
- $(REMAKE) "$i".test"$j".summary
+ $(REMAKE)
TEST=$(TEST)
"$i".test"$j".summary
done
done
done
done
+test_byte:
+ $(REMAKE) TEST=$(BYTE) real_test
+test_native:
+ $(REMAKE) TEST=$(BIN) real_test
+
+test: test_native
+
test_clean:
rm -rf tests/*.summary tests/*.results/*_"$(PACKAGE)"_*.*
test_clean:
rm -rf tests/*.summary tests/*.results/*_"$(PACKAGE)"_*.*
-%.summary: tools $(BIN)
- target=$@
- base=$*
- test=${base#*.xml.}
- xml=${base%.$test}
- REMAKE=$(REMAKE)
- BIN=$(BIN)
- SPLIT=tools/split_path.native$(EXE)
- XMLDIFF=tools/xml_diff.native$(EXE)
- PACKAGE=$(PACKAGE)
- $REMAKE $xml ${xml}.queries tests/${test}.sh
- rm -f "$target"
- . tests/${test}.sh
+%.summary:
+ $(REMAKE) tools $(TEST)
+ target=$@
+ base=$*
+ test=${base#*.xml.}
+ xml=${base%.$test}
+ REMAKE=$(REMAKE)
+ BIN=$(TEST)
+ SPLIT=tools/split_path.native$(EXE)
+ XMLDIFF=tools/xml_diff.native$(EXE)
+ PACKAGE=$(PACKAGE)
+ $REMAKE $xml ${xml}.queries tests/${test}.sh
+ rm -f "$target"
+ . tests/${test}.sh