Changeset 68860 in vbox

Timestamp:

Sep 25, 2017 8:04:07 PM (7 years ago)

Author:

vboxsync

Message:

iprt,vboxmanage,manual: Try write the iso maker docs as a docbook refentry document. Tried to generalize the vboxmanage refentry output handling, moving it to RTMsg*. Made VBoxManage and IPRT generate their C/H sources in their own Makefiles. Hacked the C/H source generation till it can deal with the rather different RTIsoMaker command structure (no sub or sub-sub command stuff).

Location:

trunk

Files:

• doc/manual/Config.kmk (added)
• doc/manual/Makefile.kmk (modified) (14 diffs)
• doc/manual/docbook-refentry-to-C-help.xsl (modified) (25 diffs)
• doc/manual/docbook-refentry-to-H-help.xsl (modified) (4 diffs)
• doc/manual/docbook2latex.xsl (modified) (1 diff)
• doc/manual/en_US/user_AdvancedTopics.xml (modified) (1 diff)
• src/VBox/Frontends/VBoxManage/Makefile.kmk (modified) (4 diffs)
• src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp (modified) (11 diffs)
• src/VBox/Runtime/Makefile.kmk (modified) (2 diffs)
• src/VBox/Runtime/common/fs/isomakercmd-man.xml (added)
• src/VBox/Runtime/common/fs/isomakercmd.cpp (modified) (3 diffs)
• src/VBox/Runtime/common/misc/messagerefentry.cpp (added)

trunk/doc/manual/Makefile.kmk

@@ -49 +49 @@
 include $(KBUILD_PATH)/subheader.kmk
 
+ifndef VBOX_DOC_MANUAL_CONFIG_KMK_INCLUDED
+ include $(PATH_SUB_CURRENT)/Config.kmk
+endif
+
 
 #
@@ -83 +87 @@
 endif
 
-# Source and output locations.
-VBOX_PATH_MANUAL_SRC     := $(PATH_SUB_CURRENT)
-VBOX_PATH_MANUAL_OUTBASE := $(PATH_TARGET)/manual
-
-# tool locations
-ifndef VBOX_OSE
- # use docbook from our tools directory
- VBOX_PATH_DOCBOOK        ?= $(PATH_DEVTOOLS)/common/DocBook/v1.69.1
- VBOX_PATH_DOCBOOK_DTD    ?= $(PATH_DEVTOOLS)/common/docbook-xml/v4.3
- VBOX_XML_CATALOG         ?= $(VBOX_PATH_MANUAL_OUTBASE)/catalog
- VBOX_XML_CATALOG_DOCBOOK ?= $(VBOX_PATH_MANUAL_OUTBASE)/docbook
-else
- # use docbook of the build host
- VBOX_PATH_DOCBOOK        ?= http://docbook.sourceforge.net/release/xsl/current/
-endif
-
-# xsltproc with the catalog trick if applicable.
-ifdef VBOX_XML_CATALOG
- VBOX_XSLTPROC_WITH_CAT    = $(REDIRECT) -E "XML_CATALOG_FILES=$(VBOX_XML_CATALOG)" $1 -- \
-        $(VBOX_XSLTPROC) --nonet --xinclude $(VBOX_XSLTPROC_OPTS)
- VBOX_XMLLINT_WITH_CAT     = $(REDIRECT) -E "XML_CATALOG_FILES=$(VBOX_XML_CATALOG)" -- \
-        $(VBOX_XMLLINT) --nonet --xinclude --noout $(VBOX_XMLLINT_OPTS)
-else
- VBOX_XSLTPROC_WITH_CAT    = $(if $(1), $(REDIRECT) $1 --,) $(VBOX_XSLTPROC) --nonet --xinclude $(VBOX_XSLTPROC_OPTS)
- VBOX_XMLLINT_WITH_CAT     = $(VBOX_XMLLINT) --nonet --xinclude --noout $(VBOX_XMLLINT_OPTS)
-endif
+
 
 VBOXMANAGEHELP_PATH       ?= $(PATH_STAGE_BIN)/VBoxManageHelp$(SUFF_EXE)
@@ -145 +124 @@
 VBOX_DOC_XIDL_SRC_TMP  = $(VBOX_PATH_MANUAL_OUTBASE)/en_US/VirtualBox.xidl.tmp
 
-##
-# Non-pattern-rule approach to editing XSLT files.
-# $(evalcall2 def_vbox_replace_paths_in_xslt)
-# @param    1   The XSLT source file (relative to Makefile dir).
-# @param    2   Optional output subdirectory (leading slash).
-define def_vbox_replace_paths_in_xslt
-OTHER_CLEAN += $$(VBOX_PATH_MANUAL_OUTBASE)$2/$(notdir $1)
-$$(VBOX_PATH_MANUAL_OUTBASE)$2/$(notdir $1): $$(VBOX_PATH_MANUAL_SRC)/$1 | $$$$(dir $$$$@)
-        $$(call MSG_L1,Pre-processing $$(<) to $$(@))
-        $$(QUIET)$$(SED) \
-                -e 's|@VBOX_PATH_DOCBOOK@|$$(VBOX_PATH_DOCBOOK)|g' \
-                -e 's|@VBOX_PATH_MANUAL_SRC@|$$(VBOX_PATH_MANUAL_SRC)|g' \
-                -e 's|@VBOX_PATH_MANUAL_OUTBASE@|$$(VBOX_PATH_MANUAL_OUTBASE)|g' \
-                -e 's|@VBOX_PATH_MANUAL_OUT_LANG@|$$(VBOX_PATH_MANUAL_OUTBASE)$2|g' \
-                --output "$$(@)" $$<
-endef
 
 ##
@@ -189 +152 @@
 endef
 
-## List of refentry files (manpages).
-VBOX_MANUAL_XML_REFENTRY_FILES = \
-        man_VBoxManage-debugvm.xml \
-        man_VBoxManage-extpack.xml \
-        man_VBoxManage-unattended.xml
 
 
@@ -200 +158 @@
 #
 
-BLDDIRS += $(VBOX_PATH_MANUAL_OUTBASE) $(addprefix $(VBOX_PATH_MANUAL_OUTBASE)/, $(VBOX_MANUAL_LANGUAGES))
+BLDDIRS += $(addprefix $(VBOX_PATH_MANUAL_OUTBASE)/, $(VBOX_MANUAL_LANGUAGES))
 
 
@@ -314 +272 @@
                $(addprefix user_,$(VBOX_MANUAL_XML_REFENTRY_FILES)) \
                $(patsubst man_%,%.1,$(basename $(VBOX_MANUAL_XML_REFENTRY_FILES))) \
+               isomakercmd-man.xml \
+               user_isomakercmd-man.xml \
                 $(VBOX_MANUAL_LATEX_FILES_TARGET) \
                 $(VBOX_MANUAL_PNG_FILES_$(lang)) \
@@ -342 +302 @@
         $(addprefix $(VBOX_PATH_MANUAL_OUTBASE)/overview_,$(VBOX_MANUAL_XML_REFENTRY_FILES)) \
         $(VBOX_PATH_MANUAL_OUTBASE)/user_VBoxManage_CommandsOverview.xml \
-        $(VBOX_PATH_MANUAL_OUTBASE)/user_AdvancedTopics_VISO_Options.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) \
@@ -419 +378 @@
 
 
-#
-# To avoid network I/O for fetching DTDs, we generate catalogs mapping the public
-# entity IDs to local files.  (Obviously, only done when we have local files.)
-#
-ifdef VBOX_XML_CATALOG
-# Create a catalog file for xsltproc that points to docbook catalog.
-$(VBOX_XML_CATALOG): $(MAKEFILE_CURRENT) | $$(dir $$@)
-        $(call MSG_L1,Creating catalog $@)
-        $(QUIET)$(RM) -f [email protected] $@
-        $(QUIET)$(APPEND) [email protected] '<?xml version="1.0"?>'
-        $(QUIET)$(APPEND) [email protected] '<!DOCTYPE catalog PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN" "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd">'
-        $(QUIET)$(APPEND) [email protected] '<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">'
-        $(QUIET)$(APPEND) [email protected] '  <delegatePublic publicIdStartString="-//OASIS/ENTITIES DocBook XML"      catalog="file:///$(VBOX_XML_CATALOG_DOCBOOK)"/>'
-        $(QUIET)$(APPEND) [email protected] '  <delegatePublic publicIdStartString="-//OASIS/DTD DocBook XML"           catalog="file:///$(VBOX_XML_CATALOG_DOCBOOK)"/>'
-        $(QUIET)$(APPEND) [email protected] '  <delegateSystem systemIdStartString="http://www.oasis-open.org/docbook/" catalog="file:///$(VBOX_XML_CATALOG_DOCBOOK)"/>'
-        $(QUIET)$(APPEND) [email protected] '  <delegateURI uriStartString="http://www.oasis-open.org/docbook/"         catalog="file:///$(VBOX_XML_CATALOG_DOCBOOK)"/>'
-        $(QUIET)$(APPEND) [email protected] '</catalog>'
-        $(QUIET)$(MV) -f [email protected] $@
-
-# Create a docbook catalog file for xsltproc that points to the local docbook files.
-$(VBOX_XML_CATALOG_DOCBOOK): $(MAKEFILE_CURRENT) | $$(dir $$@)
-        $(call MSG_L1,Creating catalog $@)
-        $(QUIET)$(RM) -f [email protected] $@
-        $(QUIET)$(APPEND) [email protected] '<?xml version="1.0"?>'
-        $(QUIET)$(APPEND) [email protected] '<!DOCTYPE catalog PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN" "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd">'
-        $(QUIET)$(APPEND) [email protected] '<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">'
-        $(QUIET)$(APPEND) [email protected] '  <public publicId="-//OASIS//ELEMENTS DocBook XML Information Pool V4.3//EN"          uri="file:///$(VBOX_PATH_DOCBOOK_DTD)/dbpoolx.mod"/>'
-        $(QUIET)$(APPEND) [email protected] '  <public publicId="-//OASIS//DTD DocBook XML V4.3//EN"                                uri="file:///$(VBOX_PATH_DOCBOOK_DTD)/docbookx.dtd"/>'
-        $(QUIET)$(APPEND) [email protected] '  <public publicId="-//OASIS//DTD DocBook XML V4.4//EN"                                uri="file:///$(VBOX_PATH_DOCBOOK_DTD)/docbookx.dtd"/>'
-        $(QUIET)$(APPEND) [email protected] '  <public publicId="-//OASIS//ENTITIES DocBook XML Character Entities V4.3//EN"        uri="file:///$(VBOX_PATH_DOCBOOK_DTD)/dbcentx.mod"/>'
-        $(QUIET)$(APPEND) [email protected] '  <public publicId="-//OASIS//ENTITIES DocBook XML Notations V4.3//EN"                 uri="file:///$(VBOX_PATH_DOCBOOK_DTD)/dbnotnx.mod"/>'
-        $(QUIET)$(APPEND) [email protected] '  <public publicId="-//OASIS//ENTITIES DocBook XML Additional General Entities V4.3//EN" uri="file:///$(VBOX_PATH_DOCBOOK_DTD)/dbgenent.mod"/>'
-        $(QUIET)$(APPEND) [email protected] '  <public publicId="-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.3//EN"        uri="file:///$(VBOX_PATH_DOCBOOK_DTD)/dbhierx.mod"/>'
-        $(QUIET)$(APPEND) [email protected] '  <public publicId="-//OASIS//DTD XML Exchange Table Model 19990315//EN"               uri="file:///$(VBOX_PATH_DOCBOOK_DTD)/soextblx.dtd"/>'
-        $(QUIET)$(APPEND) [email protected] '  <public publicId="-//OASIS//DTD DocBook XML CALS Table Model V4.3//EN"               uri="file:///$(VBOX_PATH_DOCBOOK_DTD)/calstblx.dtd"/>'
-        $(QUIET)$(APPEND) [email protected] '  <rewriteSystem systemIdStartString="http://www.oasis-open.org/docbook/xml/4.3" rewritePrefix="file:///$(VBOX_PATH_DOCBOOK_DTD)"/>'
-        $(QUIET)$(APPEND) [email protected] '  <rewriteURI         uriStartString="http://www.oasis-open.org/docbook/xml/4.3" rewritePrefix="file:///$(VBOX_PATH_DOCBOOK_DTD)"/>'
-        $(QUIET)$(APPEND) [email protected] '  <rewriteSystem systemIdStartString="http://www.oasis-open.org/docbook/xml/4.4" rewritePrefix="file:///$(VBOX_PATH_DOCBOOK_DTD)"/>'
-        $(QUIET)$(APPEND) [email protected] '  <rewriteURI         uriStartString="http://www.oasis-open.org/docbook/xml/4.4" rewritePrefix="file:///$(VBOX_PATH_DOCBOOK_DTD)"/>'
-        $(QUIET)$(APPEND) [email protected] '  <public publicId="ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN"   uri="file:///$(VBOX_PATH_DOCBOOK_DTD)/ent/iso-amsa.ent"/>'
-        $(QUIET)$(APPEND) [email protected] '  <public publicId="ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN"  uri="file:///$(VBOX_PATH_DOCBOOK_DTD)/ent/iso-amsb.ent"/>'
-        $(QUIET)$(APPEND) [email protected] '  <public publicId="ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN"        uri="file:///$(VBOX_PATH_DOCBOOK_DTD)/ent/iso-amsc.ent"/>'
-        $(QUIET)$(APPEND) [email protected] '  <public publicId="ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN" uri="file:///$(VBOX_PATH_DOCBOOK_DTD)/ent/iso-amsn.ent"/>'
-        $(QUIET)$(APPEND) [email protected] '  <public publicId="ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN"          uri="file:///$(VBOX_PATH_DOCBOOK_DTD)/ent/iso-amso.ent"/>'
-        $(QUIET)$(APPEND) [email protected] '  <public publicId="ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN"         uri="file:///$(VBOX_PATH_DOCBOOK_DTD)/ent/iso-amsr.ent"/>'
-        $(QUIET)$(APPEND) [email protected] '  <public publicId="ISO 8879:1986//ENTITIES Box and Line Drawing//EN"                  uri="file:///$(VBOX_PATH_DOCBOOK_DTD)/ent/iso-box.ent"/>'
-        $(QUIET)$(APPEND) [email protected] '  <public publicId="ISO 8879:1986//ENTITIES Russian Cyrillic//EN"                      uri="file:///$(VBOX_PATH_DOCBOOK_DTD)/ent/iso-cyr1.ent"/>'
-        $(QUIET)$(APPEND) [email protected] '  <public publicId="ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN"                  uri="file:///$(VBOX_PATH_DOCBOOK_DTD)/ent/iso-cyr2.ent"/>'
-        $(QUIET)$(APPEND) [email protected] '  <public publicId="ISO 8879:1986//ENTITIES Diacritical Marks//EN"                     uri="file:///$(VBOX_PATH_DOCBOOK_DTD)/ent/iso-dia.ent"/>'
-        $(QUIET)$(APPEND) [email protected] '  <public publicId="ISO 8879:1986//ENTITIES Greek Letters//EN"                         uri="file:///$(VBOX_PATH_DOCBOOK_DTD)/ent/iso-grk1.ent"/>'
-        $(QUIET)$(APPEND) [email protected] '  <public publicId="ISO 8879:1986//ENTITIES Monotoniko Greek//EN"                      uri="file:///$(VBOX_PATH_DOCBOOK_DTD)/ent/iso-grk2.ent"/>'
-        $(QUIET)$(APPEND) [email protected] '  <public publicId="ISO 8879:1986//ENTITIES Greek Symbols//EN"                         uri="file:///$(VBOX_PATH_DOCBOOK_DTD)/ent/iso-grk3.ent"/>'
-        $(QUIET)$(APPEND) [email protected] '  <public publicId="ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN"             uri="file:///$(VBOX_PATH_DOCBOOK_DTD)/ent/iso-grk4.ent"/>'
-        $(QUIET)$(APPEND) [email protected] '  <public publicId="ISO 8879:1986//ENTITIES Added Latin 1//EN"                         uri="file:///$(VBOX_PATH_DOCBOOK_DTD)/ent/iso-lat1.ent"/>'
-        $(QUIET)$(APPEND) [email protected] '  <public publicId="ISO 8879:1986//ENTITIES Added Latin 2//EN"                         uri="file:///$(VBOX_PATH_DOCBOOK_DTD)/ent/iso-lat2.ent"/>'
-        $(QUIET)$(APPEND) [email protected] '  <public publicId="ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN"           uri="file:///$(VBOX_PATH_DOCBOOK_DTD)/ent/iso-num.ent"/>'
-        $(QUIET)$(APPEND) [email protected] '  <public publicId="ISO 8879:1986//ENTITIES Publishing//EN"                            uri="file:///$(VBOX_PATH_DOCBOOK_DTD)/ent/iso-pub.ent"/>'
-        $(QUIET)$(APPEND) [email protected] '  <public publicId="ISO 8879:1986//ENTITIES General Technical//EN"                     uri="file:///$(VBOX_PATH_DOCBOOK_DTD)/ent/iso-tech.ent"/>'
-        $(QUIET)$(APPEND) [email protected] '</catalog>'
-        $(QUIET)$(MV) -f [email protected] $@
-endif
-
 
 if defined(VBOX_WITH_DOCS) && (!defined(VBOX_ONLY_BUILD) || defined(VBOX_ONLY_DOCS) || defined(VBOX_ONLY_SDK))
@@ -520 +417 @@
         $$(addprefix $$(VBOX_PATH_MANUAL_OUTBASE)/$(lang)/user_,$$(filter man_VBoxManage%,$$(VBOX_MANUAL_XML_REFENTRY_FILES))) \
         $$(addprefix $$(VBOX_PATH_MANUAL_OUTBASE)/overview_,$$(filter man_VBoxManage%,$$(VBOX_MANUAL_XML_REFENTRY_FILES))) \
-        $(VBOX_PATH_MANUAL_OUTBASE)/user_VBoxManage_CommandsOverview.xml \
-        $(VBOX_PATH_MANUAL_OUTBASE)/user_AdvancedTopics_VISO_Options.xml ))
+        $(VBOX_PATH_MANUAL_OUTBASE)/user_VBoxManage_CommandsOverview.xml ))
+
+# Manual dependency for user_AdvancedTopics.xml.
+$(foreach lang,$(VBOX_MANUAL_LANGUAGES) \
+,$(eval $(VBOX_PATH_MANUAL_OUTBASE)/$(lang)/user_AdvancedTopics.xml: $(VBOX_PATH_MANUAL_OUTBASE)/$(lang)/user_isomakercmd-man.xml))
 
 # Intermediate step to do some variable replacement in the document.
@@ -530 +430 @@
 # Morph man pages into manual sections.
 # $(evalcall2 def_vbox_refentry_to_user_sect1)
-# @param    1   The XSLT source file (relative to Makefile dir).
-# @param    2   Optional output subdirectory.
+# @param    1  Language.
+# @param    2  the refentry xml base file name.
+# @param    3  the full refentry xml file path.
 define def_vbox_refentry_to_user_sect1
-$$(VBOX_PATH_MANUAL_OUTBASE)/$(1)/user_$(2): \
-                $$(VBOX_PATH_MANUAL_SRC)/$(1)/$(2) \
+$$(VBOX_PATH_MANUAL_OUTBASE)/$(1)/user_$(2): $(3) \
                 $$(VBOX_PATH_MANUAL_SRC)/docbook-refentry-to-manual-sect1.xsl \
                 $$(VBOX_XML_CATALOG) $(VBOX_XML_CATALOG_DOCBOOK) \
@@ -543 +443 @@
 endef
 $(foreach lang,$(VBOX_MANUAL_LANGUAGES),$(foreach file,$(VBOX_MANUAL_XML_REFENTRY_FILES) \
-, $(evalcall2 def_vbox_refentry_to_user_sect1,$(lang),$(file))))
+, $(evalcall2 def_vbox_refentry_to_user_sect1,$(lang),$(file),$(VBOX_PATH_MANUAL_SRC)/$(lang)/$(file))))
+$(foreach lang,$(VBOX_MANUAL_LANGUAGES) \
+,$(evalcall2 def_vbox_refentry_to_user_sect1,$(lang),isomakercmd-man.xml,$(PATH_ROOT)/src/VBox/Runtime/common/fs/isomakercmd-man.xml))
 
 
@@ -584 +486 @@
                '</sect1>'
 
-# Generate the VISO option listing.
-$(VBOX_PATH_MANUAL_OUTBASE)/user_AdvancedTopics_VISO_Options.xml: $(VBOX_RTISOMAKER) $(MAKEFILE_CURRENT) | $$(dir $$@)
-        $(call MSG_GENERATE,,$@,)
-        $(QUIET)$(RM) -f $@ [email protected]
-        $(QUIET)$(APPEND) -tn "$@" \
-                '<?xml version="1.0" encoding="UTF-8"?>' \
-               '<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">' \
-               '<sect1> <!-- this will be skipped via xpointer in the include. --> '
-        $(QUIET)$(REDIRECT) -wo [email protected] -E 'VBOX_LOG_FLAGS=disabled' -E 'VBOX_LOG_DEST=nofile' \
-                -- $(VBOX_RTISOMAKER) --help
-        $(QUIET)$(SED) \
-                -e ':a' \
-                -e 'N' \
-                -e '$(DOLLAR)!ba' \
-                -e 's/bldRTIsoMaker/RTIsoMaker/' \
-                -e 's/&/\&amp\;/g' \
-                -e 's/</\&lt\;/g' \
-                -e 's/>/\&gt\;/g' \
-                -e 's/\n*$(DOLLAR)/<\/screen>/' \
-                -e 's/^/<screen>/' \
-                --append $@ [email protected]
-        $(QUIET)$(RM) -f [email protected]
-        $(QUIET)$(APPEND) -n "$@" \
-               '</sect1>'
-
 
 
@@ -644 +521 @@
 ##########################################################################################
 
-$(foreach f,$(VBOX_MANUAL_LANGUAGES),$(VBOX_PATH_MANUAL_OUTBASE)/$f/UserManual.pdf): \
+$(foreach lang,$(VBOX_MANUAL_LANGUAGES),$(VBOX_PATH_MANUAL_OUTBASE)/$(lang)/UserManual.pdf): \
                 $(VBOX_PATH_MANUAL_OUTBASE)/%/UserManual.pdf : \
                 $(VBOX_PATH_MANUAL_OUTBASE)/%/UserManual.tex \
@@ -1029 +906 @@
 
 
-#
-# VBoxManage built-in help.
-#
-# Note! Generating the stuff here is a bit annoying, but currently the most
-#       practical way I can come up with.
-#
-OTHERS += \
-        $(VBOX_PATH_MANUAL_OUTBASE)/VBoxManageBuiltInHelp.cpp \
-        $(VBOX_PATH_MANUAL_OUTBASE)/VBoxManageBuiltInHelp.h
-OTHER_CLEAN += \
-        $(VBOX_PATH_MANUAL_OUTBASE)/VBoxManageBuiltInHelp.cpp \
-        $(VBOX_PATH_MANUAL_OUTBASE)/VBoxManageBuiltInHelp.cpp.ts \
-        $(VBOX_PATH_MANUAL_OUTBASE)/VBoxManageBuiltInHelp.h \
-        $(VBOX_PATH_MANUAL_OUTBASE)/VBoxManageBuiltInHelp.h.ts
-help-experiment:: \
-        $(VBOX_PATH_MANUAL_OUTBASE)/VBoxManageBuiltInHelp.cpp \
-        $(VBOX_PATH_MANUAL_OUTBASE)/VBoxManageBuiltInHelp.h
-
-$(evalcall2 def_vbox_replace_paths_in_xslt,docbook-refentry-to-C-help.xsl,)
-$(evalcall2 def_vbox_replace_paths_in_xslt,docbook-refentry-to-H-help.xsl,)
-
-$(VBOX_PATH_MANUAL_OUTBASE)/docbook-refentry-to-C-help.xsl: $(VBOX_PATH_MANUAL_SRC)/common-formatcfg.xsl # manual dependency.
-
-$(VBOX_PATH_MANUAL_OUTBASE)/VBoxManageBuiltInHelp.cpp.ts \
-+| $(VBOX_PATH_MANUAL_OUTBASE)/VBoxManageBuiltInHelp.cpp: \
-                $(VBOX_PATH_MANUAL_OUTBASE)/docbook-refentry-to-C-help.xsl \
-                $(addprefix $(VBOX_PATH_MANUAL_OUTBASE)/en_US/,$(filter man_VBoxManage-%,$(VBOX_MANUAL_XML_REFENTRY_FILES))) \
-                $(VBOX_XML_CATALOG) $(VBOX_XML_CATALOG_DOCBOOK) $(MAKEFILE) | $$(dir $$@)
-        $(call MSG_TOOL,xsltproc $(notdir $(firstword $(filter %.xsl,$^))),,$(filter %.xml,$^),$(patsubst %.ts,%,$@))
-        $(QUIET)$(APPEND) -tn "$@" \
-                '/* Autogenerated by $<, do not edit! */' \
-                '' \
-                '#include <iprt/types.h>' \
-                '#include "VBoxManageBuiltInHelp.h"' \
-                ''
-        $(foreach refentry,$(filter %.xml,$^) \
-        ,$(NLTAB)$(QUIET)$(call VBOX_XSLTPROC_WITH_CAT, -a+to "$@") $< $(refentry))
-        $(QUIET)$(APPEND) -n "$@" \
-        '' \
-                'PCREFENTRY     g_apHelpEntries[] = ' \
-                '{'
-        $(foreach refentry,$(filter %.xml,$^) \
-                ,$(NLTAB)$(QUIET)$(APPEND) -n "$@" \
-                '    &g_$(subst -,_,$(tolower $(patsubst man_%,%,$(notdir $(basename $(refentry)))))), ')
-        $(QUIET)$(APPEND) -n "$@" \
-                '};' \
-                'const uint32_t g_cHelpEntries = RT_ELEMENTS(g_apHelpEntries);' \
-               ''
-        $(QUIET)$(CP) --changed -- "$@" "$(patsubst %.ts,%,$@)"
-# The above APPEND stuff trigger some kind of problem on some boxes when not split up...
-# update: Fixed in SVN (strcpy -> memmove in new_job(), job.c - r2591). Just need to rebuild all platforms.
-
-$(VBOX_PATH_MANUAL_OUTBASE)/VBoxManageBuiltInHelp.h.ts \
-+| $(VBOX_PATH_MANUAL_OUTBASE)/VBoxManageBuiltInHelp.h: \
-                $(VBOX_PATH_MANUAL_OUTBASE)/docbook-refentry-to-H-help.xsl \
-                $(addprefix $(VBOX_PATH_MANUAL_OUTBASE)/en_US/,$(filter man_VBoxManage-%,$(VBOX_MANUAL_XML_REFENTRY_FILES))) \
-                $(VBOX_XML_CATALOG) $(VBOX_XML_CATALOG_DOCBOOK) $(MAKEFILE) | $$(dir $$@)
-        $(call MSG_TOOL,xsltproc $(notdir $(firstword $(filter %.xsl,$^))),,$(filter %.xml,$^),$(patsubst %.ts,%,$@))
-        $(QUIET)$(APPEND) -tn "$@" \
-                '/* Autogenerated by $<, do not edit! */' \
-               '' \
-               '#ifndef ___VBoxManageBuiltInHelp_h___' \
-               '#define ___VBoxManageBuiltInHelp_h___' \
-               '' \
-               '#include <VBox/refentry.h>' \
-               '' \
-               'RT_C_DECLS_BEGIN' \
-               '' \
-               'typedef enum HELP_CMD_VBOXMANAGE' \
-               '{' \
-               '    HELP_CMD_VBOXMANAGE_INVALID = 0,'
-        $(foreach refentry,$(filter %.xml,$^) \
-        ,$(NLTAB)$(QUIET)$(call VBOX_XSLTPROC_WITH_CAT, -a+to "$@") \
-                --stringparam 'g_sMode' 'cmd' $< $(refentry))
-        $(QUIET)$(APPEND) -n "$@" \
-                '    HELP_CMD_VBOXMANAGE_END' \
-                '} HELP_CMD_VBOXMANAGE;'
-        $(foreach refentry,$(filter %.xml,$^) \
-        ,$(NLTAB)$(QUIET)$(call VBOX_XSLTPROC_WITH_CAT, -a+to "$@") \
-                --stringparam 'g_sMode' 'subcmd' $< $(refentry))
-        $(QUIET)$(APPEND) -n "$@" \
-                '' \
-                'extern PCREFENTRY     g_apHelpEntries[];' \
-                'extern const uint32_t g_cHelpEntries;' \
-                '' \
-               'RT_C_DECLS_END' \
-                '' \
-                '#endif' \
-               ''
-        $(QUIET)$(CP) --changed -- "$@" "$(patsubst %.ts,%,$@)"
-
 
 include $(FILE_KBUILD_SUB_FOOTER)

trunk/doc/manual/docbook-refentry-to-C-help.xsl

@@ -78 +78 @@
     <xsl:text>
 
-static const REFENTRYSTR </xsl:text><xsl:value-of select="$sDataBaseSym"/><xsl:text>_synopsis[] =
+static const RTMSGREFENTRYSTR </xsl:text><xsl:value-of select="$sDataBaseSym"/><xsl:text>_synopsis[] =
 {</xsl:text>
     <xsl:for-each select="./refsynopsisdiv/cmdsynopsis">
@@ -104 +104 @@
       -->
     <xsl:text>
-static const REFENTRYSTR </xsl:text><xsl:value-of select="$sDataBaseSym"/><xsl:text>_full_help[] =
+static const RTMSGREFENTRYSTR </xsl:text><xsl:value-of select="$sDataBaseSym"/><xsl:text>_full_help[] =
 {</xsl:text>
     <!-- We start by combining the refentry title and the refpurpose into a short description. -->
@@ -118 +118 @@
         </xsl:call-template>
         <xsl:text>." },
-    {   REFENTRYSTR_SCOPE_SAME, "" },</xsl:text>
+    {   RTMSGREFENTRYSTR_SCOPE_SAME, "" },</xsl:text>
 
     <!-- The follows the usage (synopsis) section. -->
     <xsl:text>
-    {   REFENTRYSTR_SCOPE_GLOBAL,
+    {   RTMSGREFENTRYSTR_SCOPE_GLOBAL,
         "Usage" },
-    {   REFENTRYSTR_SCOPE_SAME,
+    {   RTMSGREFENTRYSTR_SCOPE_SAME,
         "=====" },
-    {   REFENTRYSTR_SCOPE_SAME,
+    {   RTMSGREFENTRYSTR_SCOPE_SAME,
         "" },</xsl:text>
         <xsl:apply-templates select="./refsynopsisdiv/node()"/>
@@ -140 +140 @@
         <xsl:text>
     {   </xsl:text><xsl:call-template name="calc-scope-refsect1"/><xsl:text>, "" },
-    {   REFENTRYSTR_SCOPE_SAME,
+    {   RTMSGREFENTRYSTR_SCOPE_SAME,
         "</xsl:text><xsl:value-of select="$sTitle"/><xsl:text>" },
-    {   REFENTRYSTR_SCOPE_SAME,
+    {   RTMSGREFENTRYSTR_SCOPE_SAME,
         "</xsl:text>
         <xsl:value-of select="substring($g_sUnderlineRefSect1, 1, string-length($sTitle))"/>
@@ -158 +158 @@
       -->
     <xsl:text>
-static const REFENTRY </xsl:text><xsl:value-of select="$sDataBaseSym"/><xsl:text> =
+static const RTMSGREFENTRY </xsl:text><xsl:value-of select="$sDataBaseSym"/><xsl:text> =
 {
     /* .idInternal = */   HELP_CMD_</xsl:text>
-    <xsl:call-template name="str:to-upper">
-      <xsl:with-param name="text" select="translate(substring-after(@id, '-'), '-', '_')"/>
-    </xsl:call-template>
+    <xsl:choose>
+      <xsl:when test="contains(@id, '-')">
+        <xsl:call-template name="str:to-upper">   <!-- Multi level command. -->
+          <xsl:with-param name="text" select="translate(substring-after(@id, '-'), '-', '_')"/>
+        </xsl:call-template>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:call-template name="str:to-upper">   <!-- Simple command. -->
+          <xsl:with-param name="text" select="@id"/>
+        </xsl:call-template>
+      </xsl:otherwise>
+    </xsl:choose>
     <xsl:text>,
     /* .Synopsis   = */   { RT_ELEMENTS(</xsl:text>
@@ -186 +195 @@
     <xsl:if test="text()"><xsl:message terminate="yes">cmdsynopsis with text is not supported.</xsl:message></xsl:if>
     <xsl:text>
-    {   </xsl:text><xsl:call-template name="calc-scope-cmdsynopsis"/><xsl:text> | REFENTRYSTR_FLAGS_SYNOPSIS,
+    {   </xsl:text><xsl:call-template name="calc-scope-cmdsynopsis"/><xsl:text> | RTMSGREFENTRYSTR_FLAGS_SYNOPSIS,
         "</xsl:text><xsl:call-template name="emit-indentation"/><xsl:apply-templates select="*|@*"/><xsl:text>" },</xsl:text>
   </xsl:template>
@@ -192 +201 @@
   <xsl:template match="sbr">
     <xsl:text>" },
-    {   REFENTRYSTR_SCOPE_SAME | REFENTRYSTR_FLAGS_SYNOPSIS,
+    {   RTMSGREFENTRYSTR_SCOPE_SAME | RTMSGREFENTRYSTR_FLAGS_SYNOPSIS,
         "    </xsl:text><xsl:call-template name="emit-indentation"/> <!-- hardcoded in VBoxManageHelp.cpp too -->
   </xsl:template>
@@ -198 +207 @@
   <xsl:template match="cmdsynopsis/command">
     <xsl:text>" },
-    {   REFENTRYSTR_SCOPE_SAME | REFENTRYSTR_FLAGS_SYNOPSIS,
+    {   RTMSGREFENTRYSTR_SCOPE_SAME | RTMSGREFENTRYSTR_FLAGS_SYNOPSIS,
         "</xsl:text><xsl:call-template name="emit-indentation"/>
     <xsl:apply-templates select="node()|@*"/>
@@ -275 +284 @@
     <xsl:text>
     {   </xsl:text><xsl:call-template name="calc-scope-refsect2"/><xsl:text>, "" },
-    {   REFENTRYSTR_SCOPE_SAME,
+    {   RTMSGREFENTRYSTR_SCOPE_SAME,
         "</xsl:text><xsl:call-template name="emit-indentation"/>
     <xsl:value-of select="$sTitle"/>
     <xsl:text>" },
-    {   REFENTRYSTR_SCOPE_SAME,
+    {   RTMSGREFENTRYSTR_SCOPE_SAME,
         "</xsl:text><xsl:call-template name="emit-indentation"/>
     <xsl:value-of select="substring($g_sUnderlineRefSect2, 1, string-length($sTitle))"/>
     <xsl:text>" },
-    {   REFENTRYSTR_SCOPE_SAME, "" },</xsl:text>
+    {   RTMSGREFENTRYSTR_SCOPE_SAME, "" },</xsl:text>
 
     <!-- Format the text in the section -->
@@ -293 +302 @@
     <xsl:if test="position() != last()">
       <xsl:text>
-    {   REFENTRYSTR_SCOPE_SAME, "" },</xsl:text>
+    {   RTMSGREFENTRYSTR_SCOPE_SAME, "" },</xsl:text>
     </xsl:if>
   </xsl:template>
@@ -304 +313 @@
     <xsl:if test="position() != 1 or not(parent::listitem)">
       <xsl:text>
-    {   REFENTRYSTR_SCOPE_SAME, "" },</xsl:text>
+    {   RTMSGREFENTRYSTR_SCOPE_SAME, "" },</xsl:text>
     </xsl:if>
     <xsl:call-template name="process-mixed"/>
@@ -318 +327 @@
     </xsl:if>
     <xsl:for-each select="./varlistentry">
-      <xsl:if test="count(*) != 2 or not(term) or not(listitem)">
-        <xsl:message terminate="yes">Expected exactly one term and one listentry member in varlistentry element.</xsl:message>
+      <xsl:if test="not(term) or not(listitem) or count(listitem) > 1">
+        <xsl:message terminate="yes">Expected one or more term members and exactly one listentry member in varlistentry element.</xsl:message>
       </xsl:if>
       <xsl:if test="not(@spacing) or @spacing != 'compact'">
         <xsl:text>
-    {   REFENTRYSTR_SCOPE_SAME, "" },</xsl:text>
+    {   RTMSGREFENTRYSTR_SCOPE_SAME, "" },</xsl:text>
       </xsl:if>
       <xsl:apply-templates select="*"/>
@@ -361 +370 @@
     <xsl:if test="position() != 1 and (not(@spacing) or @spacing != 'compact')">
       <xsl:text>
-    {   REFENTRYSTR_SCOPE_SAME, "" },</xsl:text>
+    {   RTMSGREFENTRYSTR_SCOPE_SAME, "" },</xsl:text>
     </xsl:if>
     <xsl:for-each select="./listitem">
@@ -380 +389 @@
     <xsl:if test="position() != 1 and @spaceing != 'compact'">
       <xsl:text>
-    {   REFENTRYSTR_SCOPE_SAME, "" },</xsl:text>
+    {   RTMSGREFENTRYSTR_SCOPE_SAME, "" },</xsl:text>
     </xsl:if>
     <xsl:apply-templates select="*"/>
@@ -395 +404 @@
 
     <xsl:text>
-    {   REFENTRYSTR_SCOPE_SAME,
+    {   RTMSGREFENTRYSTR_SCOPE_SAME,
         "</xsl:text>
 
@@ -426 +435 @@
     <xsl:if test="substring-after($sText,'&#x0a;')">
       <xsl:text>" },
-    {   REFENTRYSTR_SCOPE_SAME,
+    {   RTMSGREFENTRYSTR_SCOPE_SAME,
         "</xsl:text>
       <xsl:call-template name="screen_text_line">
@@ -608 +617 @@
   <xsl:template name="process-mixed">
     <xsl:text>
-    {   REFENTRYSTR_SCOPE_SAME,
+    {   RTMSGREFENTRYSTR_SCOPE_SAME,
         "</xsl:text><xsl:call-template name="emit-indentation"/>
 
@@ -631 +640 @@
 
   <xsl:template name="calc-scope-for-refentry">
-    <xsl:call-template name="calc-scope-const-from-id"/>
+    <xsl:text>HELP_SCOPE_</xsl:text>
+    <xsl:choose>
+      <xsl:when test="contains(@id, '-')">          <!-- Multi level command. -->
+        <xsl:call-template name="str:to-upper">
+          <xsl:with-param name="text" select="translate(substring-after(@id, '-'), '-', '_')"/>
+        </xsl:call-template>
+      </xsl:when>
+      <xsl:otherwise>                               <!-- Single command. -->
+        <xsl:call-template name="str:to-upper">
+          <xsl:with-param name="text" select="@id"/>
+        </xsl:call-template>
+      </xsl:otherwise>
+    </xsl:choose>
   </xsl:template>
 
@@ -638 +659 @@
     <xsl:choose>
       <xsl:when test="title[text() = 'Description']">
-        <xsl:text>REFENTRYSTR_SCOPE_GLOBAL</xsl:text>
+        <xsl:text>RTMSGREFENTRYSTR_SCOPE_GLOBAL</xsl:text>
       </xsl:when>
       <xsl:when test="@id or remark[@role='help-scope']">
@@ -644 +665 @@
       </xsl:when>
       <xsl:otherwise>
-        <xsl:text>REFENTRYSTR_SCOPE_GLOBAL</xsl:text>
+        <xsl:text>RTMSGREFENTRYSTR_SCOPE_GLOBAL</xsl:text>
       </xsl:otherwise>
     </xsl:choose>
@@ -656 +677 @@
       </xsl:when>
       <xsl:otherwise>
-        <xsl:text>REFENTRYSTR_SCOPE_SAME</xsl:text>
+        <xsl:text>RTMSGREFENTRYSTR_SCOPE_SAME</xsl:text>
       </xsl:otherwise>
     </xsl:choose>
@@ -670 +691 @@
       </xsl:when>
       <xsl:otherwise>
-        <xsl:text>REFENTRYSTR_SCOPE_SAME</xsl:text>
+        <xsl:text>RTMSGREFENTRYSTR_SCOPE_SAME</xsl:text>
       </xsl:otherwise>
     </xsl:choose>
@@ -704 +725 @@
   <xsl:template name="calc-scope-const-from-id">
     <xsl:param name="sId" select="@id"/>
-    <xsl:variable name="sPrefix" select="concat(substring-before(ancestor::refentry/@id, '-'), '-')"/>
-    <xsl:if test="not(contains($sId, sPrefix))">
-      <xsl:message terminate="yes">Expected sId (<xsl:value-of select="$sId"/>) to contain <xsl:value-of select="$sPrefix"/></xsl:message>
-    </xsl:if>
+    <xsl:param name="sAncestorId" select="ancestor::refentry/@id"/>
     <xsl:text>HELP_SCOPE_</xsl:text>
-    <xsl:call-template name="str:to-upper">
-      <xsl:with-param name="text" select="translate(substring-after($sId, $sPrefix), '-', '_')"/>
-    </xsl:call-template>
-  </xsl:template>
-
-  <!-- Turns a remark into one or more scope constant. -->
+    <xsl:choose>
+      <xsl:when test="not($sAncestorId)">           <!-- Sanity check. -->
+        <xsl:message terminate="yes">error: calc-scope-const-from-id is invoked without an refentry ancestor with a id. <xsl:call-template name="get-node-path"/> </xsl:message>
+      </xsl:when>
+
+      <xsl:when test="contains($sAncestorId, '-')"> <!-- Multi level command. -->
+        <xsl:variable name="sPrefix" select="concat(substring-before($sAncestorId, '-'), '-')"/>
+        <xsl:if test="not(contains($sId, $sPrefix))">
+          <xsl:message terminate="yes">Expected sId (<xsl:value-of select="$sId"/>) to contain <xsl:value-of select="$sPrefix"/></xsl:message>
+        </xsl:if>
+        <xsl:call-template name="str:to-upper">
+          <xsl:with-param name="text" select="translate(substring-after($sId, $sPrefix), '-', '_')"/>
+        </xsl:call-template>
+      </xsl:when>
+
+      <xsl:otherwise>                               <!-- Single command. -->
+        <xsl:call-template name="str:to-upper">
+          <xsl:with-param name="text" select="translate($sId, '-', '_')"/>
+        </xsl:call-template>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+
+  <!-- Turns a remark into one or more scope constants. -->
   <xsl:template name="calc-scope-consts-from-remark">
     <xsl:param name="sCondition" select="remark/@condition"/>
@@ -723 +759 @@
     <xsl:choose>
       <xsl:when test="substring-before($sNormalized, ' ') = 'GLOBAL'">
-        <xsl:text>REFENTRYSTR_SCOPE_GLOBAL</xsl:text>
+        <xsl:text>RTMSGREFENTRYSTR_SCOPE_GLOBAL</xsl:text>
       </xsl:when>
       <xsl:otherwise>
@@ -739 +775 @@
       <xsl:choose>
         <xsl:when test="substring-before($sList, ' ') = 'GLOBAL'">
-          <xsl:text>| REFENTRYSTR_SCOPE_GLOBAL</xsl:text>
+          <xsl:text>| RTMSGREFENTRYSTR_SCOPE_GLOBAL</xsl:text>
         </xsl:when>
         <xsl:otherwise>

trunk/doc/manual/docbook-refentry-to-H-help.xsl

@@ -38 +38 @@
     -->
   <xsl:template match="refentry">
+    <xsl:variable name="RefEntry" select="."/>
+    <xsl:variable name="sRefEntryId" select="@id"/>
     <xsl:variable name="sBaseNm">
-      <xsl:call-template name="str:to-upper">
-        <xsl:with-param name="text" select="translate(substring-after(@id, '-'), '-', '_')"/>
-      </xsl:call-template>
+      <xsl:choose>
+        <xsl:when test="contains($sRefEntryId, '-')">   <!-- Multi level command. -->
+          <xsl:call-template name="str:to-upper">
+            <xsl:with-param name="text" select="translate(substring-after($sRefEntryId, '-'), '-', '_')"/>
+          </xsl:call-template>
+        </xsl:when>
+        <xsl:otherwise>                                 <!-- Simple command. -->
+          <xsl:call-template name="str:to-upper">
+            <xsl:with-param name="text" select="translate($sRefEntryId, '-', '_')"/>
+          </xsl:call-template>
+        </xsl:otherwise>
+      </xsl:choose>
     </xsl:variable>
 
@@ -47 +58 @@
       <!-- Generate subcommand enums and defines -->
       <xsl:when test="$g_sMode = 'subcmd'">
+        <!-- Start enum type and start off with the refentry id. -->
         <xsl:text>
 enum
@@ -55 +67 @@
         <xsl:text> RT_BIT_32(HELP_SCOPE_</xsl:text><xsl:value-of select="$sBaseNm"/><xsl:text>_BIT)
         HELP_SCOPE_</xsl:text><xsl:value-of select="$sBaseNm"/><xsl:text>_BIT = 0</xsl:text>
-        <xsl:for-each select="./refsynopsisdiv/cmdsynopsis">
+
+        <!-- Synopsis IDs -->
+        <xsl:for-each select="./refsynopsisdiv/cmdsynopsis[@id != concat('synopsis-', $sRefEntryId)]">
           <xsl:variable name="sSubNm">
             <xsl:text>HELP_SCOPE_</xsl:text>
@@ -64 +78 @@
           <xsl:text>,
 #define </xsl:text>
-        <xsl:value-of select="$sSubNm"/>
-        <xsl:value-of select="substring('                                               ',1,56 - string-length($sSubNm))"/>
-        <xsl:text> RT_BIT_32(</xsl:text><xsl:value-of select="$sSubNm"/><xsl:text>_BIT)
-        </xsl:text><xsl:value-of select="$sSubNm"/><xsl:text>_BIT</xsl:text>
+          <xsl:value-of select="$sSubNm"/>
+          <xsl:value-of select="substring('                                               ',1,56 - string-length($sSubNm))"/>
+          <xsl:text> RT_BIT_32(</xsl:text><xsl:value-of select="$sSubNm"/><xsl:text>_BIT)
+        </xsl:text>
+          <xsl:value-of select="$sSubNm"/><xsl:text>_BIT</xsl:text>
         </xsl:for-each>
 
+        <!-- Add scoping info for refsect1, refsect2 and refsect3 IDs that aren't part of the synopsis. -->
+        <xsl:for-each select=".//refsect1[@id] | .//refsect2[@id] | .//refsect3[@id]">
+          <xsl:variable name="sThisId" select="@id"/>
+          <xsl:if test="not($RefEntry[@id = $sThisId]) and not($RefEntry/refsynopsisdiv/cmdsynopsis[@id = concat('synopsis-', $sThisId)])">
+            <xsl:variable name="sSubNm">
+              <xsl:text>HELP_SCOPE_</xsl:text>
+              <xsl:choose>
+                <xsl:when test="contains($sRefEntryId, '-')">   <!-- Multi level command. -->
+                  <xsl:call-template name="str:to-upper">
+                    <xsl:with-param name="text" select="translate(substring-after(@id, '-'), '-', '_')"/>
+                  </xsl:call-template>
+                </xsl:when>
+                <xsl:otherwise>                                 <!-- Simple command. -->
+                  <xsl:call-template name="str:to-upper">
+                    <xsl:with-param name="text" select="translate(@id, '-', '_')"/>
+                  </xsl:call-template>
+                </xsl:otherwise>
+              </xsl:choose>
+            </xsl:variable>
+            <xsl:text>,
+#define </xsl:text>
+            <xsl:value-of select="$sSubNm"/>
+            <xsl:value-of select="substring('                                               ',1,56 - string-length($sSubNm))"/>
+            <xsl:text> RT_BIT_32(</xsl:text><xsl:value-of select="$sSubNm"/><xsl:text>_BIT)
+        </xsl:text>
+            <xsl:value-of select="$sSubNm"/><xsl:text>_BIT</xsl:text>
+          </xsl:if>
+        </xsl:for-each>
+
+        <!-- Done - complete the enum. -->
         <xsl:text>,
-    HELP_SCOPE_</xsl:text><xsl:value-of select="$sBaseNm"/><xsl:text>_END
+        HELP_SCOPE_</xsl:text><xsl:value-of select="$sBaseNm"/><xsl:text>_END
 };
 </xsl:text>

trunk/doc/manual/docbook2latex.xsl

@@ -582 +582 @@
 
   <xsl:template match="varlistentry">
-    <xsl:if test="not(./term) or not(./listitem) or count(*) != 2">
-      <xsl:message terminate="yes">Expected exactly one term and one listitem element in the varlistentry.</xsl:message>
-    </xsl:if>
+    <xsl:if test="not(./term) or not(./listitem) or count(./listitem) != 1">
+      <xsl:message terminate="yes">Expected at least one term and one listitem element in the varlistentry.</xsl:message>
+    </xsl:if>
+    <!-- TODO: Ideally, I'd like to have each term on a new line. didn't find a simple way of doing that... -->
     <xsl:text>&#x0a;&#x0a;\item[</xsl:text>
-    <xsl:apply-templates select="term"/>
+    <xsl:apply-templates select="./term[1]"/>
+    <xsl:for-each select="./term[position() > 1]">
+      <xsl:text>,&#x0a; </xsl:text>
+      <xsl:apply-templates select="."/>
+    </xsl:for-each>
     <xsl:text>] \hfill \\&#x0a;</xsl:text>
     <xsl:apply-templates select="listitem/*"/>

trunk/doc/manual/en_US/user_AdvancedTopics.xml

@@ -4362 +4362 @@
   </sect1>
 
-  <sect1 id="viso">
-    <title>VISO file format</title>
-
-    <para>The VISO files was introduced with VirtualBox 5.2.  They are virtual ISO images,
-    i.e. constructed in memory from a bunch of files on the host.  A VISO is just the
-    recipe describing how to go about this using a syntax vaguely similar to mkisofs and
-    genisoimage.</para>
-
-    <para>One requirement, the VISO file must start with one of the
-    <option>--iprt-iso-maker-file-marker</option> options. Which of the options
-    you use will dicate the quoting and escaping rules used when reading the
-    file.  The option takes the image UUID as an argument.</para>
-
-    <para>The VISO files are treated as UTF-8 and must not contain any byte order
-    marker (BOM).  There is currently no way to comment out lines in a VISO file.</para>
-
-
-     <xi:include href="../user_AdvancedTopics_VISO_Options.xml" xpointer="xpointer(/sect1/*)"
-       xmlns:xi="http://www.w3.org/2001/XInclude" />
-
-
-  </sect1>
+  <xi:include href="user_isomakercmd-man.xml"    xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
 
 </chapter>

trunk/src/VBox/Frontends/VBoxManage/Makefile.kmk

@@ -18 +18 @@
 SUB_DEPTH = ../../../..
 include $(KBUILD_PATH)/subheader.kmk
+
+include $(PATH_ROOT)/doc/manual/Config.kmk
+
 
 VBOX_COMMON_VBOXMANAGE_DEFS = \
@@ -61 +64 @@
  VBoxManage_DEFS      += $(VBOX_COMMON_VBOXMANAGE_DEFS)
  VBoxManage_DEFS.win   = _WIN32_WINNT=0x0500
- VBoxManage_INCS       = $(PATH_TARGET)/manual
- VBoxManage_INTERMEDIATES = $(PATH_TARGET)/manual/VBoxManageBuiltInHelp.h
+ VBoxManage_INCS = \
+        $(VBoxManage_0_OUTDIR)
+ VBoxManage_INTERMEDIATES = \
+        $(VBoxManage_0_OUTDIR)/VBoxManageBuiltInHelp.h
  VBoxManage_SOURCES    = \
         VBoxManage.cpp \
@@ -76 +81 @@
         $(if $(VBOX_WITH_GUEST_PROPS),VBoxManageGuestProp.cpp) \
         VBoxManageHelp.cpp \
-        $(PATH_TARGET)/manual/VBoxManageBuiltInHelp.cpp \
+        $(VBoxManage_0_OUTDIR)/VBoxManageBuiltInHelp.cpp \
         VBoxManageHostonly.cpp \
         VBoxManageInfo.cpp \
@@ -109 +114 @@
 endif
 
+
+#
+# VBoxManage built-in help from XML refentry in doc/manual/en_US/.
+#
+$(call KB_FN_DO_PASS0_ON_TARGET,VBoxManage)
+
+VBoxManage_CLEAN += \
+        $(VBoxManage_0_OUTDIR)/VBoxManageBuiltInHelp.cpp \
+        $(VBoxManage_0_OUTDIR)/VBoxManageBuiltInHelp.cpp.ts \
+        $(VBoxManage_0_OUTDIR)/VBoxManageBuiltInHelp.h \
+        $(VBoxManage_0_OUTDIR)/VBoxManageBuiltInHelp.h.ts \
+       $(addprefix $(VBoxManage_0_OUTDIR)/,$(filter man_VBoxManage-%,$(VBOX_MANUAL_XML_REFENTRY_FILES)))
+
+
+
+# Preprocess the xml files, applying remarks.
+$(foreach file,$(filter man_VBoxManage-%,$(VBOX_MANUAL_XML_REFENTRY_FILES)) \
+, $(evalcall2 def_vbox_refentry_preprocess_for_manpage,$(VBoxManage_0_OUTDIR),$(file),$(VBOX_PATH_MANUAL_SRC)/en_US/$(file)))
+
+
+# Generate the .cpp file.
+$(VBoxManage_0_OUTDIR)/VBoxManageBuiltInHelp.cpp.ts \
++| $(VBoxManage_0_OUTDIR)/VBoxManageBuiltInHelp.cpp: \
+                $(VBOX_DOCBOOK_REFENTRY_TO_C_HELP) \
+                $(addprefix $(VBoxManage_0_OUTDIR)/,$(filter man_VBoxManage-%,$(VBOX_MANUAL_XML_REFENTRY_FILES))) \
+                $(VBOX_XML_CATALOG) $(VBOX_XML_CATALOG_DOCBOOK) $(MAKEFILE) | $$(dir $$@)
+        $(call MSG_TOOL,xsltproc $(notdir $(firstword $(filter %.xsl,$^))),,$(filter %.xml,$^),$(patsubst %.ts,%,$@))
+        $(QUIET)$(APPEND) -tn "$@" \
+                '/* Autogenerated by $<, do not edit! */' \
+                '' \
+                '#include "VBoxManageBuiltInHelp.h"' \
+                ''
+        $(foreach refentry,$(filter %.xml,$^) \
+        ,$(NLTAB)$(QUIET)$(call VBOX_XSLTPROC_WITH_CAT, -a+to "$@") $< $(refentry))
+        $(QUIET)$(APPEND) -n "$@" \
+        '' \
+                'PCRTMSGREFENTRY     g_apHelpEntries[] = ' \
+                '{'
+        $(foreach refentry,$(filter %.xml,$^) \
+                ,$(NLTAB)$(QUIET)$(APPEND) -n "$@" \
+                '    &g_$(subst -,_,$(tolower $(patsubst man_%,%,$(notdir $(basename $(refentry)))))), ')
+        $(QUIET)$(APPEND) -n "$@" \
+                '};' \
+                'const uint32_t g_cHelpEntries = RT_ELEMENTS(g_apHelpEntries);' \
+               ''
+        $(QUIET)$(CP) --changed -- "$@" "$(patsubst %.ts,%,$@)"
+# The above APPEND stuff trigger some kind of problem on some boxes when not split up...
+# update: Fixed in SVN (strcpy -> memmove in new_job(), job.c - r2591). Just need to rebuild all platforms.
+
+
+$(VBoxManage_0_OUTDIR)/VBoxManageBuiltInHelp.h.ts \
++| $(VBoxManage_0_OUTDIR)/VBoxManageBuiltInHelp.h: \
+                $(VBOX_DOCBOOK_REFENTRY_TO_H_HELP) \
+                $(addprefix $(VBoxManage_0_OUTDIR)/,$(filter man_VBoxManage-%,$(VBOX_MANUAL_XML_REFENTRY_FILES))) \
+                $(VBOX_XML_CATALOG) $(VBOX_XML_CATALOG_DOCBOOK) $(MAKEFILE) | $$(dir $$@)
+        $(call MSG_TOOL,xsltproc $(notdir $(firstword $(filter %.xsl,$^))),,$(filter %.xml,$^),$(patsubst %.ts,%,$@))
+        $(QUIET)$(APPEND) -tn "$@" \
+                '/* Autogenerated by $<, do not edit! */' \
+               '' \
+               '#ifndef ___VBoxManageBuiltInHelp_h___' \
+               '#define ___VBoxManageBuiltInHelp_h___' \
+               '' \
+               '#include <iprt/message.h>' \
+               '' \
+               'RT_C_DECLS_BEGIN' \
+               '' \
+               'typedef enum HELP_CMD_VBOXMANAGE' \
+               '{' \
+               '    HELP_CMD_VBOXMANAGE_INVALID = 0,'
+        $(foreach refentry,$(filter %.xml,$^) \
+        ,$(NLTAB)$(QUIET)$(call VBOX_XSLTPROC_WITH_CAT, -a+to "$@") \
+                --stringparam 'g_sMode' 'cmd' $< $(refentry))
+        $(QUIET)$(APPEND) -n "$@" \
+                '    HELP_CMD_VBOXMANAGE_END' \
+                '} HELP_CMD_VBOXMANAGE;'
+        $(foreach refentry,$(filter %.xml,$^) \
+        ,$(NLTAB)$(QUIET)$(call VBOX_XSLTPROC_WITH_CAT, -a+to "$@") \
+                --stringparam 'g_sMode' 'subcmd' $< $(refentry))
+        $(QUIET)$(APPEND) -n "$@" \
+                '' \
+                'extern PCRTMSGREFENTRY g_apHelpEntries[];' \
+                'extern const uint32_t  g_cHelpEntries;' \
+                '' \
+               'RT_C_DECLS_END' \
+                '' \
+                '#endif' \
+               ''
+        $(QUIET)$(CP) --changed -- "$@" "$(patsubst %.ts,%,$@)"
+
+
 include $(FILE_KBUILD_SUB_FOOTER)
+

trunk/src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp

@@ -28 +28 @@
 #include <iprt/getopt.h>
 #include <iprt/stream.h>
+#include <iprt/message.h>
 
 #include "VBoxManage.h"
@@ -46 +47 @@
 enum HELP_CMD_VBOXMANAGE    g_enmCurCommand = HELP_CMD_VBOXMANAGE_INVALID;
 /** The scope maskt for the current subcommand. */
-uint64_t                    g_fCurSubcommandScope = REFENTRYSTR_SCOPE_GLOBAL;
+uint64_t                    g_fCurSubcommandScope = RTMSGREFENTRYSTR_SCOPE_GLOBAL;
 /** String of spaces that can be used for indentation.   */
 static const char           g_szSpaces[] = "                                                ";
@@ -61 +62 @@
     Assert(g_enmCurCommand == HELP_CMD_VBOXMANAGE_INVALID);
     g_enmCurCommand       = enmCommand;
-    g_fCurSubcommandScope = REFENTRYSTR_SCOPE_GLOBAL;
+    g_fCurSubcommandScope = RTMSGREFENTRYSTR_SCOPE_GLOBAL;
 }
 
@@ -78 +79 @@
 
 
-
-/**
- * Retruns the width for the given handle.
- *
- * @returns Screen width.
- * @param   pStrm           The stream, g_pStdErr or g_pStdOut.
- */
-static uint32_t getScreenWidth(PRTSTREAM pStrm)
-{
-    static uint32_t s_acch[2] = { 0, 0 };
-    uint32_t        iWhich    = pStrm == g_pStdErr ? 1 : 0;
-    uint32_t        cch       = s_acch[iWhich];
-    if (cch)
-        return cch;
-
-    const char *psz = RTEnvGet("VBOXMANAGE_SCREEN_WIDTH");
-    if (   !psz
-        || RTStrToUInt32Full(psz, 0, &cch) != VINF_SUCCESS
-        || cch == 0)
-    {
-        int rc = RTStrmQueryTerminalWidth(pStrm, &cch);
-        if (rc == VERR_INVALID_FUNCTION)
-        {
-            /* It's not a console, but in case we're being piped to less/more/list
-               we look for a console handle on the other standard output handle
-               and standard input.  (Latter doesn't work on windows.)  */
-            rc = RTStrmQueryTerminalWidth(pStrm == g_pStdErr ? g_pStdOut : g_pStdErr, &cch);
-            if (rc == VERR_INVALID_FUNCTION || rc == VERR_INVALID_HANDLE)
-                rc = RTStrmQueryTerminalWidth(g_pStdIn, &cch);
-            if (RT_FAILURE(rc))
-                cch = 80;
-        }
-    }
-
-    s_acch[iWhich] = cch;
-    return cch;
-}
-
-
-/**
- * Prints a string table string (paragraph), performing non-breaking-space
- * replacement and wrapping.
- *
- * @returns Number of lines written.
- * @param   pStrm           The output stream.
- * @param   psz             The string table string to print.
- * @param   cchMaxWidth     The maximum output width.
- * @param   fFlags          String flags that may affect formatting.
- */
-static uint32_t printString(PRTSTREAM pStrm, const char *psz, uint32_t cchMaxWidth, uint64_t fFlags)
-{
-    uint32_t    cLinesWritten;
-    size_t      cch     = strlen(psz);
-    const char *pszNbsp = strchr(psz, REFENTRY_NBSP);
-
-    /*
-     * No-wrap case is simpler, so handle that separately.
-     */
-    if (cch <= cchMaxWidth)
-    {
-        if (!pszNbsp)
-            RTStrmWrite(pStrm, psz, cch);
-        else
-        {
-            do
-            {
-                RTStrmWrite(pStrm, psz, pszNbsp - psz);
-                RTStrmPutCh(pStrm, ' ');
-                psz = pszNbsp + 1;
-                pszNbsp = strchr(psz, REFENTRY_NBSP);
-            } while (pszNbsp);
-            RTStrmWrite(pStrm, psz, strlen(psz));
-        }
-        RTStrmPutCh(pStrm, '\n');
-        cLinesWritten = 1;
-    }
-    /*
-     * We need to wrap stuff, too bad.
-     */
-    else
-    {
-        /* Figure the paragraph indent level first. */
-        uint32_t cchIndent = 0;
-        while (*psz == ' ')
-            cchIndent++, psz++;
-        Assert(cchIndent + 4 + 1 <= RT_ELEMENTS(g_szSpaces));
-
-        if (cchIndent + 8 >= cchMaxWidth)
-            cchMaxWidth += cchIndent + 8;
-
-        /* Work our way thru the string, line by line. */
-        uint32_t cchHangingIndent = 0;
-        cLinesWritten = 0;
-        do
-        {
-            RTStrmWrite(pStrm, g_szSpaces, cchIndent + cchHangingIndent);
-            size_t  offLine       = cchIndent + cchHangingIndent;
-            bool    fPendingSpace = false;
-            do
-            {
-                const char *pszSpace = strchr(psz, ' ');
-                size_t      cchWord  = pszSpace ? pszSpace - psz : strlen(psz);
-                if (   offLine + cchWord + fPendingSpace > cchMaxWidth
-                    && offLine != cchIndent
-                    && fPendingSpace /* don't stop before first word */)
-                    break;
-
-                pszNbsp = (const char *)memchr(psz, REFENTRY_NBSP, cchWord);
-                while (pszNbsp)
-                {
-                    size_t cchSubWord = pszNbsp - psz;
-                    if (fPendingSpace)
-                        RTStrmPutCh(pStrm, ' ');
-                    RTStrmWrite(pStrm, psz, cchSubWord);
-                    offLine += cchSubWord + fPendingSpace;
-                    psz     += cchSubWord + 1;
-                    cchWord -= cchSubWord + 1;
-                    pszNbsp = (const char *)memchr(psz, REFENTRY_NBSP, cchWord);
-                    fPendingSpace = true;
-                }
-
-                if (fPendingSpace)
-                    RTStrmPutCh(pStrm, ' ');
-                RTStrmWrite(pStrm, psz, cchWord);
-                offLine += cchWord + fPendingSpace;
-                psz      = pszSpace ? pszSpace + 1 : strchr(psz, '\0');
-                fPendingSpace = true;
-            } while (offLine < cchMaxWidth && *psz != '\0');
-            RTStrmPutCh(pStrm, '\n');
-            cLinesWritten++;
-
-            /* Set up hanging indent if relevant. */
-            if (fFlags & REFENTRYSTR_FLAGS_SYNOPSIS)
-                cchHangingIndent = 4;
-        } while (*psz != '\0');
-    }
-    return cLinesWritten;
-}
-
-
-/**
- * Checks if the given string is empty (only spaces).
- * @returns true if empty, false if not.
- * @param   psz                 The string to examine.
- */
-DECLINLINE(bool) isEmptyString(const char *psz)
-{
-    char ch;
-    while ((ch = *psz) == ' ')
-        psz++;
-    return ch == '\0';
-}
-
-
-/**
- * Prints a string table.
- *
- * @returns Current number of pending blank lines.
- * @param   pStrm               The output stream.
- * @param   pStrTab             The string table.
- * @param   fScope              The selection scope.
- * @param   cPendingBlankLines  Pending blank lines from previous string table.
- * @param   pcLinesWritten      Pointer to variable that should be incremented
- *                              by the number of lines written.  Optional.
- */
-static uint32_t printStringTable(PRTSTREAM pStrm, PCREFENTRYSTRTAB pStrTab, uint64_t fScope, uint32_t cPendingBlankLines,
-                                 uint32_t *pcLinesWritten = NULL)
-{
-    uint32_t cLinesWritten = 0;
-    uint32_t cchWidth      = getScreenWidth(pStrm);
-    uint64_t fPrevScope    = fScope;
-    for (uint32_t i = 0; i < pStrTab->cStrings; i++)
-    {
-        uint64_t fCurScope = pStrTab->paStrings[i].fScope;
-        if ((fCurScope & REFENTRYSTR_SCOPE_MASK) == REFENTRYSTR_SCOPE_SAME)
-        {
-            fCurScope &= ~REFENTRYSTR_SCOPE_MASK;
-            fCurScope |= (fPrevScope & REFENTRYSTR_SCOPE_MASK);
-        }
-        if (fCurScope & REFENTRYSTR_SCOPE_MASK & fScope)
-        {
-            const char *psz = pStrTab->paStrings[i].psz;
-            if (psz && !isEmptyString(psz))
-            {
-                while (cPendingBlankLines > 0)
-                {
-                    cPendingBlankLines--;
-                    RTStrmPutCh(pStrm, '\n');
-                    cLinesWritten++;
-                }
-                cLinesWritten += printString(pStrm, psz, cchWidth, fCurScope & REFENTRYSTR_FLAGS_MASK);
-            }
-            else
-                cPendingBlankLines++;
-        }
-        fPrevScope = fCurScope;
-    }
-
-    if (pcLinesWritten)
-        *pcLinesWritten += cLinesWritten;
-    return cPendingBlankLines;
-}
 
 
@@ -298 +97 @@
     for (uint32_t i = 0; i < g_cHelpEntries; i++)
     {
-        PCREFENTRY pHelp = g_apHelpEntries[i];
+        PCRTMSGREFENTRY pHelp = g_apHelpEntries[i];
         if (pHelp->idInternal == (int64_t)enmCommand)
         {
@@ -304 +103 @@
             if (cFound == 1)
             {
-                if (fSubcommandScope == REFENTRYSTR_SCOPE_GLOBAL)
+                if (fSubcommandScope == RTMSGREFENTRYSTR_SCOPE_GLOBAL)
                     RTStrmPrintf(pStrm, "Usage - %c%s:\n", RT_C_TO_UPPER(pHelp->pszBrief[0]), pHelp->pszBrief + 1);
                 else
                     RTStrmPrintf(pStrm, "Usage:\n");
             }
-            cPendingBlankLines = printStringTable(pStrm, &pHelp->Synopsis, fSubcommandScope, cPendingBlankLines, &cLinesWritten);
+            RTMsgRefEntryPrintStringTable(pStrm, &pHelp->Synopsis, fSubcommandScope, &cPendingBlankLines, &cLinesWritten);
             if (!cPendingBlankLines)
                 cPendingBlankLines = 1;
@@ -344 +143 @@
     for (uint32_t i = 0; i < g_cHelpEntries; i++)
     {
-        PCREFENTRY pHelp = g_apHelpEntries[i];
+        PCRTMSGREFENTRY pHelp = g_apHelpEntries[i];
         if (   pHelp->idInternal == (int64_t)enmCommand
             || enmCommand == HELP_CMD_VBOXMANAGE_INVALID)
         {
             cFound++;
-            cPendingBlankLines = printStringTable(pStrm, &pHelp->Help, fSubcommandScope, cPendingBlankLines);
+            RTMsgRefEntryPrintStringTable(pStrm, &pHelp->Help, fSubcommandScope, &cPendingBlankLines, NULL /*pcLinesWritten*/);
             if (cPendingBlankLines < 2)
                 cPendingBlankLines = 2;
@@ -377 +176 @@
 {
     Assert(g_enmCurCommand != HELP_CMD_VBOXMANAGE_INVALID);
-    Assert(g_fCurSubcommandScope == REFENTRYSTR_SCOPE_GLOBAL);
+    Assert(g_fCurSubcommandScope == RTMSGREFENTRYSTR_SCOPE_GLOBAL);
 
     return errorSyntax("No subcommand specified");
@@ -394 +193 @@
 {
     Assert(g_enmCurCommand != HELP_CMD_VBOXMANAGE_INVALID);
-    Assert(g_fCurSubcommandScope == REFENTRYSTR_SCOPE_GLOBAL);
+    Assert(g_fCurSubcommandScope == RTMSGREFENTRYSTR_SCOPE_GLOBAL);
 
     /* check if help was requested. */
@@ -421 +220 @@
 {
     Assert(g_enmCurCommand != HELP_CMD_VBOXMANAGE_INVALID);
-    Assert(g_fCurSubcommandScope != REFENTRYSTR_SCOPE_GLOBAL);
+    Assert(g_fCurSubcommandScope != RTMSGREFENTRYSTR_SCOPE_GLOBAL);
 
     /* check if help was requested. */
@@ -1407 +1206 @@
         for (uint32_t i = 0; i < g_cHelpEntries; i++)
         {
-            PCREFENTRY pHelp = g_apHelpEntries[i];
+            PCRTMSGREFENTRY pHelp = g_apHelpEntries[i];
             while (cPendingBlankLines-- > 0)
                 RTStrmPutCh(pStrm, '\n');
             RTStrmPrintf(pStrm, " %c%s:\n", RT_C_TO_UPPER(pHelp->pszBrief[0]), pHelp->pszBrief + 1);
-            cPendingBlankLines = printStringTable(pStrm, &pHelp->Synopsis, REFENTRYSTR_SCOPE_GLOBAL, 0);
+            cPendingBlankLines = 0;
+            RTMsgRefEntryPrintStringTable(pStrm, &pHelp->Synopsis, RTMSGREFENTRYSTR_SCOPE_GLOBAL,
+                                          &cPendingBlankLines, NULL /*pcLinesWritten*/);
             cPendingBlankLines = RT_MAX(cPendingBlankLines, 1);
         }

trunk/src/VBox/Runtime/Makefile.kmk

@@ -474 +474 @@
         common/misc/lockvalidator.cpp \
         common/misc/message.cpp \
+        common/misc/messagerefentry.cpp \
         common/misc/once.cpp \
         common/misc/req.cpp \
@@ -1435 +1436 @@
 
 #
+# Generate RTIsoMaker / VISO help text from the manpage xml.
+#
+IPRT_XML_REFENTRY_FILES = \
+        common/fs/isomakercmd-man.xml
+
+#$(call KB_FN_DO_PASS0_ON_TARGET,RuntimeR3)
+
+BLDDIRS += $(IPRT_OUT_DIR)/man/
+OTHER_CLEAN += \
+        $(addprefix $(IPRT_OUT_DIR)/man/,$(IPRT_XML_REFENTRY_FILES)) \
+        $(addprefix $(IPRT_OUT_DIR)/man/,$(patsubst %.xml,%.h,$(IPRT_XML_REFENTRY_FILES))) \
+        $(addprefix $(IPRT_OUT_DIR)/man/,$(patsubst %.xml,%.h.ts,$(IPRT_XML_REFENTRY_FILES)))
+
+
+include $(PATH_ROOT)/doc/manual/Config.kmk
+
+# Preprocess the xml files, applying remarks.
+$(foreach file,$(IPRT_XML_REFENTRY_FILES) \
+, $(evalcall2 def_vbox_refentry_preprocess_for_manpage,$(IPRT_OUT_DIR)/man,$(notdir $(file)),$(VBOX_PATH_RUNTIME_SRC)/$(file)))
+
+# generate the header and add it as a dependency to the source using it.
+$(evalcall2 def_vbox_single_refentry_to_h,$(IPRT_OUT_DIR)/man/isomakercmd-man.h, $(IPRT_OUT_DIR)/man/isomakercmd-man.xml)
+common/fs/isomakercmd.cpp_DEPS = $(IPRT_OUT_DIR)/man/isomakercmd-man.h
+common/fs/isomakercmd.cpp_INCS = $(IPRT_OUT_DIR)/man/
+
+foobar: $(IPRT_OUT_DIR)/isomakercmd-man.h.ts
+
+
+
+#
 # RuntimeBldProg - Static Runtime for build programs.
 #

trunk/src/VBox/Runtime/common/fs/isomakercmd.cpp

@@ -667 +667 @@
 };
 
+#include "isomakercmd-man.h"
+
 
 /*********************************************************************************************************************************
@@ -810 +812 @@
 static void rtFsIsoMakerCmdUsage(PRTFSISOMAKERCMDOPTS pOpts, const char *pszProgName)
 {
+#if 0
     rtFsIsoMakerPrintf(pOpts,
                        "Usage: %s [options] [@commands.rsp] <filespec1> [filespec2 [..]]\n"
@@ -1132 +1135 @@
                        "\n"
                        , RTPathFilename(pszProgName));
-
-
+#else
+    if (pOpts->pErrInfo)
+        rtFsIsoMakerPrintf(pOpts, "Usage: %s [options] [@commands.rsp] <filespec1> [filespec2 [..]]\n",
+                           RTPathFilename(pszProgName));
+    else
+        RTMsgRefEntryHelp(g_pStdOut, &g_rtisomaker);
+#endif
 }