From 06500c8aa660aeb6ae964c7a840e21b928f906c3 Mon Sep 17 00:00:00 2001
From: Daniel Veillard <veillard@src.gnome.org>
Date: Tue, 7 Sep 2004 09:12:44 +0000
Subject: some cleanup checking for xmllint and xsltproc in configure.in, fixed
 make

* configure.in doc/Makefile.am xstc/Makefile.am: some cleanup
  checking for xmllint and xsltproc in configure.in, fixed
  make dist w.r.t. the new xstc subdir.
* doc/*: rebuilt
Daniel
---
 xstc/Makefile.am | 38 ++++++++++++++++++++++++++++++++------
 1 file changed, 32 insertions(+), 6 deletions(-)

(limited to 'xstc')

diff --git a/xstc/Makefile.am b/xstc/Makefile.am
index 99dd9f71..45309ff0 100644
--- a/xstc/Makefile.am
+++ b/xstc/Makefile.am
@@ -1,31 +1,50 @@
+#
+# Definition for the tests from W3C
+#
 PYSCRIPTS=nist-test.py ms-test.py sun-test.py
 TESTDIRS=msxsdtest nisttest suntest
 TARBALL=XSTC-20020116.tar.gz
 TARBALLURL=http://www.w3.org/2001/05/xmlschema-test-collection/$(TARBALL)
 
+#
+# The local data and scripts
+#
+EXTRA_DIST=xstc.py sun-test-def.xml ms-test-def.xml nist-test-def.xml	\
+	   xstc-to-python.xsl
+
+#
+# Nothing is done by make, only make tests and
+# only if Python and Schemas are enabled.
+#
 all:
 
+#
+# The python tests are generated via XSLT
+#
 nist-test.py: nist-test-def.xml xstc-to-python.xsl
-	-@(if [ -x $(bindir)/xsltproc ] ; then				\
+	-@(if [ -x $(XSLTPROC) ] ; then				\
 	  echo "Rebuilding script" $@ ;					\
-	  $(bindir)/xsltproc --nonet $(srcdir)/xstc-to-python.xsl	\
+	  $(XSLTPROC) --nonet $(srcdir)/xstc-to-python.xsl	\
 	                     $(srcdir)/nist-test-def.xml > $@ ;		\
 	  chmod +x $@ ; fi )
 
 ms-test.py: ms-test-def.xml xstc-to-python.xsl
-	-@(if [ -x $(bindir)/xsltproc ] ; then				\
+	-@(if [ -x $(XSLTPROC) ] ; then				\
 	  echo "Rebuilding script" $@ ;					\
-	  $(bindir)/xsltproc --nonet $(srcdir)/xstc-to-python.xsl	\
+	  $(XSLTPROC) --nonet $(srcdir)/xstc-to-python.xsl	\
 	                     $(srcdir)/ms-test-def.xml > $@ ;		\
 	  chmod +x $@ ; fi )
 
 sun-test.py: sun-test-def.xml xstc-to-python.xsl
-	-@(if [ -x $(bindir)/xsltproc ] ; then				\
+	-@(if [ -x $(XSLTPROC) ] ; then				\
 	  echo "Rebuilding script" $@ ;					\
-	  $(bindir)/xsltproc --nonet $(srcdir)/xstc-to-python.xsl	\
+	  $(XSLTPROC) --nonet $(srcdir)/xstc-to-python.xsl	\
 	                     $(srcdir)/sun-test-def.xml > $@ ;		\
 	  chmod +x $@ ; fi )
 
+#
+# Rule to load the test description and extract the informations
+#
 $(TESTDIRS):
 	-@(if [ ! -f $(TARBALL) ] ; then 				\
 	   echo "Missing the test suite description, trying to fetch it" ;\
@@ -38,6 +57,10 @@ $(TESTDIRS):
 	   echo "done" ;						\
 	   fi);
 
+#
+# The actual test run if present. PYTHONPATH is updated to make sure
+# we run the version from the loacl build and not preinstalled bindings
+#
 pytests: $(PYSCRIPTS) $(TESTDIRS)
 	-@(if [ -x nist-test.py -a -d nisttest ] ; then 		\
 	   echo "## Running NIST Schemas tests";			\
@@ -59,6 +82,9 @@ tests:
 	-@(if [ -x $(PYTHON) ] ; then 					\
 	   $(MAKE) MAKEFLAGS+=--silent pytests ; fi);
 
+#
+# Heavy, works well only on RHEL3
+#
 valgrind:
 	-@(if [ -x $(PYTHON) ] ; then 					\
 	   echo '## Running the regression tests under Valgrind' ;	\
-- 
cgit v1.2.1