X-Git-Url: http://git.nguyen.vg/gitweb/?p=tatoo.git;a=blobdiff_plain;f=Remakefile.in;h=5c3fe428aab6129020a08a4255504dadc081115e;hp=74fef8022b21b765df6642f04b5dcf7f61139d51;hb=d7019c01a47613e258fccb127e6085cb91d26546;hpb=8af68de11421dacc2f77a8398dcb48c75a5ff3b1

diff --git a/Remakefile.in b/Remakefile.in
index 74fef80..5c3fe42 100644
--- a/Remakefile.in
+++ b/Remakefile.in
@@ -1,15 +1,35 @@
-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: $(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
 	./config.status Remakefile
@@ -18,117 +38,135 @@ configure config.status: configure.in
 	autoconf
 	./config.status --recheck
 
-src/%.native:
-	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
-
-src/%.byte:
-	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
+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' -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"
+			;;
+		esac
+		done
 	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"
-	fi
+
+distclean: clean test_clean
+	rm -rf config.status configure config.log autom4te.cache .remake Remakefile remake Makefile
+
+%.class: %.java
+	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
 
 
-%.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"
+%.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
+		$(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 %.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) $(OCAMLFIND_EXTRAFLAGS) "
+	. tools/ocamldriver.sh
 
 %.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
+	base=$*
+	target=$@
+	REMAKE="$(REMAKE)"
+	OCAMLDEP="$(OCAMLDEP) $(OCAMLFINDFLAGS)"
+	SRC=$(SRC)
+	OCAMLNATIVE=$(OCAMLNATIVE)
+	if test -z "$OCAMLNATIVE"; 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
 
-clean:
-	find src -name '*.cm*' -o -name '*.o' -o -name '*.byte' -o -name '*.native' -o -name '*.mll' -o -name '*.mly' | while read file; do
-	case "$file" in
-		*.mll)
-			rm -f "${file%.mll}.ml"
-			;;
-		*.mly)
-			rm -f "${file%.mly}.ml" "${file%.mly}.mli"
-			;;
-		*)
-			rm -f "$file"
-			;;
-	esac
+## Tests
+
+
+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