Changeset 16676 in vbox for trunk

Timestamp:

Feb 11, 2009 4:16:56 PM (16 years ago)

Author:

vboxsync

Message:

Makefiles: insert an additional step between VirtualBox.xidl and its users (Main, webservice, Qt, Runtime) so that no recompiles occur if only <desc> tags are changed. In other words, updating the API documentation no longer causes full recompiles

Location:

trunk

Files:

• Config.kmk (modified) (1 diff)
• src/VBox/Frontends/VirtualBox/Makefile.kmk (modified) (1 diff)
• src/VBox/Main/Makefile.kmk (modified) (4 diffs)
• src/VBox/Main/cbinding/Makefile.kmk (modified) (1 diff)
• src/VBox/Main/webservice/Makefile.kmk (modified) (1 diff)
• src/VBox/Runtime/Makefile.kmk (modified) (1 diff)

trunk/Config.kmk

@@ -3615 +3615 @@
 endif
 
+#
+# Shared definitions of the XIDL file to use as a source for
+# generating various other files (VBoxSVC, webservice, docs, front-ends, ...)
+#
+
+# Real XIDL source file; from this we strip the <desc> elements to generate
+# a second XIDL file, from which the COM/XPCOM IDL files are then generated:
+VBOX_XIDL_FILE_SRC     = $(VBOX_PATH_MAIN_SRC)/idl/VirtualBox.xidl
+# second XIDL file to use as source for COM/XPCOM IDL (with stripped docs):
+VBOX_XIDL_FILE         = $(PATH_OUT)/obj/VirtualBox_stripped.xidl
+
 
 #

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

@@ -441 +441 @@
 
 $$(PATH_VirtualBox)/include/COMWrappers.h: \
-                $(PATH_ROOT)/src/VBox/Main/idl/VirtualBox.xidl \
+                $(VBOX_XIDL_FILE) \
                 $(VBOX_VIRTUALBOX4_SRC)/include/COMWrappers.xsl \
                 | $$(dir $$@)

trunk/src/VBox/Main/Makefile.kmk

@@ -118 +118 @@
 endif # xpcom
 
+#
+# Strip documentation from source XIDL so that we don't get a full
+#       recompile every time a comma in the documentation is changed.
+#
+$(VBOX_XIDL_FILE): $(VBOX_XIDL_FILE_SRC) $(VBOX_PATH_MAIN_SRC)/idl/docstrip.xsl
+#       $(CP) -fv $< $(VBOX_XIDL_FILE).tmp
+        $(VBOX_XSLTPROC) -o $(VBOX_XIDL_FILE).tmp $(VBOX_PATH_MAIN_SRC)/idl/docstrip.xsl $<
+        $(CP) --changed -fv $(VBOX_XIDL_FILE).tmp $@
 
 #
@@ -128 +136 @@
                 $(VBOX_PATH_MAIN_SRC)/Doxyfile.Main \
                 $(VBOX_PATH_MAIN_SRC)/idl/doxygen.xsl \
-                $(VBOX_PATH_MAIN_SRC)/idl/VirtualBox.xidl \
+                $(VBOX_XIDL_FILE_SRC) \
                 | $(PATH_TARGET)/ \
                 $(VBOX_MAIN_DOC_DIR)/
         $(RM) -f $(wildcard $(VBOX_MAIN_DOC_DIR)/html/*) $(PATH_TARGET)/docs.Main
-        $(VBOX_XSLTPROC) -o $(PATH_TARGET)/VirtualBox.idl $(VBOX_PATH_MAIN_SRC)/idl/doxygen.xsl $(VBOX_PATH_MAIN_SRC)/idl/VirtualBox.xidl
+        $(VBOX_XSLTPROC) -o $(PATH_TARGET)/VirtualBox.idl $(VBOX_PATH_MAIN_SRC)/idl/doxygen.xsl $(VBOX_XIDL_FILE_SRC)
         $(REDIRECT) -E 'DOCDIR=$(VBOX_MAIN_DOC_DIR)' -E 'PATH_TARGET=$(PATH_TARGET)' -E 'PATH_CHM=$(subst /,\,$(VBOX_MAIN_DOC_DIR)/VirtualBoxAPI.chm)' \
                 -- doxygen $(VBOX_PATH_MAIN_SRC)/Doxyfile.Main
@@ -149 +157 @@
 INSTALLS += VBox-main-xidl
 VBox-main-xidl_INST = $(INST_SDK)bindings/
-VBox-main-xidl_SOURCES = idl/VirtualBox.xidl
+VBox-main-xidl_SOURCES = $(VBOX_XIDL_FILE_SRC)
 
 
@@ -625 +633 @@
 #
 
-VBOX_XIDL_FILE = $(VBOX_PATH_MAIN_SRC)/idl/VirtualBox.xidl
-
 ## @todo this hack ain't cutting it any longer. (the file name is abspath'ed since ages now.)
 xpcom/helpers.cpp: $(VBOX_IDL_TYPELIB.XPCOM)

trunk/src/VBox/Main/cbinding/Makefile.kmk

@@ -45 +45 @@
 $$(XpComCHeaders_0_OUTDIR)/VirtualBox_CXPCOM.h: \
                 $(PATH_SUB_CURRENT)/xpcidl.xsl \
-                $(PATH_SUB_CURRENT)/../idl/VirtualBox.xidl \
+                $(VBOX_XIDL_FILE) \
                 | $$(dir $$@)
         $(VBOX_XSLTPROC) -o $@ $^

trunk/src/VBox/Main/webservice/Makefile.kmk

@@ -111 +111 @@
 PATH_TARGET_WEBTEST           := $(VBOXWEB_OUT_DIR)/webtest
 
-VBOXWEB_IDL_SRC_ORIG          := $(VBOX_PATH_WEBSERVICE)/../idl/VirtualBox.xidl
+VBOXWEB_IDL_SRC_ORIG          := $(VBOX_XIDL_FILE)
 VBOXWEB_IDL_SRC               := $(VBOXWEB_OUT_DIR)/VirtualBox.xidl
 

trunk/src/VBox/Runtime/Makefile.kmk

@@ -1484 +1484 @@
 $(IPRT_OUT_DIR)/errmsgvboxcomdata.h: \
                 $(VBOX_PATH_RUNTIME_SRC)/VBox/errmsgvboxcom.xsl \
-                $(VBOX_PATH_RUNTIME_SRC)/../Main/idl/VirtualBox.xidl \
+                $(VBOX_XIDL_FILE) \
                 | $$(dir $$@)
         $(call MSG_GENERATE,,$@,$(filter %.xidl,$^))