-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)
-OCAMLFINDFLAGS = -syntax $(OCAMLFINDSYNTAX) -package $(OCAMLFINDPACKAGES) \
- $(OCAMLFINDPPOPTS) $(OCAMLFINDINCLUDES)
+OCAMLFINDFLAGSNOSYNTAX = -package $(OCAMLFINDPACKAGES) $(OCAMLFINDPPOPTS) $(OCAMLFINDINCLUDES)
+OCAMLFINDFLAGS = -syntax $(OCAMLFINDSYNTAX) $(OCAMLFINDFLAGSNOSYNTAX)
OCAMLFINDLINKFLAGS = -linkpkg
PACKAGE = @PACKAGE_TARNAME@
SRC = src
BIN = src/@PACKAGE_TARNAME@.native@EXE@
+BYTE = src/@PACKAGE_TARNAME@.byte@EXE@
EXE = @EXE@
REMAKE = @REMAKE@
-OCAMLDEP = @OCAMLDEP@
-ODEPS = tools/odeps.sh $(OCAMLDEP)
OCAMLC = @OCAMLC@
OCAMLOPT = @OCAMLOPT@
+OCAMLDEP = @OCAMLDEP@
OCAMLFLAGS = @OCAMLFLAGS@
OCAMLOPTFLAGS = @OCAMLOPTFLAGS@
OCAMLCFLAGS = @OCAMLCFLAGS@
-OCAMLYACC = @OCAMLYACC@
+MENHIR = @MENHIR@
+
+.PHONY:clean real_test test_native test
all: $(BIN)
+src/xpath/xpath_internal_parser.cmx: OCAMLFINDFLAGS = $(OCAMLFINDFLAGSNOSYNTAX)
+src/xpath/xpath_internal_parser.cmo: OCAMLFINDFLAGS = $(OCAMLFINDFLAGSNOSYNTAX)
+
tools: tools/xml_diff.native$(EXE) tools/XPathEval.class tools/split_path.native$(EXE)
Remakefile: Remakefile.in config.status
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 '*.depo' -o -name '*.depx' -o -name '*.ml.str' | while read file; do
case "$file" in
*.mll)
rm -f "${file%.mll}.ml"
*.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
%.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
- $(OCAMLYACC) $*.mly
+ $(REMAKE) $*.mly
+ $(MENHIR) $*.mly
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
-%.cmx %.dep:
+%.cmx %.depx:
base=$*
target=$@
- NATIVE=-native
- REMAKE="$(REMAKE) -v OCAMLNATIVE=$NATIVE"
+ DEPEXT=depx
+ REMAKE="$(REMAKE)"
OCAMLDEP="$(OCAMLDEP) $(OCAMLFINDFLAGS)"
+ OCAMLNATIVE=$(OCAMLNATIVE)
SRC=$(SRC)
COMPILE="$(OCAMLOPT) $(OCAMLFLAGS) $(OCAMLOPTFLAGS) $(OCAMLFINDFLAGS)"
. tools/ocamldriver.sh
-%.cmo %.dep:
+
+%.cmo %.depo:
base=$*
target=$@
- NATIVE=
- REMAKE="$(REMAKE) -v OCAMLNATIVE=$NATIVE"
+ DEPEXT=depo
+ REMAKE="$(REMAKE)"
OCAMLDEP="$(OCAMLDEP) $(OCAMLFINDFLAGS)"
+ OCAMLNATIVE=$(OCAMLNATIVE)
SRC=$(SRC)
- COMPILE="$(OCAMLC) $(OCAMLFLAGS) $(OCAMLCFLAGS) $(OCAMLFINDFLAGS)"
+ COMPILE="$(OCAMLC) $(OCAMLFLAGS) $(OCAMLCFLAGS) $(OCAMLFIND_EXTRAFLAGS) "
. tools/ocamldriver.sh
%.cmi:
- $(REMAKE) $*.mli
- if test -z "$(OCAMLNATIVE)"; then
- $(OCAMLC) -c $(OCAMLFLAGS) $(OCAMLCFLAGS) $(OCAMLFINDFLAGS) $(PACKINCLUDE) $*.mli
+ base=$*
+ target=$@
+ REMAKE="$(REMAKE)"
+ OCAMLDEP="$(OCAMLDEP) $(OCAMLFINDFLAGS)"
+ SRC=$(SRC)
+ OCAMLNATIVE=$(OCAMLNATIVE)
+ if test -z "$OCAMLNATIVE"; then
+ DEPEXT=.depo
+ COMPILE="$(OCAMLC) $(OCAMLFLAGS) $(OCAMLCFLAGS) $(OCAMLFINDFLAGS)"
else
- $(OCAMLOPT) -c $(OCAMLFLAGS) $(OCAMLOPTFLAGS) $(OCAMLFINDFLAGS) $(PACKINCLUDE) $*.mli
-
+ COMPILE="$(OCAMLOPT) $(OCAMLFLAGS) $(OCAMLOPTFLAGS) $(OCAMLFINDFLAGS)"
+ DEPEXT=.depx
fi
+ . tools/ocamldriver.sh
## Tests
-test: tools $(BIN)
+
+real_test:
+ echo $(TEST)
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
+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)"_*.*
-%.test1.summary:
- base="$@"
- base=${base%.xml.test1.summary}
- $(REMAKE) "$base".xml "$base".xml.queries
- rm -f "$@"
- MSG="Test 1 (single query: tatoo vs java implementation)"
- echo "$MSG" >> "$@"
- echo "$MSG"
- cat "$base".xml.queries | grep -v '^#' | while read q query; do
- echo -n "$base"".xml $q $query ... "
- REF="$base".xml.results/"$q"_jaxp.xml
- $(REMAKE) "$REF"
- OUTPUT="$base".xml.results/"$q"_"$(PACKAGE)"_test1.xml
- LOG="$base".xml.results/"$q"_"$(PACKAGE)"_test1.log
- cp "$@" /tmp
- src/@PACKAGE_TARNAME@.native@EXE@ -s -d "$base".xml \
- "$query" -o "$OUTPUT" > "$LOG" 2>&1
- cp "$@" /tmp
- echo "Query: $q : $query" >> "$@"
- cat "$LOG" | grep '^STATS' >> "$@"
- echo -n "Diff: " >> "$@"
- if tools/xml_diff.native "$REF" "$OUTPUT" >/dev/null 2>&1; then
- echo ok
- echo ok >> "$@"
- else
- echo failed
- echo failed >> "$@"
- exit 1
- fi
- echo '-------------------------------------------' >> "$@"
- done
-
-%.test2.summary:
- base="$@"
- base=${base%.xml.test2.summary}
- $(REMAKE) "$base".xml "$base".xml.queries
- rm -f "$@"
- MSG="Test 2 (all queries sequentially vs all queries in parallel)"
- echo "$MSG" >> "$@"
- echo "$MSG"
- allqueries=`cat "$base".xml.queries | grep -v '^#' | while read q query; do echo "'$query'"; done`
- echo -n "Running all queries ... "
- OUTPUTA="$base".xml.results/test2a_"$(PACKAGE)".xml
- LOG="$base".xml.results/test2a_"$(PACKAGE)".log
- echo -n "sequential ... "
- echo "$allqueries" | xargs src/@PACKAGE_TARNAME@.native@EXE@ -s -d "$base".xml \
- -o "$OUTPUTA" > "$LOG" 2>&1
- cat "$LOG" | grep '^STATS' >> "$@"
-
- OUTPUTB="$base".xml.results/test2b_"$(PACKAGE)".xml
- LOG="$base".xml.results/test2b_"$(PACKAGE)".log
- echo -n "parallel ... "
- echo "$allqueries" | xargs src/@PACKAGE_TARNAME@.native@EXE@ -p -s -d "$base".xml \
- -o "$OUTPUTB" > "$LOG" 2>&1
- cat "$LOG" | grep '^STATS' >> "$@"
- echo -n "Diff: " >> "$@"
- if diff "$OUTPUTA" "$OUTPUTB" >/dev/null 2>&1; then
- echo ok
- echo ok >> "$@"
- else
- echo failed
- echo failed >> "$@"
- exit 1
- fi
- echo '-------------------------------------------' >> "$@"
-
-%.test3.summary:
- base="$@"
- base=${base%.xml.test3.summary}
- $(REMAKE) "$base".xml "$base".xml.queries
- rm -f "$@"
- MSG="Test 3 (multiple queries composition: sequential vs parallel)"
- echo "$MSG" >> "$@"
- echo "$MSG"
- cat "$base".xml.queries | grep -v '^#' | while read q query; do
- echo -n "$base"".xml $q $query ... sequential ... "
- OUTPUTA="$base".xml.results/"$q"_"$(PACKAGE)"_test3a.xml
- LOG="$base".xml.results/"$q"_"$(PACKAGE)"_test3a.log
- src/@PACKAGE_TARNAME@.native@EXE@ -s -d -C "$base".xml \
- -o "$OUTPUTA" $(tools/split_path.native$(EXE) "$query") > "$LOG" 2>&1
- echo "Query: $q : $query" >> "$@"
- cat "$LOG" | grep '^STATS' >> "$@"
-
- echo -n "parallel ... "
- OUTPUTB="$base".xml.results/"$q"_"$(PACKAGE)"_test3a.xml
- LOG="$base".xml.results/"$q"_"$(PACKAGE)"_test3a.log
- src/@PACKAGE_TARNAME@.native@EXE@ -s -d -p -C "$base".xml \
- -o "$OUTPUTB" $(tools/split_path.native$(EXE) "$query") > "$LOG" 2>&1
- echo "Query: $q : $query" >> "$@"
- cat "$LOG" | grep '^STATS' >> "$@"
-
-
- echo -n "Diff: " >> "$@"
- if diff "$OUTPUTA" "$OUTPUTB" >/dev/null 2>&1; then
- echo ok
- echo ok >> "$@"
- else
- echo failed
- echo failed >> "$@"
- exit 1
- fi
- echo '-------------------------------------------' >> "$@"
- done
+%.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
projects / tatoo.git / blobdiff