Changeset 55789 in vbox for trunk/Config.kmk

Timestamp:

May 9, 2015 11:19:51 PM (10 years ago)

Author:

vboxsync

Message:

Resources: Some simplifications.

File:

• trunk/Config.kmk (modified) (3 diffs)

trunk/Config.kmk

@@ -2970 +2970 @@
 
 ##
-# Macro for setting DLL/SO/DYLIB version information and description.
-#
-# The macro must be invoked using evalcall2 after the whole target has
-# been declared.
+# Internal macro.
 #
 # @param 1     The target name.
 # @param 2     The description
 # @param 3     Optional icon file.
-# @param 4     Optional file name. Uses $1 + default suffix by default.
-define VBOX_SET_VER_INFO_DLL
+# @param 4     The template base name.
+# @param 5     Additional RC options.
+#
+# @remarks     ASSUMES RCFLAGS isn't a simple variable (var := value).
+define VBOX_SET_VER_INFO_INTERNAL
 ifeq ($(KBUILD_TARGET),win)
-$(1)_SOURCES.win += $(PATH_ROOT)/src/VBox/Resources/win/TemplateDll.rc
-$(1)_RCFLAGS += /nologo /dIN_FILE_BASENAME="\"$(1)\"" /dIN_FILE_DESCRIPTION="\"$(2)\"" \
-        $(if $(3), /dIN_ICON_FILE="\"$(subst \\,/,$(strip $(3)))\"") $(if $(4), /dIN_FILE_NAME="\"$(4)\"")
+$(1)_SOURCES.win += $(PATH_ROOT)/src/VBox/Resources/win/$(4)
+$(1)_RCFLAGS += /nologo /dIN_INTERNAL_NAME="\"$(1)\"" /dIN_FILE_DESCRIPTION="\"$(2)\"" \
+        /dIN_ORIGINAL_NAME="\"$$(notdir $$($(1)_1_INST_TARGET))\"" \
+        $(if $(3), /dIN_ICON_FILE="\"$(subst \\,/,$(strip $(3)))\"") $(5)
+$$$$($(1)_0_OUTDIR)/src/VBox/Resources/win/$(basename $(4)).res: \
+        $(PATH_ROOT)/include/VBox/version.h $$$$(VBOX_VERSION_HEADER)
 endif
 endef
 
 ##
-# Macro for setting EXE version information and description.
+# Macro for setting DLL/SO/DYLIB version information and description.
 #
 # The macro must be invoked using evalcall2 after the whole target has
@@ -2996 +2999 @@
 # @param 2     The description
 # @param 3     Optional icon file.
-# @param 4     Optional file name. Uses $1 + default suffix by default.
-define VBOX_SET_VER_INFO_EXE
-ifeq ($(KBUILD_TARGET),win)
-$(1)_SOURCES.win += $(PATH_ROOT)/src/VBox/Resources/win/TemplateExe.rc
-$(1)_RCFLAGS += /nologo /dIN_FILE_BASENAME="\"$(1)\"" /dIN_FILE_DESCRIPTION="\"$(2)\"" \
-        $(if $(3), /dIN_ICON_FILE="\"$(subst \\,/,$(strip $(3)))\"") $(if $(4), /dIN_FILE_NAME="\"$(4)\"")
-endif
-endef
+VBOX_SET_VER_INFO_DLL = $(evalcall2 VBOX_SET_VER_INFO_INTERNAL,$1,$2,$3,TemplateDll.rc,)
 
 ##
-# Macro for setting driver version information and description.
-#
-# The macro must be invoked using evalcall2 after the whole target has
-# been declared.
+# Macro for setting EXE version information and description.
+#
+# The macro must be invoked using call after the whole target has been declared.
 #
 # @param 1     The target name.
 # @param 2     The description
 # @param 3     Optional icon file.
-# @param 4     Optional file name. Uses $1 + default suffix by default.
-# @param 5     Optional VFT2_DRV_xxx define for windows.  Uses VFT2_UNKNOWN by default.
-define VBOX_SET_VER_INFO_DRV
-ifeq ($(KBUILD_TARGET),win)
-$(1)_SOURCES.win += $(PATH_ROOT)/src/VBox/Resources/win/TemplateDrv.rc
-$(1)_RCFLAGS += /nologo /dIN_FILE_BASENAME="\"$(1)\"" /dIN_FILE_DESCRIPTION="\"$(2)\"" \
-        $(if $(3), /dIN_ICON_FILE="\"$(subst \\,/,$(strip $(3)))\"") $(if $(4), /dIN_FILE_NAME="\"$(4)\"")
-        $(if $(5), /dIN_FILE_SUBTYPE=$(5))
-endif
-endef
+VBOX_SET_VER_INFO_EXE = $(evalcall2 VBOX_SET_VER_INFO_INTERNAL,$1,$2,$3,TemplateExe.rc,)
 
 ##
-# Macro for setting the version information and description for a ring-0 module.
-#
-# The macro must be invoked using evalcall2 after the whole target has
-# been declared.
+# Macro for setting driver version information and description.
+#
+# The macro must be invoked using call after the whole target has been declared.
 #
 # @param 1     The target name.
 # @param 2     The description
 # @param 3     Optional icon file.
-# @param 4     Optional file name. Uses $1 + default suffix by default.
-define VBOX_SET_VER_INFO_R0
-ifeq ($(KBUILD_TARGET),win)
-$(1)_SOURCES.win += $(PATH_ROOT)/src/VBox/Resources/win/TemplateR0.rc
-$(1)_RCFLAGS += /nologo /dIN_FILE_BASENAME="\"$(1)\"" /dIN_FILE_DESCRIPTION="\"$(2)\"" \
-        $(if $(3), /dIN_ICON_FILE="\"$(subst \\,/,$(strip $(3)))\"") $(if $(4), /dIN_FILE_NAME="\"$(4)\"")
-endif
-endef
+# @param 4     Optional VFT2_DRV_xxx define for windows.  Uses VFT2_UNKNOWN by default.
+VBOX_SET_VER_INFO_DRV = $(evalcall2 VBOX_SET_VER_INFO_INTERNAL,$1,$2,$3,TemplateDrv.rc,$(if $(4), /dIN_FILE_SUBTYPE=$(4)))
 
 ##
-# Macro for setting the version information and description for a raw-mode context module.
-#
-# The macro must be invoked using evalcall2 after the whole target has
-# been declared.
+# Macro for setting the version information and description for a ring-0 module.
+#
+# The macro must be invoked using call after the whole target has been declared.
 #
 # @param 1     The target name.
 # @param 2     The description
 # @param 3     Optional icon file.
-# @param 4     Optional file name. Uses $1 + default suffix by default.
-define VBOX_SET_VER_INFO_RC
-ifeq ($(KBUILD_TARGET),win)
-$(1)_SOURCES.win += $(PATH_ROOT)/src/VBox/Resources/win/TemplateR0.rc
-$(1)_RCFLAGS += /nologo /dIN_FILE_BASENAME="\"$(1)\"" /dIN_FILE_DESCRIPTION="\"$(2)\"" \
-        $(if $(3), /dIN_ICON_FILE="\"$(subst \\,/,$(strip $(3)))\"") $(if $(4), /dIN_FILE_NAME="\"$(4)\"")
-endif
-endef
+VBOX_SET_VER_INFO_R0 = $(evalcall2 VBOX_SET_VER_INFO_INTERNAL,$1,$2,$3,TemplateR0.rc,)
+
+##
+# Macro for setting the version information and description for a raw-mode context module.
+#
+# The macro must be invoked using call after the whole target has been declared.
+#
+# @param 1     The target name.
+# @param 2     The description
+# @param 3     Optional icon file.
+VBOX_SET_VER_INFO_RC = $(evalcall2 VBOX_SET_VER_INFO_INTERNAL,$1,$2,$3,TemplateRc.rc,)
 
 
@@ -4991 +4972 @@
   TEMPLATE_VBoxR3ExtPackPuel_EXTENDS = VBoxR3ExtPack
   TEMPLATE_VBoxR3ExtPackPuel_INST = $(INST_EXTPACK_PUEL)$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)/
+  TEMPLATE_VBoxR3ExtPackPuel_DEFS = $(TEMPLATE_VBoxR3ExtPack_DEFS) VBOX_IN_PUEL_EXTPACK
 
   TEMPLATE_VBoxR0ExtPackPuel = For the ring-0 context modules in the PUEL extension pack.
   TEMPLATE_VBoxR0ExtPackPuel_EXTENDS = VBoxR0ExtPack
   TEMPLATE_VBoxR0ExtPackPuel_INST = $(INST_EXTPACK_PUEL)$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)/
+  TEMPLATE_VBoxR0ExtPackPuel_DEFS = $(TEMPLATE_VBoxR0ExtPack_DEFS) VBOX_IN_PUEL_EXTPACK
 
   TEMPLATE_VBoxRcExtPackPuel = For the raw-mode context modules in the PUEL extension pack.
   TEMPLATE_VBoxRcExtPackPuel_EXTENDS = VBoxRcExtPack
   TEMPLATE_VBoxRcExtPackPuel_INST = $(INST_EXTPACK_PUEL)$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)/
+  TEMPLATE_VBoxRcExtPackPuel_DEFS = $(TEMPLATE_VBoxRcExtPack_DEFS) VBOX_IN_PUEL_EXTPACK
 
   TEMPLATE_VBoxInsExtPackPuel = For the install targets of an extension pack.