Changeset 49803 in vbox for trunk/src

Timestamp:

Dec 6, 2013 1:03:32 AM (11 years ago)

Author:

vboxsync

Message:

Main: tstCollector need to require the wrapper generated header files to exist in order to avoid it being built before they are generated. This necessitated some changes that lead to some more VBoxApiWrap related cleanups.

Location:

trunk/src/VBox/Main

Files:

• Config.kmk (modified) (1 diff)
• Makefile.kmk (modified) (9 diffs)
• testcase/Makefile.kmk (modified) (1 diff)

trunk/src/VBox/Main/Config.kmk

@@ -27 +27 @@
 # Globals.
 #
-VBOX_MAIN_APIWRAPPER_INCS := $(call TARGET_PATH,VBoxAPIWrap)
+VBOX_MAIN_APIWRAPPER_DIR  := $(abspath $(call TARGET_PATH,VBoxAPIWrap))
+VBOX_MAIN_APIWRAPPER_INCS := $(VBOX_MAIN_APIWRAPPER_DIR)
 

trunk/src/VBox/Main/Makefile.kmk

@@ -174 +174 @@
 LIBRARIES += VBoxAPIWrap
 VBoxAPIWrap_TEMPLATE        = VBoxMainLib
-VBoxAPIWrap_SOURCES         = $(VBoxAPIWrap_VBOX_GENERATEDCPP)
-VBoxAPIWrap_VBOX_GENERATEDCPP = $(filter %.cpp,$(VBoxAPIWrap_VBOX_GENERATEDSOURCES))
-VBoxAPIWrap_VBOX_GENERATEDSOURCES = $(addprefix $(VBoxAPIWrap_0_OUTDIR)/,$(VBoxAPIWrap_VBOX_APIWRAPPERFILES))
+VBoxAPIWrap_SOURCES         = $(filter %.cpp,$(VBOX_MAIN_APIWRAPPER_GEN_FILES))
 VBoxAPIWrap_VBOX_RAWSRC     = \
         $(VBoxAPIWrap_0_OUTDIR)/apiwrappers
@@ -189 +187 @@
         $(wildcard $(VBoxAPIWrap_0_OUTDIR)/*.h) \
         $(VBoxAPIWrap_VBOX_RAWSRC)
+
+# This include file (generated at the bottom of this file), defines
+# VBOX_MAIN_APIWRAPPER_GEN_FILES and VBOX_MAIN_APIWRAPPER_GEN_HDRS.
 VBoxAPIWrap_VBOX_KMK_FILE   = $(PATH_OUT)/vboxapiwrap.kmk
 include $(VBoxAPIWrap_VBOX_KMK_FILE)
@@ -292 +293 @@
 VBoxSVC_CXXFLAGS = $(filter-out -Wno-unused,$(TEMPLATE_VBOXMAINEXE_CXXFLAGS))
 
-VBoxSVC_DEPS = $(filter %.h,$(VBoxAPIWrap_VBOX_GENERATEDSOURCES))
-
 VBoxSVC_INCS = \
         include \
@@ -322 +321 @@
         $(VBOX_MAIN_PREREQS) \
         $(VBOX_XML_SCHEMADEFS_H) \
-        $(VBOX_AUTOGEN_EVENT_H)
+        $(VBOX_AUTOGEN_EVENT_H) \
+        $(VBOX_MAIN_APIWRAPPER_GEN_HDRS)
 
 VBoxSVC_SOURCES = \
@@ -620 +620 @@
 endif
 
-VBoxC_DEPS = $(filter %.h,$(VBoxAPIWrap_VBOX_GENERATEDSOURCES))
-
 VBoxC_INCS          = \
         include \
@@ -659 +657 @@
         $(VBOX_MAIN_PREREQS) \
         $(VBOX_XML_SCHEMADEFS_H) \
-        $(VBOX_AUTOGEN_EVENT_H)
+        $(VBOX_AUTOGEN_EVENT_H) \
+        $(VBOX_MAIN_APIWRAPPER_GEN_HDRS)
 
 VBoxC_SOURCES = \
@@ -1054 +1053 @@
 # Moved those rules to the end so that VBoxAPIWrap_0_OUTDIR can be expanded without $$ trickery.
 $(VBoxAPIWrap_VBOX_RAWSRC) \
-+| $(VBoxAPIWrap_VBOX_GENERATEDSOURCES): \
++| $(VBOX_MAIN_APIWRAPPER_GEN_FILES): \
                 $(VBOX_XIDL_FILE) \
                 $(VBoxAPIWrap_XSLT) \
@@ -1060 +1059 @@
                 | $$(dir $$@)
         $(call MSG_L1,Generating C++ Server API wrapper files from XIDL)
-        $(QUIET)$(RM) -f $(filter-out $(VBoxAPIWrap_VBOX_GENERATEDSOURCES),$(wildcard $(VBoxAPIWrap_0_OUTDIR)/*.cpp) $(wildcard $(VBoxAPIWrap_0_OUTDIR)/*.h))
+        $(QUIET)$(RM) -f $(filter-out $(VBOX_MAIN_APIWRAPPER_GEN_FILES),$(wildcard $(VBoxAPIWrap_0_OUTDIR)/*.cpp) $(wildcard $(VBoxAPIWrap_0_OUTDIR)/*.h))
         $(QUIET)$(VBOX_XSLTPROC) --stringparam filelistonly "" -o $@ $(VBoxAPIWrap_XSLT) $<
         $(QUIET)$(VBOX_FILESPLIT) $@ $(VBoxAPIWrap_0_OUTDIR)
@@ -1068 +1067 @@
         $(QUIET)$(RM) -f $@
         $(QUIET)$(MKDIR) -p $(@D)
-        $(QUIET)$(VBOX_XSLTPROC) --stringparam filelistonly VBoxAPIWrap_VBOX_APIWRAPPERFILES -o $@ $(VBoxAPIWrap_XSLT) $<
+        $(QUIET)$(VBOX_XSLTPROC) --stringparam filelistonly VBOX_MAIN_APIWRAPPER_GEN_FILES -o $@ $(VBoxAPIWrap_XSLT) $<
+        $(QUIET)$(APPEND) -n "$@" "" "" \
+                'VBOX_MAIN_APIWRAPPER_GEN_FILES := $$(addprefix $$(VBOX_MAIN_APIWRAPPER_DIR)/,$$(VBOX_MAIN_APIWRAPPER_GEN_FILES))' \
+                'VBOX_MAIN_APIWRAPPER_GEN_HDRS = $$(filter %.h,$$(VBOX_MAIN_APIWRAPPER_GEN_FILES))'
         $(QUIET)$(CP) --changed -fv $@ $(VBoxAPIWrap_VBOX_KMK_FILE)
 

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

@@ -110 +110 @@
 # tstCollector
 #
+# Note! VBOX_MAIN_APIWRAPPER_GEN_HDRS is only defined if kmk is executed a
+#       parent directory.  Since the rules for generating the files listed by
+#       the variable lives in the parent makefile, this is not a problem.
+#
 tstCollector_TEMPLATE = VBOXMAINCLIENTTSTEXE
 tstCollector_SOURCES  = \
         tstCollector.cpp \
         ../src-server/Performance.cpp
-tstCollector_INCS     = ../include $(VBOX_MAIN_APIWRAPPER_INCS)
-tstCollector_DEFS    += VBOX_COLLECTOR_TEST_CASE
-tstCollector_LDFLAGS.darwin  += -lproc
-tstCollector_LDFLAGS.solaris += -lkstat -lnvpair
-tstCollector_LDFLAGS.win     += psapi.lib powrprof.lib
+tstCollector_INCS            = \
+        ../include \
+        $(VBOX_MAIN_APIWRAPPER_INCS)
+tstCollector_INTERMEDIATES   = $(VBOX_MAIN_APIWRAPPER_GEN_HDRS)
+tstCollector_DEFS            = VBOX_COLLECTOR_TEST_CASE
+tstCollector_LDFLAGS.darwin  = -lproc
+tstCollector_LDFLAGS.solaris = -lkstat -lnvpair
+tstCollector_LDFLAGS.win     = psapi.lib powrprof.lib