Changeset 56511 in vbox

Timestamp:

Jun 18, 2015 11:58:54 AM (9 years ago)

Author:

vboxsync

Message:

xmllint: Use the catalog files and added VBOX_XMLLINT_OPTS so extra options (like --load-trace) can be specified on the kmk command line.

File:

• trunk/doc/manual/Makefile.kmk (modified) (4 diffs)

trunk/doc/manual/Makefile.kmk

@@ -102 +102 @@
 ifdef VBOX_XML_CATALOG
  VBOX_XSLTPROC_WITH_CAT    = $(REDIRECT) -E "XML_CATALOG_FILES=$(VBOX_XML_CATALOG)" -- $(VBOX_XSLTPROC)
+ VBOX_XMLLINT_WITH_CAT     = $(REDIRECT) -E "XML_CATALOG_FILES=$(VBOX_XML_CATALOG)" -- $(VBOX_XMLLINT)
 else
  VBOX_XSLTPROC_WITH_CAT    = $(VBOX_XSLTPROC)
+ VBOX_XMLLINT_WITH_CAT     = $(VBOX_XMLLINT)
 endif
 
@@ -664 +666 @@
 validatemanual_$(lang): \
 $$(addprefix $(VBOX_PATH_MANUAL_OUTBASE)/$(lang)/,$(VBOX_MANUAL_XML_FILES_INCL_CHANGELOG)) \
-                $$(MAKEFILE_CURRENT)
-        $$(QUIET)$(VBOX_XMLLINT) --dtdvalid $$(VBOX_PATH_DOCBOOK_DTD)/docbookx.dtd --xinclude --noout $$(filter %.xml,$$^)
+                $$(VBOX_XML_CATALOG) $$(VBOX_XML_CATALOG_DOCBOOK) $$(MAKEFILE_CURRENT)
+        $$(QUIET)$(VBOX_XMLLINT_WITH_CAT) $(VBOX_XMLLINT_OPTS) --dtdvalid $$(VBOX_PATH_DOCBOOK_DTD)/docbookx.dtd \
+                --xinclude --noout $$(filter %.xml,$$^)
 endef
 
@@ -715 +718 @@
 # validate SDK manual
 validatesdkref: $(addprefix $(VBOX_PATH_MANUAL_OUTBASE)/en_US/,$(VBOX_SDKREF_XML_FILES)) \
-                $(MAKEFILE_CURRENT)
-        $(QUIET)$(VBOX_XMLLINT) --dtdvalid $(VBOX_PATH_DOCBOOK_DTD)/docbookx.dtd --xinclude --noout $(filter %.xml,$^)
+                $(VBOX_XML_CATALOG) $(VBOX_XML_CATALOG_DOCBOOK) $(MAKEFILE_CURRENT)
+        $(QUIET)$(VBOX_XMLLINT_WITH_CAT) $(VBOX_XMLLINT_OPTS) --dtdvalid $(VBOX_PATH_DOCBOOK_DTD)/docbookx.dtd \
+                --xinclude --noout $(filter %.xml,$^)
 
 
@@ -931 +935 @@
 # validate man page XML source
 validateman: $(addprefix $(VBOX_PATH_MANUAL_SRC)/en_US/,$(VBOX_MANUAL_XML_REFENTRY_FILES)) \
-                $(MAKEFILE_CURRENT)
-        $(QUIET)$(VBOX_XMLLINT) --dtdvalid $(VBOX_PATH_DOCBOOK_DTD)/docbookx.dtd --noout $(filter %.xml,$^)
+                $(VBOX_XML_CATALOG) $(VBOX_XML_CATALOG_DOCBOOK) $(MAKEFILE_CURRENT)
+        $(QUIET)$(VBOX_XMLLINT_WITH_CAT) $(VBOX_XMLLINT_OPTS) --dtdvalid $(VBOX_PATH_DOCBOOK_DTD)/docbookx.dtd \
+                --noout $(filter %.xml,$^)