Changeset 56525 in vbox

Timestamp:

Jun 18, 2015 1:56:55 PM (10 years ago)

Author:

vboxsync

Message:

more autovalidation fun

File:

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

trunk/doc/manual/Makefile.kmk

@@ -589 +589 @@
 $(foreach f,$(VBOX_MANUAL_LANGUAGES),$(VBOX_PATH_MANUAL_OUTBASE)/$f/ucs.sty):
         $(call MSG_L1,Copying unicode support for LaTeX)
-        $(QUIET)$(INSTALL_STAGING) -- $(VBOX_MANUAL_TEX_UNICODE_FILES) "$(@D)"
+        $(QUIET)$(INSTALL_STAGING) -m0644 -- $(VBOX_MANUAL_TEX_UNICODE_FILES) "$(@D)"
 endif
 
@@ -602 +602 @@
 endef
 
-$(foreach lang,$(VBOX_MANUAL_LANGUAGES),$(eval $(def_vbox_cp_images_pdf)))
+$(foreach lang,$(VBOX_MANUAL_LANGUAGES),$(evalcall2 def_vbox_cp_images_pdf))
 
 
@@ -646 +646 @@
                 $(VBOX_PATH_MANUAL_SRC)/docbook2latex.xsl \
                 $(addprefix $(VBOX_PATH_MANUAL_OUTBASE)/%/,$(VBOX_MANUAL_XML_FILES_INCL_CHANGELOG)) \
-                $(if $(VBOX_HAVE_XMLLINT),$(VBOX_PATH_MANUAL_OUTBASE)/en_US/validatemanual.run,) \
+                $(if $(VBOX_HAVE_XMLLINT),$(VBOX_PATH_MANUAL_OUTBASE)/%/validatemanual.run,) \
                 $(VBOX_XML_CATALOG) $(VBOX_XML_CATALOG_DOCBOOK) $(MAKEFILE_CURRENT)
         $(call MSG_L1,Generating $@ from DocBook XML)
@@ -679 +679 @@
 $$(VBOX_PATH_MANUAL_OUTBASE)/$(lang)/validatemanual.run: \
                 $$(VBOX_PATH_MANUAL_OUTBASE)/$(lang)/UserManual.xml \
+                $$(addprefix $$(VBOX_PATH_MANUAL_OUTBASE)/$(lang)/,$$(VBOX_MANUAL_XML_FILES_INCL_CHANGELOG)) \
                 $$(VBOX_XML_CATALOG) $$(VBOX_XML_CATALOG_DOCBOOK) $$(MAKEFILE_CURRENT) | $$$$(dir $$$$@)
-        $$(call MSG_L1,Validating $$(filter %.xml,$$^))
-        $$(QUIET)$$(VBOX_XMLLINT_WITH_CAT) $$(VBOX_XMLLINT_OPTS) --dtdvalid $$(VBOX_PATH_DOCBOOK_DTD)/docbookx.dtd \
-                --xinclude --noout $$(filter %.xml,$$^)
+        $$(call MSG_L1,Validating $$<)
+        $$(VBOX_XMLLINT_WITH_CAT) $$(VBOX_XMLLINT_OPTS) --dtdvalid $$(VBOX_PATH_DOCBOOK_DTD)/docbookx.dtd \
+                --xinclude --noout $$<
         $$(QUIET)$$(APPEND) -t "$$@" "done"
 endef
-$(foreach lang,$(VBOX_MANUAL_LANGUAGES),$(eval $(def_vbox_validate_xml)))
+$(foreach lang,$(VBOX_MANUAL_LANGUAGES),$(evalcall2 def_vbox_validate_xml))
 validatemanual:: $(foreach lang,$(VBOX_MANUAL_LANGUAGES),validatemanual_$(lang))
 
@@ -792 +793 @@
                 $(VBOX_PATH_MANUAL_OUTBASE)/%/docbook-htmlhelp-formatcfg.xsl \
                 $(VBOX_PATH_MANUAL_OUTBASE)/%/titlepage-htmlhelp.xsl \
+                $(VBOX_PATH_MANUAL_OUTBASE)/%/validatemanual.run \
                 $(addprefix $(VBOX_PATH_MANUAL_OUTBASE)/%/,$(VBOX_MANUAL_XML_FILES_INCL_CHANGELOG)) \
                 $(VBOX_XML_CATALOG) $(VBOX_XML_CATALOG_DOCBOOK)