Cherry pick use of menhir features from branch feature/menhir.
[tatoo.git] / Remakefile.in
index 8a20f92..2a32aa2 100644 (file)
@@ -1,18 +1,32 @@
-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
-ODEP=tools/odeps.sh @OCAMLDEP@
-BIN=@PACKAGE_TARNAME@
-EXE=@EXE@
+PACKAGE = @PACKAGE_TARNAME@
+SRC = src
+BIN = src/@PACKAGE_TARNAME@.native@EXE@
+BYTE = src/@PACKAGE_TARNAME@.byte@EXE@
+EXE = @EXE@
+
+REMAKE = @REMAKE@
+OCAMLC = @OCAMLC@
+OCAMLOPT = @OCAMLOPT@
+OCAMLDEP = @OCAMLDEP@
+OCAMLFLAGS = @OCAMLFLAGS@
+OCAMLOPTFLAGS = @OCAMLOPTFLAGS@
+OCAMLCFLAGS = @OCAMLCFLAGS@
+MENHIR = @MENHIR@
+
+.PHONY:clean real_test test_native test
 
-all:
-       @REMAKE@ src/@PACKAGE_TARNAME@.native@EXE@
+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
@@ -25,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 \
-                         -name '*.class' | 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"
@@ -33,116 +47,127 @@ clean:
                        *.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
        done
 
-distclean: clean
-       rm -rf config.status configure config.log autom4te.cache .remake Remakefile remake
+distclean: clean test_clean
+       rm -rf config.status configure config.log autom4te.cache .remake Remakefile remake Makefile
 
 %.class: %.java
-       javac $1
-
-%.native@EXE@:
-       base=${1%.native}
-       src=${base}.ml
-       obj=${base}.cmx
-       dir=$(dirname $1)
-       @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 "$1"  @OCAMLFLAGS@ @OCAMLOPTFLAGS@ $OCAMLFINDLINKFLAGS $OCAMLFINDFLAGS $OBJS
-
-%.byte@EXE@:
-       base=${1%.byte}
-       src=${base}.ml
-       obj=${base}.cmo
-       dir=$(dirname $1)
-       @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 "$1"  @OCAMLFLAGS@ @OCAMLCFLAGS@ $OCAMLFINDLINKFLAGS $OCAMLFINDFLAGS $SORTED_OBJS
-
-%.cmx:
-       target="$1"
-       base="${target%.cmx}"
-       src="${base}.ml"
-       if [ -f "$src" ]; then
-               @REMAKE@ "$src"
-               DEPS=$( $ODEP -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
-                $ODEP $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"
+       javac $<
+
+%.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):
+       $(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
+               #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 $*.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 %.depx:
+       base=$*
+       target=$@
+       DEPEXT=depx
+       REMAKE="$(REMAKE)"
+       OCAMLDEP="$(OCAMLDEP) $(OCAMLFINDFLAGS)"
+       OCAMLNATIVE=$(OCAMLNATIVE)
+       SRC=$(SRC)
+       COMPILE="$(OCAMLOPT) $(OCAMLFLAGS) $(OCAMLOPTFLAGS) $(OCAMLFINDFLAGS)"
+       . tools/ocamldriver.sh
+
+
+%.cmo %.depo:
+       base=$*
+       target=$@
+       DEPEXT=depo
+       REMAKE="$(REMAKE)"
+       OCAMLDEP="$(OCAMLDEP) $(OCAMLFINDFLAGS)"
+       OCAMLNATIVE=$(OCAMLNATIVE)
+       SRC=$(SRC)
+       COMPILE="$(OCAMLC) $(OCAMLFLAGS) $(OCAMLCFLAGS) $(OCAMLFINDFLAGS)"
+       . tools/ocamldriver.sh
 
-%.cmo:
-       target="$1"
-       base="${target%.cmo}"
-       src="${base}.ml"
-       if [ -f "$src" ]; then
-               @REMAKE@ "$src"
-               DEPS=$( $ODEP $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
-                $ODEP $OCAMLFINDFLAGS $PACKINCLUDE "$src" | @REMAKE@ -v PACKINCLUDE="$PACKINCLUDE" -r "$target"
-               @OCAMLC@ -o "$target" -c @OCAMLFLAGS@ @OCAMLCFLAGS@ $OCAMLFINDFLAGS $PACKINCLUDE "$src"
+%.cmi:
+       base=$*
+       target=$@
+       REMAKE="$(REMAKE)"
+       OCAMLDEP="$(OCAMLDEP) $(OCAMLFINDFLAGS)"
+       SRC=$(SRC)
+       OCAMLNATIVE=$(OCAMLNATIVE)
+       if test -z "$OCAMLNATIVE"; then
+               DEPEXT=.depo
+               COMPILE="$(OCAMLC) $(OCAMLFLAGS) $(OCAMLCFLAGS) $(OCAMLFINDFLAGS)"
+       else
+               COMPILE="$(OCAMLOPT) $(OCAMLFLAGS) $(OCAMLOPTFLAGS) $(OCAMLFINDFLAGS)"
+               DEPEXT=.depx
        fi
+       . tools/ocamldriver.sh
 
+## Tests
 
 
-%.cmi:
-       target="$1"
-       base=${target%.cmi}
-       if test -f "$base".mli; then
-               @REMAKE@ "$base".mli
-               src=${base}.mli
-               DEPS=$($ODEP $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
-       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"
-       fi
+real_test:
+       echo $(TEST)
+       for i in tests/*.xml
+       do
+         for j in 1 2 3
+         do
+               $(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)"_*.*
+
+%.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