Changeset 32024 in vbox for trunk

Timestamp:

Aug 27, 2010 9:01:58 AM (14 years ago)

Author:

vboxsync

Message:

manual: fixed annoying warnings about missing external entities; allow to build with DocBook from the host; some cleanup

File:

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

trunk/doc/manual/Makefile.kmk

@@ -173 +173 @@
                 UserManual.fo) \
         $(foreach f,$(VBOX_MANUAL_LANGUAGES), $(addprefix $(VBOX_PATH_MANUAL_OUTBASE)/$f/, \
-                docbook-fo-formatcfg.xsl \
                 docbook-htmlhelp-formatcfg.xsl \
                 docbook-html-one-page-formatcfg.xsl \
                 docbook-html-chunks-formatcfg.xsl \
-                titlepage-fo.xsl \
                 titlepage-htmlhelp.xsl )) \
         $(foreach f,$(VBOX_MANUAL_LANGUAGES),$(addprefix $(VBOX_PATH_MANUAL_OUTBASE)/$f/,$(VBOX_MANUAL_PNG_FILES_$(f)))) \
@@ -215 +213 @@
 
 # tool locations
-DOCBOOKPATH    ?= $(PATH_DEVTOOLS)/common/DocBook/v1.69.1
-DOCBOOKDTDPATH ?= $(PATH_DEVTOOLS)/common/docbook-xml/v4.3
+ifndef VBOX_OSE
+ # use docbook from our tools directory
+ DOCBOOKPATH          ?= $(PATH_DEVTOOLS)/common/DocBook/v1.69.1
+ DOCBOOKDTDPATH       ?= $(PATH_DEVTOOLS)/common/docbook-xml/v4.3
+ XML_CATALOG          ?= $(VBOX_PATH_MANUAL_OUTBASE)/catalog
+ XML_CATALOG_DOCBOOK  ?= $(VBOX_PATH_MANUAL_OUTBASE)/docbook
+else
+ # use docbook of the build host
+ DOCBOOKPATH          ?= http://docbook.sourceforge.net/release/xsl/current/
+endif
 VBOXMANAGEPATH ?= $(PATH_BIN)/VBoxManage$(SUFF_EXE)
 
@@ -227 +233 @@
  PDFLATEX          = pdflatex $(PDFLATEX_HALT) -interaction batchmode
 endif
-
-DOCBOOK_HTMLHELP_XSL_CFG = $(VBOX_PATH_MANUAL_OUTBASE)/docbook-htmlhelp-formatcfg.xsl
-
-XML_CATALOG              = $(VBOX_PATH_MANUAL_OUTBASE)/catalog
-XML_CATALOG_DOCBOOK      = $(VBOX_PATH_MANUAL_OUTBASE)/docbook
-
-export XML_CATALOG_FILES = $(XML_CATALOG)
 
 # Windows HTML Help Workshop compiler (stupid thing always returns an error!)
@@ -350 +349 @@
 
 # Create a catalog file for xsltproc that points to docbook catalog.
+ifneq ($(XML_CATALOG),)
 $(XML_CATALOG): $(MAKEFILE_CURRENT) | $$(dir $$@)
         $(call MSG_L1,Creating catalog $@)
@@ -372 +372 @@
         $(QUIET)$(APPEND) [email protected] '  <public publicId="-//OASIS//ELEMENTS DocBook XML Information Pool V4.3//EN"          uri="file:///$(DOCBOOKDTDPATH)/dbpoolx.mod"/>'
         $(QUIET)$(APPEND) [email protected] '  <public publicId="-//OASIS//DTD DocBook XML V4.3//EN"                                uri="file:///$(DOCBOOKDTDPATH)/docbookx.dtd"/>'
+        $(QUIET)$(APPEND) [email protected] '  <public publicId="-//OASIS//DTD DocBook XML V4.4//EN"                                uri="file:///$(DOCBOOKDTDPATH)/docbookx.dtd"/>'
         $(QUIET)$(APPEND) [email protected] '  <public publicId="-//OASIS//ENTITIES DocBook XML Character Entities V4.3//EN"        uri="file:///$(DOCBOOKDTDPATH)/dbcentx.mod"/>'
         $(QUIET)$(APPEND) [email protected] '  <public publicId="-//OASIS//ENTITIES DocBook XML Notations V4.3//EN"                 uri="file:///$(DOCBOOKDTDPATH)/dbnotnx.mod"/>'
@@ -380 +381 @@
         $(QUIET)$(APPEND) [email protected] '  <rewriteSystem systemIdStartString="http://www.oasis-open.org/docbook/xml/4.3" rewritePrefix="file:///$(DOCBOOKDTDPATH)"/>'
         $(QUIET)$(APPEND) [email protected] '  <rewriteURI         uriStartString="http://www.oasis-open.org/docbook/xml/4.3" rewritePrefix="file:///$(DOCBOOKDTDPATH)"/>'
+        $(QUIET)$(APPEND) [email protected] '  <rewriteSystem systemIdStartString="http://www.oasis-open.org/docbook/xml/4.4" rewritePrefix="file:///$(DOCBOOKDTDPATH)"/>'
+        $(QUIET)$(APPEND) [email protected] '  <rewriteURI         uriStartString="http://www.oasis-open.org/docbook/xml/4.4" rewritePrefix="file:///$(DOCBOOKDTDPATH)"/>'
         $(QUIET)$(APPEND) [email protected] '  <public publicId="ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN"   uri="file:///$(DOCBOOKDTDPATH)/ent/iso-amsa.ent"/>'
         $(QUIET)$(APPEND) [email protected] '  <public publicId="ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN"  uri="file:///$(DOCBOOKDTDPATH)/ent/iso-amsb.ent"/>'
@@ -401 +404 @@
         $(QUIET)$(APPEND) [email protected] '</catalog>'
         $(QUIET)$(MV) -f [email protected] $@
-
-# intermediate step to do some variable replacement in the XSL configuration
-$(foreach f,$(VBOX_MANUAL_LANGUAGES),$(VBOX_PATH_MANUAL_OUTBASE)/$f/docbook-fo-formatcfg.xsl): \
-                $(VBOX_PATH_MANUAL_SRC)/docbook-fo-formatcfg.xsl $(MAKEFILE_CURRENT) | $$(dir $$@)
-        $(call MSG_L1,Pre-processing $(@F) to $@)
-        $(QUIET)$(RM) -f [email protected] $@
-        $(QUIET)$(SED) -e 's|\$$DOCBOOKPATH|$(DOCBOOKPATH)|g' \
-                       -e 's|\$$CFGPATH|$(VBOX_PATH_MANUAL_SRC)|g' \
-                       -e 's|\$$TARGETPATH|$(@D)|g' --output [email protected] $<
-        $(QUIET)$(MV) -f [email protected] $@
+endif
 
 # intermediate step to do some variable replacement in the XSL configuration
@@ -420 +414 @@
                        -e 's|\$$CFGPATH|$(VBOX_PATH_MANUAL_SRC)|g' \
                        -e 's|\$$TARGETPATH|$(@D)|g' --output [email protected] $<
-        $(QUIET)$(MV) -f [email protected] $@
-
-# Prepare the XSL file for our title page, FO variant.
-$(foreach f,$(VBOX_MANUAL_LANGUAGES),$(VBOX_PATH_MANUAL_OUTBASE)/$f/titlepage-fo.xsl): \
-                $(VBOX_PATH_MANUAL_SRC)/titlepage-fo.xml $(DOCBOOKPATH)/template/titlepage.xsl $(MAKEFILE_CURRENT) | $$(dir $$@)
-        $(call MSG_L1,xsltproc $<)
-        $(QUIET)$(RM) -f [email protected] $@
-        $(QUIET)$(VBOX_XSLTPROC) --xinclude --nonet -o [email protected] $(DOCBOOKPATH)/template/titlepage.xsl $<
         $(QUIET)$(MV) -f [email protected] $@
 
@@ -485 +471 @@
                 $(VBOX_PATH_MANUAL_OUTBASE)/%/UserManual.tex \
                 $(if $(VBOX_OSE),,$(VBOX_PATH_MANUAL_OUTBASE)/%/ucs.sty) \
-                $(foreach f,$(VBOX_MANUAL_LANGUAGES),$(addprefix $(VBOX_PATH_MANUAL_OUTBASE)/$f/,$(VBOX_MANUAL_PNG_FILES_$(f)))) | $$(dir $$@)
+                $(foreach f,$(VBOX_MANUAL_LANGUAGES),\
+                  $(addprefix $(VBOX_PATH_MANUAL_OUTBASE)/$f/,$(VBOX_MANUAL_PNG_FILES_$(f)))) | $$(dir $$@)
 # PDF generation via Latex: generate the .tex file
         $(call MSG_L1,pdflatex $< (three passes) -> $@)
@@ -505 +492 @@
 #   pass current language to xsltproc in TARGETLANG variable (extract it from the
 #   current directory, should become "de_DE" or the like)
-        $(VBOX_XSLTPROC) $(XSLTPROC_VERBOSE) --xinclude --nonet --stringparam TARGETLANG $(notdir $(@D)) -o [email protected] $(VBOX_PATH_MANUAL_SRC)/docbook2latex.xsl $<
+        $(QUIET)$(VBOX_XSLTPROC) $(XSLTPROC_VERBOSE) --xinclude --nonet --stringparam TARGETLANG $(notdir $(@D)) -o [email protected] $(VBOX_PATH_MANUAL_SRC)/docbook2latex.xsl $<
 #   for pretty quotes, replace " with `` or '' depending on whether it's at the start of a word;
 #   the \QUOTE{} was inserted by docbook2latex.xsl for all quotes _outside_ of screen sections
@@ -593 +580 @@
         $(QUIET)$(RM) -f $@
         $(QUIET)$(MKDIR) -p $(@D)
-        $(QUIET)$(VBOX_XSLTPROC) --xinclude --nonet --output $(@D)/ \
-                --stringparam htmlhelp.chm $(subst /,\\,$(@D)/../VirtualBox.chm) $(HTMLHELPOPTS) $(@D)/../docbook-htmlhelp-formatcfg.xsl \
+        $(QUIET)$(if $(XML_CATALOG),XML_CATALOG_FILES=$(XML_CATALOG)) \
+                $(VBOX_XSLTPROC) --xinclude --nonet --output $(@D)/ \
+                --stringparam htmlhelp.chm \
+                $(subst /,\\,$(@D)/../VirtualBox.chm) \
+                $(HTMLHELPOPTS) $(@D)/../docbook-htmlhelp-formatcfg.xsl \
                 $<