Changeset 68864 in vbox

Timestamp:

Sep 25, 2017 8:53:52 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). [build fix]

Location:

trunk/src/VBox/Runtime

Files:

• Makefile.kmk (modified) (1 diff)
• common/fs/isomakercmd.cpp (modified) (2 diffs)

trunk/src/VBox/Runtime/Makefile.kmk

@@ -1438 +1438 @@
 # 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
+if1of ($(KBUILD_TARGET), os2) # breaks validationkit, figure out later.
+
+ 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/
+
+endif
 
 

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

@@ -667 +667 @@
 };
 
-#include "isomakercmd-man.h"
+#ifndef RT_OS_OS2 /* fixme */
+# include "isomakercmd-man.h"
+#endif
 
 
@@ -812 +814 @@
 static void rtFsIsoMakerCmdUsage(PRTFSISOMAKERCMDOPTS pOpts, const char *pszProgName)
 {
-#if 0
+#ifdef RT_OS_OS2 /* fixme */
     rtFsIsoMakerPrintf(pOpts,
                        "Usage: %s [options] [@commands.rsp] <filespec1> [filespec2 [..]]\n"