Implement set-theoretic operation on 2WSATA (union, intersection,
[tatoo.git] / Remakefile.in
index e599827..f8552fe 100644 (file)
@@ -6,6 +6,7 @@ OCAMLFINDFLAGS = -syntax $(OCAMLFINDSYNTAX) -package $(OCAMLFINDPACKAGES)  \
        $(OCAMLFINDPPOPTS) $(OCAMLFINDINCLUDES)
 OCAMLFINDLINKFLAGS = -linkpkg
 PACKAGE = @PACKAGE_TARNAME@
+SRC = src
 BIN = src/@PACKAGE_TARNAME@.native@EXE@
 EXE = @EXE@
 
@@ -21,7 +22,7 @@ OCAMLYACC = @OCAMLYACC@
 
 all: $(BIN)
 
-tools: tools/xml_diff.native$(EXE) tools/XPathEval.class
+tools: tools/xml_diff.native$(EXE) tools/XPathEval.class tools/split_path.native$(EXE)
 
 Remakefile: Remakefile.in config.status
        ./config.status Remakefile
@@ -34,7 +35,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 \
-                         -name '*.class' | while read file; do
+                         -name '*.class' -o -name '*.dep' | while read file; do
                case "$file" in
                        *.mll)
                                rm -f "${file%.mll}.ml"
@@ -50,185 +51,84 @@ clean:
        done
 
 distclean: clean test_clean
-       rm -rf config.status configure config.log autom4te.cache .remake Remakefile remake
+       rm -rf config.status configure config.log autom4te.cache .remake Remakefile remake Makefile
 
 %.class: %.java
        javac $<
 
-%.native$(EXE):
-       base=$*
-       src=${base}.ml
-       obj=${base}.cmx
-       dir=`dirname "$@"`
-       $(REMAKE) -v OCAMLDEPNATIVE=-native "$obj"
-       srcs=`ls "$dir"/*.cmx | sed 's/\.cmx/.ml/g'`
-       objs=`$(OCAMLDEP) $(OCAMLDEPNATIVE) $(OCAMLFINDFLAGS) -modules $srcs | tools/osort.sh cmx`
-       $(OCAMLOPT) -o "$@"  $(OCAMLFLAGS) $(OCAMLOPTFLAGS) $(OCAMLFINDLINKFLAGS) $(OCAMLFINDFLAGS) $objs
-
-%.byte$(EXE):
-       base=$*
-       src=${base}.ml
-       obj=${base}.cmo
-       dir=`dirname "$@"`
-       $(REMAKE) "$obj"
-       objs=""
-       for i in "$dir"/*.cmi; do
-               ibase=${i%.cmi}
-               if test -f "${ibase}.ml" -o -d "${ibase}" -o -f "${ibase}.mly" -o -f "${ibase}.mll"; then
-                       objs="$objs ${ibase}.cmo"
-               fi
-       done
-       $(REMAKE) $objs
-       srcs=`ls "$dir"/*.cmo | sed 's/\.cmo/.ml/g'`
-       sorted_objs=`$(OCAMLDEP) $OCAMLFINDFLAGS -modules $srcs | tools/osort.sh cmo`
-       $(OCAMLC) -o "$@"  $(OCAMLFLAGS) $(OCAMLCFLAGS) $(OCAMLFINDLINKFLAGS) $(OCAMLFINDFLAGS) $sorted_objs
-
-%.cmx:
-       target="$@"
-       base="${target%.cmx}"
-       src="${base}.ml"
-       if [ -f "$src" ]; then
-               $(REMAKE) "$src"
-               deps=`$(ODEPS) -native $(OCAMLFINDFLAGS) $(PACKINCLUDE) "$src"`
-               echo "$deps" | $(REMAKE) -v PACKINCLUDE="$(PACKINCLUDE)" -v OCAMLDEPNATIVE=-native -v OCAMLFORPACK="$(OCAMLFORPACK)" -r "$target"
-               $(OCAMLOPT) -o "$target" -c $(OCAMLFLAGS) $(OCAMLOPTFLAGS) $(OCAMLFORPACK) $(OCAMLFINDFLAGS) $(PACKINCLUDE) "$src"
-       elif [ -d "$base" ];    then
-               modname=`basename "$base"`
-               packname=`echo "$modname" | sed 's/\(.*\)/\u\1/'`
-               objs=`ls "$base"/*.ml | sed 's/\.ml/.cmx/g'`
-               $(REMAKE) -v PACKINCLUDE="-I $base" -v OCAMLFORPACK="-for-pack $packname" $objs
-               sorted_objs=`$(OCAMLDEP) -native $(OCAMLFINDFLAGS) -I $base -modules "$base"/*.ml | tools/osort.sh cmx`
-               $(OCAMLOPT) -o "$target" -pack $sorted_objs
-       elif [ -f "$base".mly ]; then
-               $(REMAKE) "$base".mly
-               $(OCAMLYACC) "$base".mly
-                $(ODEPS) $(OCAMLDEPNATIVE) $(OCAMLFINDFLAGS) "$src" | \
-                       $(REMAKE) -v PACKINCLUDE="$(PACKINCLUDE)" -v OCAMLDEPNATIVE=-native -v OCAMLFORPACK="$(OCAMLFORPACK)" -r "$target"
-               $(OCAMLOPT) -o "$target" -c $(OCAMLFLAGS) $(OCAMLOPTFLAGS) $(OCAMLFORPACK) $(OCAMLFINDFLAGS) $(PACKINCLUDE) "$src"
-       fi
+%.native$(EXE): %.cmx %.dep
+       objects=`cat $*.dep | xargs | sed 's/[.]dep/.cmx/g'`
+       $(OCAMLOPT) -o $@  $(OCAMLFLAGS) $(OCAMLOPTFLAGS) $(OCAMLFINDLINKFLAGS) $(OCAMLFINDFLAGS) $objects $<
 
+%.byte$(EXE): %.cmo %.dep
+       objects=`cat $*.dep | xargs | sed 's/[.]dep/.cmo/g'`
+       $(OCAMLC) -o $@  $(OCAMLFLAGS) $(OCAMLCFLAGS) $(OCAMLFINDLINKFLAGS) $(OCAMLFINDFLAGS) $objects $<
 
-%.cmo:
-       target="$@"
-       base="${target%.cmo}"
-       src="${base}.ml"
-       if [ -f "$src" ]; then
-               $(REMAKE) "$src"
-               deps=`$(ODEPS) $OCAMLFINDFLAGS $PACKINCLUDE "$src"`
-               echo "$deps" | $(REMAKE) -v PACKINCLUDE="$(PACKINCLUDE)" -r "$target"
-               $(OCAMLC) -o "$target" -c $(OCAMLFLAGS) $(OCAMLCFLAGS) $(OCAMLFINDFLAGS) $(PACKINCLUDE) "$src"
-       elif [ -d "$base" ];    then
-               modname=`basename "$base"`
-               packname=`echo "$modname" | sed 's/\(.*\)/\u\1/'`
-               objs=`ls "$base"/*.ml | sed 's/\.ml/.cmo/g'`
-               $(REMAKE) -v PACKINCLUDE="-I $base" $objs
-               sorted_objs=`$(OCAMLDEP) $(OCAMLFINDFLAGS) -I $base -modules "$base"/*.ml | tools/osort.sh cmo`
-               $(OCAMLC) -o "$target" -pack $sorted_objs
-       elif [ -f "$base".mly ]; then
-               $(REMAKE) "$base".mly
-               $(OCAMLYACC) "$base".mly
-                $(ODEPS) $(OCAMLFINDFLAGS) $(PACKINCLUDE) "$src" | $(REMAKE) -v PACKINCLUDE="$(PACKINCLUDE)" -r "$target"
-               $(OCAMLC) -o "$target" -c $(OCAMLFLAGS) $(OCAMLCFLAGS) $(OCAMLFINDFLAGS) $(PACKINCLUDE) "$src"
+%.ml:
+       if test -f $*.mly; then
+               $(OCAMLYACC) $*.mly
+       elif test -f $*.mll; then
+               $(OCAMLLEX) $*.mll
        fi
 
-
+%.cmx %.dep:
+       base=$*
+       target=$@
+       NATIVE=-native
+       REMAKE="$(REMAKE) -v OCAMLNATIVE=$NATIVE"
+       OCAMLDEP="$(OCAMLDEP) $(OCAMLFINDFLAGS)"
+       SRC=$(SRC)
+       COMPILE="$(OCAMLOPT) $(OCAMLFLAGS) $(OCAMLOPTFLAGS) $(OCAMLFINDFLAGS)"
+       . tools/ocamldriver.sh
+
+%.cmo %.dep:
+       base=$*
+       target=$@
+       NATIVE=
+       REMAKE="$(REMAKE) -v OCAMLNATIVE=$NATIVE"
+       OCAMLDEP="$(OCAMLDEP) $(OCAMLFINDFLAGS)"
+       SRC=$(SRC)
+       COMPILE="$(OCAMLC) $(OCAMLFLAGS) $(OCAMLCFLAGS) $(OCAMLFINDFLAGS)"
+       . tools/ocamldriver.sh
 
 %.cmi:
-       target="$@"
-       base=${target%.cmi}
-       if test -f "$base".mli; then
-               $(REMAKE) "$base".mli
-               src=${base}.mli
-               deps=`$(ODEPS) $(OCAMLDEPNATIVE) $(OCAMLFINDFLAGS) $(PACKINCLUDE) "$src"`
-               echo "$deps" | $(REMAKE) -v PACKINCLUDE="$(PACKINCLUDE)" -v OCAMLDEPNATIVE="$(OCAMLDEPNATIVE)" -v OCAMLFORPACK="$(OCAMLFORPACK)" -r "$target"
-               if test -z "$(OCAMLDEPNATIVE)"; then
-                       $(OCAMLC) -o "$target" -c $(OCAMLFLAGS) $(OCAMLCFLAGS) $(OCAMLFINDFLAGS) $(PACKINCLUDE) "$src"
-               else
-                       $(OCAMLOPT) -o "$target" -c $(OCAMLFLAGS) $(OCAMLOPTFLAGS) $(OCAMLFINDFLAGS) $(PACKINCLUDE) "$src"
-               fi
+       base=$*
+       target=$@
+       NATIVE=$(OCAMLNATIVE)
+       REMAKE="$(REMAKE) -v OCAMLNATIVE=$NATIVE"
+       OCAMLDEP="$(OCAMLDEP) $(OCAMLFINDFLAGS)"
+       SRC=$(SRC)
+       if test -z "$NATIVE"; then
+               COMPILE="$(OCAMLC) $(OCAMLFLAGS) $(OCAMLCFLAGS) $(OCAMLFINDFLAGS)"
        else
-               if test -z "$(OCAMLDEPNATIVE)"; then
-                 obj=${base}.cmo
-               else
-                 obj=${base}.cmx
-               fi
-               $(REMAKE) -v PACKINCLUDE="$(PACKINCLUDE)" -v OCAMLDEPNATIVE="$(OCAMLDEPNATIVE)" -v OCAMLFORPACK="$(OCAMLFORPACK)" "$obj"
+               COMPILE="$(OCAMLOPT) $(OCAMLFLAGS) $(OCAMLOPTFLAGS) $(OCAMLFINDFLAGS)"
        fi
+       . tools/ocamldriver.sh
 
 ## Tests
 
 test:
        for i in tests/*.xml
        do
-         for j in 1 2
+         for j in 1 2 3
          do
                $(REMAKE) "$i".test"$j".summary
          done
        done
 
 test_clean:
-       rm -rf tests/*.summary tests/*.results/*_"$(PACKAGE)".*
-
-%.test1.summary:
-               base="$@"
-               base=${base%.xml.test1.summary}
-               $(REMAKE) "$base".xml "$base".xml.queries tools "$(BIN)"
-               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)".log
-                       src/@PACKAGE_TARNAME@.native@EXE@ -s -d "$base".xml \
-                               "$query" -o "$OUTPUT" > "$LOG" 2>&1
-                       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 tools "$(BIN)"
-               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 '-------------------------------------------' >> "$@"
+       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