X-Git-Url: http://git.nguyen.vg/gitweb/?p=tatoo.git;a=blobdiff_plain;f=Remakefile.in;h=c1f2b251a21d589c3958ec03c27f014a2873af27;hp=e38e3b9b208464ad8b1753ddb778fe8bf52561b4;hb=4f265eb7d78b740292b5543d94f9f0fa40d206d5;hpb=f8128e98f2f4d61309fdb4b24e12eb33b08d630c

diff --git a/Remakefile.in b/Remakefile.in
index e38e3b9..c1f2b25 100644
--- a/Remakefile.in
+++ b/Remakefile.in
@@ -1,4 +1,5 @@
-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)
@@ -6,7 +7,9 @@ OCAMLFINDFLAGS = -syntax $(OCAMLFINDSYNTAX) -package $(OCAMLFINDPACKAGES)  \
 	$(OCAMLFINDPPOPTS) $(OCAMLFINDINCLUDES)
 OCAMLFINDLINKFLAGS = -linkpkg
 PACKAGE = @PACKAGE_TARNAME@
+SRC = src
 BIN = src/@PACKAGE_TARNAME@.native@EXE@
+BYTE = src/@PACKAGE_TARNAME@.byte@EXE@
 EXE = @EXE@
 
 REMAKE = @REMAKE@
@@ -21,7 +24,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 +37,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"
@@ -42,152 +45,123 @@ 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 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"
+%.native$(EXE): %.cmx %.depx
+	if test -f $@".flags"; then
+		FLAGS=`cat $@".flags"`
 	fi
-
-
-%.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"
+	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) $FLAGS $objects $<
+
+%.byte$(EXE): %.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 $<
+
+%.ml:
+	if test -f $*.mly; then
+		$(REMAKE) $*.mly
+		$(OCAMLYACC) $*.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 %.depx:
+	base=$*
+	target=$@
+	DEPEXT=depx
+	NATIVE=-native
+	REMAKE="$(REMAKE) OCAMLNATIVE=$NATIVE"
+	OCAMLDEP="$(OCAMLDEP) $(OCAMLFINDFLAGS)"
+	SRC=$(SRC)
+	if test -f "$base".flags; then
+		FLAGS=`cat "$base".flags`
+	fi
+	COMPILE="$(OCAMLOPT) $(OCAMLFLAGS) $(OCAMLOPTFLAGS) $(OCAMLFINDFLAGS) $FLAGS"
+	. tools/ocamldriver.sh
 
+%.cmo %.depo:
+	base=$*
+	target=$@
+	DEPEXT=depo
+	NATIVE=""
+	REMAKE="$(REMAKE) 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) OCAMLNATIVE=$NATIVE"
+	OCAMLDEP="$(OCAMLDEP) $(OCAMLFINDFLAGS)"
+	SRC=$(SRC)
+	if test -z "$NATIVE"; then
+		DEPEXT=.depo
+		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)"
+		DEPEXT=.depx
 	fi
+	. tools/ocamldriver.sh
 
 ## Tests
 
-test:
+test_byte: tools $(BYTE)
+	$(REMAKE) TEST=$(BYTE) real_test
+
+test_native: tools $(BIN)
+	$(REMAKE) TEST=$(BIN) real_test
+
+test: test_native
+
+real_test:
 	for i in tests/*.xml
 	do
-		$(REMAKE) "$i".summary
+	  for j in 1 2 3
+	  do
+		$(REMAKE) TEST=$(TEST) "$i".test"$j".summary
+	  done
 	done
 
 test_clean:
-	rm -rf tests/*.summary tests/*.results/*_"$(PACKAGE)".*
+	rm -rf tests/*.summary tests/*.results/*_"$(PACKAGE)"_*.*
 
 %.summary:
-		base=`dirname "$@"`/`basename "$@" .xml.summary`
-		$(REMAKE) "$base".xml "$base".xml.queries tools "$(BIN)"
-		rm -f "$@"
-		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)".xml
-			LOG="$base".xml.results/"$q"_"$(PACKAGE)".log
-			src/@PACKAGE_TARNAME@.native@EXE@ -s "$base".xml \
-				"$query" "$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
+	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