consistent validation with one script

git-svn-id: https://slps.svn.sourceforge.net/svnroot/slps@185 ab42f6e0-554d-0410-b580-99e487e6eeb2

topics/extraction/dcg2bgf/Makefile

@@ -6,6 +6,7 @@ build:
 test:
 	make clean-tests
 	../../../shared/tools/dcg2bgf ${source} ${target}.bgf
+	../../../shared/tools/checkxml bgf ${target}.bgf
 	../../../shared/tools/showbgf ${target}.bgf > ${target}.out
 	diff ${target}.out ${target}.baseline
 

topics/extraction/java2bgf/Makefile

@@ -8,6 +8,7 @@ build:
 test:
 	make clean-tests
 	../../../shared/tools/java2bgf ${basedir} ${package} ${target}.bgf
+	../../../shared/tools/checkxml bgf ${target}.bgf
 	../../../shared/tools/showbgf ${target}.bgf > ${target}.out
 	diff ${target}.out ${target}.baseline
 

topics/extraction/ldf2bgf/Makefile

@@ -1,16 +1,12 @@
-ldf2bgf = ../../../shared/tools/ldf2bgf
-validator = ../../../download/msv/msv.jar
-bgfxsd = ../../../shared/xsd/bgf.xsd
-
 all:
 	make clean
 	make test
 
 build:
 
 test:
-	find ../../.. -name "*.ldf" | xargs -n1 ${ldf2bgf}
-	ls -1 *.bgf | xargs java -jar ${validator} ${bgfxsd}
+	find ../../.. -name "*.ldf" | xargs -n1 ../../../shared/tools/ldf2bgf
+	ls -1 *.bgf | xargs -n1 ../../../shared/tools/checkxml bgf
 
 clean:
 	rm -f *.bgf

topics/extraction/sdf2bgf/Makefile

@@ -1,7 +1,6 @@
 metaenv = `which asfe | xargs dirname`/..
 sdfl = ${metaenv}/share/sdf-library/library
 asfl = ${metaenv}/share/asf-library/library
-schemata = ../../../shared/xsd
 flsdf = ../../fl/asfsdf/syntax/FL.sdf
 
 all: build test
@@ -44,7 +43,7 @@ test:
 	@cat ${flsdf} >> FL.trm
 	@echo ")" >>FL.trm
 	cat FL.trm | sglr -p Main.tbl | asfe -e Main.eqs | unparsePT > fl.bgf
-	xmllint --noout --schema ${schemata}/bgf.xsd fl.bgf
+	../../../shared/tools/checkxml bgf fl.bgf
 
 clean:
 	rm -f reduct.out

topics/extraction/xml2btf/Makefile

@@ -5,7 +5,7 @@ bgf = ../../../shared/xsd/bgf.xsd
 xbgf = ../../../shared/xsd/xbgf.xsd
 btf = ../../../shared/xsd/btf.xsd
 apps = ../../transformation/xbgf/apps
-validator = ../../../download/msv/msv.jar
+validator = ../../../shared/tools/checkxml
 xml2btf = ../../../shared/tools/xml2btf
 
 build:
@@ -17,7 +17,7 @@ test:
 	make check
 
 check:
-	ls tests/*.btf | xargs java -jar ${validator} ${btf}
+	ls -1 tests/*.btf | xargs -n1 ${validator} btf
 
 clean:
 	make clean-tests

topics/extraction/xsd2bgf/Makefile

@@ -1,22 +1,28 @@
 fl = ../../fl/xsd/fl.xsd
 bgf = ../../../shared/xsd/bgf.xsd
 xbgf = ../../../shared/xsd/xbgf.xsd
+xsd2bgf = ../../../shared/tools/xsd2bgf
+showbgf = ../../../shared/tools/showbgf
+validate = ../../../shared/tools/checkxml
 
 build:
 
 test:
 	make clean-tests
 # Test fl sample
-	../../../shared/tools/xsd2bgf ${fl} tests/fl.bgf
-	../../../shared/tools/showbgf tests/fl.bgf > tests/fl.out
+	${xsd2bgf} ${fl} tests/fl.bgf
+	${validate} bgf tests/fl.bgf
+	${showbgf} tests/fl.bgf > tests/fl.out
 	diff tests/fl.out tests/fl.baseline
 # Test bgf
-	../../../shared/tools/xsd2bgf ${bgf} tests/bgf.bgf
-	../../../shared/tools/showbgf tests/bgf.bgf > tests/bgf.out
+	${xsd2bgf} ${bgf} tests/bgf.bgf
+	${validate} bgf tests/bgf.bgf
+	${showbgf} tests/bgf.bgf > tests/bgf.out
 	diff tests/bgf.out tests/bgf.baseline
 # Test xbgf
-	../../../shared/tools/xsd2bgf ${xbgf} tests/xbgf.bgf
-	../../../shared/tools/showbgf tests/xbgf.bgf > tests/xbgf.out
+	${xsd2bgf} ${xbgf} tests/xbgf.bgf
+	${validate} bgf tests/xbgf.bgf
+	${showbgf} tests/xbgf.bgf > tests/xbgf.out
 	diff tests/xbgf.out tests/xbgf.baseline
 
 clean:

topics/extraction/xsd2ldf/Makefile

@@ -1,28 +1,22 @@
 input     = ../../../shared/xsd/xbgf.xsd
-extracted = tests/xbgf.bgf
-outputldf = tests/xbgf.ldf
-outputpdf = tests/xbgf.pdf
-outputhtm = tests/xbgf.html
-templfd = tests/ldf.temp
-validator = ../../../download/msv/msv.jar
+output    = tests/xbgf
 
 build:
 
 all: extract
-	sh ../../../shared/tools/ldf2html ${outputldf} ${outputhtm}
-	sh ../../../shared/tools/ldf2pdf ${outputldf} ${outputpdf} 2> /dev/null
+	../../../shared/tools/ldf2html ${output}.ldf ${output}.html
+	../../../shared/tools/ldf2pdf ${output}.ldf ${output}.pdf 2> /dev/null
 
 extract:
-	sh ../../../shared/tools/xsd2bgf ${input} ${extracted}
-	python ldfgen.py ${input} ${extracted} ${outputldf}
-	xsltproc ../../../shared/xsl/ldf2ldf_tail.xslt ${outputldf} > ${templfd}
-	xsltproc ../../../shared/xsl/ldf2ldf_lift.xslt ${templfd} > ${outputldf}
-	@rm -f ${templfd}
+	../../../shared/tools/xsd2bgf ${input} ${output}.bgf
+	python ldfgen.py ${input} ${output}.bgf ${output}.1.ldf
+	xsltproc ../../../shared/xsl/ldf2ldf_tail.xslt ${output}.1.ldf > ${output}.2.ldf
+	xsltproc ../../../shared/xsl/ldf2ldf_lift.xslt ${output}.2.ldf > ${output}.ldf
 
 test: extract
-	sh ../../../shared/tools/showbgf ${extracted}
-	java -jar ${validator} ../../../shared/xsd/bgf.xsd ${extracted}
-	java -jar ${validator} ../../../shared/xsd/ldf.xsd ${outputldf}
+	../../../shared/tools/showbgf ${output}.bgf > ${output}.out
+	../../../shared/tools/checkxml bgf ${output}.bgf
+	../../../shared/tools/checkxml ldf ${output}.ldf
 
 clean:
 	rm -f tests/*