Changeset 56520 in vbox for trunk/doc

Timestamp:

Jun 18, 2015 1:09:26 PM (10 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

101141

Message:

manual/Makefile.kmk: A different approach to auto validation of the manual, now done before we generate anything. Did a few cleanup fixes.

File:

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

trunk/doc/manual/Makefile.kmk

@@ -288 +288 @@
                 $(addprefix HTMLHelp/,$(VBOX_MANUAL_PNG_FILES_$(lang))) \
                html-single/UserManual.html \
-               $(addprefix html-chunks/ HTMLHelp/, index.html go01.html) \
+               $(addprefix HTMLHelp/,    index.html go01.html) \
+               $(addprefix html-chunks/, index.html go01.html) \
                $(foreach n,01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 16 \
                         ,html-chunks/ch$(n).html \
+                        html-chunks/re$(n).html \
                         HTMLHelp/ch$(n).html \
+                        HTMLHelp/re$(n).html \
                         $(foreach d2,0 1 2 3 4 5 6 7 8 9,$(foreach d1,0 1 2 3 4 5 6 7 8 9,HTMLHelp/ch$(n)s$(d2)$(d1).html)) ) \
                $(foreach n,a b c \
@@ -308 +311 @@
                 )) \
         $(VBOX_PATH_MANUAL_OUTBASE)/$(VBOX_MANUAL_XML_CHANGELOG) \
+        $(addprefix $(VBOX_PATH_MANUAL_OUTBASE)/overview_,$(VBOX_MANUAL_XML_REFENTRY_FILES)) \
+        $(VBOX_PATH_MANUAL_OUTBASE)/user_VBoxManage_CommandsOverview.xml \
         $(foreach f,$(VBOX_MANUAL_ADD_LANGUAGES),$(PATH_STAGE_BIN)/UserManual_$(f).pdf) \
         $(foreach f,$(VBOX_MANUAL_ADD_LANGUAGES),$(PATH_STAGE_BIN)/VirtualBox_$(f).chm) \
@@ -638 +643 @@
 $(foreach f,$(VBOX_MANUAL_LANGUAGES),$(VBOX_PATH_MANUAL_OUTBASE)/$f/UserManual.tex): \
                 $(VBOX_PATH_MANUAL_OUTBASE)/%/UserManual.tex : \
+                $(VBOX_PATH_MANUAL_OUTBASE)/%/UserManual.xml \
+                $(VBOX_PATH_MANUAL_SRC)/docbook2latex.xsl \
                 $(addprefix $(VBOX_PATH_MANUAL_OUTBASE)/%/,$(VBOX_MANUAL_XML_FILES_INCL_CHANGELOG)) \
-                $(VBOX_PATH_MANUAL_SRC)/docbook2latex.xsl \
+                $(if $(VBOX_HAVE_XMLLINT),$(VBOX_PATH_MANUAL_OUTBASE)/en_US/validatemanual.run,) \
                 $(VBOX_XML_CATALOG) $(VBOX_XML_CATALOG_DOCBOOK) $(MAKEFILE_CURRENT)
         $(call MSG_L1,Generating $@ from DocBook XML)
@@ -679 +686 @@
 endef
 $(foreach lang,$(VBOX_MANUAL_LANGUAGES),$(eval $(def_vbox_validate_xml)))
-ifdef VBOX_HAVE_XMLLINT
-  OTHERS += $(foreach lang,$(VBOX_MANUAL_LANGUAGES),$(VBOX_PATH_MANUAL_OUTBASE)/$(lang)/validatemanual.run)
-endif
 validatemanual:: $(foreach lang,$(VBOX_MANUAL_LANGUAGES),validatemanual_$(lang))
 
@@ -785 +789 @@
  $(foreach f,$(VBOX_MANUAL_LANGUAGES),$(VBOX_PATH_MANUAL_OUTBASE)/$f/HTMLHelp/htmlhelp.hhp): \
                 $(VBOX_PATH_MANUAL_OUTBASE)/%/HTMLHelp/htmlhelp.hhp: \
-                $(addprefix $(VBOX_PATH_MANUAL_OUTBASE)/%/,$(VBOX_MANUAL_XML_FILES_INCL_CHANGELOG)) \
+                $(VBOX_PATH_MANUAL_OUTBASE)/%/UserManual.xml \
                 $(VBOX_PATH_MANUAL_OUTBASE)/%/docbook-htmlhelp-formatcfg.xsl \
                 $(VBOX_PATH_MANUAL_OUTBASE)/%/titlepage-htmlhelp.xsl \
+                $(addprefix $(VBOX_PATH_MANUAL_OUTBASE)/%/,$(VBOX_MANUAL_XML_FILES_INCL_CHANGELOG)) \
                 $(VBOX_XML_CATALOG) $(VBOX_XML_CATALOG_DOCBOOK)
         $(call MSG_L1,xsltproc $<,=> $@)
@@ -852 +857 @@
 $(VBOX_PATH_MANUAL_OUTBASE)/en_US/html-single/UserManual.html: \
                 $(VBOX_PATH_MANUAL_OUTBASE)/en_US/docbook-html-one-page-formatcfg.xsl \
-                $(VBOX_PATH_MANUAL_OUTBASE)/en_US/UserManual.xml \
                 $(addprefix $(VBOX_PATH_MANUAL_OUTBASE)/en_US/,$(VBOX_MANUAL_XML_FILES_INCL_CHANGELOG)) \
                 $(addprefix $(VBOX_PATH_MANUAL_OUTBASE)/en_US/,$(VBOX_MANUAL_PNG_FILES_en_US)) \
+                $(if $(VBOX_HAVE_XMLLINT),$(VBOX_PATH_MANUAL_OUTBASE)/en_US/validatemanual.run,) \
                 $(VBOX_XML_CATALOG) $(VBOX_XML_CATALOG_DOCBOOK) \
                 | $$(dir $$@)
@@ -865 +870 @@
 $(VBOX_PATH_MANUAL_OUTBASE)/en_US/html-chunks/index.html: \
                 $(VBOX_PATH_MANUAL_OUTBASE)/en_US/docbook-html-chunks-formatcfg.xsl \
-                $(VBOX_PATH_MANUAL_OUTBASE)/en_US/UserManual.xml \
                 $(addprefix $(VBOX_PATH_MANUAL_OUTBASE)/en_US/,$(VBOX_MANUAL_XML_FILES_INCL_CHANGELOG)) \
                 $(addprefix $(VBOX_PATH_MANUAL_OUTBASE)/en_US/,$(VBOX_MANUAL_PNG_FILES_en_US)) \
+                $(if $(VBOX_HAVE_XMLLINT),$(VBOX_PATH_MANUAL_OUTBASE)/en_US/validatemanual.run,) \
                 $(VBOX_XML_CATALOG) $(VBOX_XML_CATALOG_DOCBOOK) \
                 | $$(dir $$@)