From: Michael Smith <xmldoc@users.sourceforge.net>
Date: Sun, 1 Jul 2007 09:23:03 +0000 (+0000)
Subject: For docbook-xsl builds, feed xjparse the -EO and -w switches.
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=49c288e8a31c89be7a9979e8eb31a00dfc1e9d40;p=docbook-dsssl

For docbook-xsl builds, feed xjparse the -EO and -w switches.
 -E0
   suppresses the "Parse succeeded... with no errors and no warnings"
   messages that xjparse (actually, the XML Commons resolver)
   otherwise emits.
 -w
   cause xjparse/resolver to only do a well-formedness check,
   instead of trying to do validation; the reason for adding this
   is that xjparse gets run against what are now doctype-less,
   namespaced DocBook instances (after recent changes to the
   build) and fails to validate those (because they don't have a
   doctype)
 What we really need to do long-term is replace xjparse with a
 better, RELAXNG-aware validation mechanism, so that we can have
 the build properly validate stuff that it should be checking.
 That maybe amounts to making an "xslt" wrapper tool that either
 calls jing or rnv (depending on what the builder wants to use).

 But for now we'll need to tolerate that fact that xjparse isn't
 doing anything more for us than just simply WF checking...
---

diff --git a/buildtools/Makefile.incl b/buildtools/Makefile.incl
index 5ada96bd1..5d4fc957f 100644
--- a/buildtools/Makefile.incl
+++ b/buildtools/Makefile.incl
@@ -14,7 +14,7 @@ SCHEMATRON-PATH=/share/doctypes/schematron
 SCHEMATRON-SKELETON=$(SCHEMATRON-PATH)/skeleton1-5.xsl
 TIDY=$(CVSTOOLSROOT)/untidy
 XJPARSE=$(CVSTOOLSROOT)/xjparse
-XJPARSEFLAGS=-E 0
+XJPARSEFLAGS=
 XNSGMLS=xnsgmls
 DTDDISTRIB=$(CVSTOOLSROOT)/dtd-distrib
 JADE=$(CVSTOOLSROOT)/runjade
diff --git a/xsl/Makefile b/xsl/Makefile
index dbf578f4e..ff63fbb26 100644
--- a/xsl/Makefile
+++ b/xsl/Makefile
@@ -3,6 +3,12 @@
 include ../buildtools/Makefile.incl
 include ../releasetools/Variables.mk
 
+# The -E0 switch on xjparse gets passed on to the XML Commons
+# resolver and causes all error message from the resolver to be
+# suppressed. The -w switch causes the resolver to just do a
+# well-formedness check instead of a validity check.
+XJPARSEFLAGS=-E0 -w
+
 DISTRO=xsl
 
 # value of DISTRIB_CHANGELOG_INCLUDES is a space-separated list of
diff --git a/xsl/common/Makefile b/xsl/common/Makefile
index 69018c63b..a021837fb 100644
--- a/xsl/common/Makefile
+++ b/xsl/common/Makefile
@@ -73,7 +73,7 @@ zh_cn.xml: ../../gentext/locale/zh_cn.xml $(GENSTYLE)
 zh_tw.xml: ../../gentext/locale/zh_tw.xml $(GENSTYLE)
 
 %.xml:
-	$(XJPARSE) $(XJPARSEFLAGS) -w $<
+	$(XJPARSE) $(XJPARSEFLAGS) $<
 	$(XSLT) ../../gentext/locale/en.xml ../../gentext/xsl/xsl.xsl $@ locale.file=$@
 
 clean: