On Wed, Dec 3, 2014 at 12:09 PM, Michael Paquier <michael.paqu...@gmail.com> wrote: > Since commit 5d93ce2d, the output of xmllint is checked by passing > --valid to it. Isn't that a regression with what we were doing for > pre-9.4 versions? For example, with 9.4 and older versions it is > possible to compile man pages even if the xml spec is not entirely > valid when using docbook 4.2.
Another thing coming to my mind is why don't we simply have a variable to pass flags to xmllint similarly to xsltproc? Packagers would be then free to pass the arguments they want. (Note that in some of the environments where I build the docs postgres.xml is found as invalid, making build fail for master only, not for older branches). In any case, attached is a patch showing the idea, bringing more flexibility in the build, default value being "--valid --noout" if the flag is not passed by the caller. Regards, -- Michael
diff --git a/doc/src/sgml/Makefile b/doc/src/sgml/Makefile index 8bdd26c..99ce106 100644 --- a/doc/src/sgml/Makefile +++ b/doc/src/sgml/Makefile @@ -48,6 +48,10 @@ ifndef XMLLINT XMLLINT = $(missing) xmllint endif +ifndef XMLLINTCFLAGS +XMLLINTCFLAGS = --valid --noout +endif + ifndef XSLTPROC XSLTPROC = $(missing) xsltproc endif @@ -82,7 +86,7 @@ override SPFLAGS += -wall -wno-unused-param -wno-empty -wfully-tagged man distprep-man: man-stamp man-stamp: stylesheet-man.xsl postgres.xml - $(XMLLINT) --noout --valid postgres.xml + $(XMLLINT) $(XMLLINTCFLAGS) postgres.xml $(XSLTPROC) $(XSLTPROCFLAGS) $(XSLTPROC_MAN_FLAGS) $^ touch $@ @@ -259,13 +263,13 @@ endif xslthtml: xslthtml-stamp xslthtml-stamp: stylesheet.xsl postgres.xml - $(XMLLINT) --noout --valid postgres.xml + $(XMLLINT) $(XMLLINTCFLAGS) postgres.xml $(XSLTPROC) $(XSLTPROCFLAGS) $(XSLTPROC_HTML_FLAGS) $^ cp $(srcdir)/stylesheet.css html/ touch $@ htmlhelp: stylesheet-hh.xsl postgres.xml - $(XMLLINT) --noout --valid postgres.xml + $(XMLLINT) $(XMLLINTCFLAGS) postgres.xml $(XSLTPROC) $(XSLTPROCFLAGS) $^ %-A4.fo.tmp: stylesheet-fo.xsl %.xml @@ -287,7 +291,7 @@ FOP = fop epub: postgres.epub postgres.epub: postgres.xml - $(XMLLINT) --noout --valid $< + $(XMLLINT) $(XMLLINTCFLAGS) $< $(DBTOEPUB) $<
-- Sent via pgsql-hackers mailing list (pgsql-hackers@postgresql.org) To make changes to your subscription: http://www.postgresql.org/mailpref/pgsql-hackers
