Changeset 55788 in vbox

Timestamp:

May 9, 2015 8:29:31 PM (10 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

100214

Message:

Config.kmk,VMM,VBoxSDL,Resources/win: Created resource templates for the standard windows resource files and applied them to the VMM and VBoxSDL (for testing).

Location:

trunk

Files:

• Config.kmk (modified) (3 diffs)
• src/VBox/Frontends/VBoxSDL/Makefile.kmk (modified) (2 diffs)
• src/VBox/Frontends/VBoxSDL/VBoxSDL.rc (deleted)
• src/VBox/Resources/win/TemplateDll.rc (added)
• src/VBox/Resources/win/TemplateDrv.rc (added)
• src/VBox/Resources/win/TemplateExe.rc (added)
• src/VBox/Resources/win/TemplateR0.rc (added)
• src/VBox/Resources/win/TemplateRC.rc (added)
• src/VBox/Resources/win/TemplateRsrcDefs.h (added)
• src/VBox/VMM/Makefile.kmk (modified) (4 diffs)
• src/VBox/VMM/VMMR3/VMMR3.rc (deleted)

trunk/Config.kmk

@@ -2964 +2964 @@
 VBOX_RESIGN_DLL_FN =
 
+
+#
+# File version info and description macros (ignored on most OSes).
+#
+
+##
+# Macro for setting DLL/SO/DYLIB version information and description.
+#
+# The macro must be invoked using evalcall2 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_DLL
+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)\"")
+endif
+endef
+
+##
+# Macro for setting EXE version information and description.
+#
+# The macro must be invoked using evalcall2 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_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
+
+##
+# Macro for setting driver version information and description.
+#
+# The macro must be invoked using evalcall2 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
+
+##
+# 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.
+#
+# @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
+
+##
+# 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.
+#
+# @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
+
+
+
 #
 # Adjust kBuild defaults.
@@ -3291 +3390 @@
  ifeq ($(VBOX_LDR_FMT32),pe)
   TEMPLATE_VBoxRc_TOOL               = $(VBOX_VCC_TOOL_STEM)X86
+  TEMPLATE_VBoxRc_RCDEFS             = VBOX_SVN_REV=$(VBOX_SVN_REV) VBOX_SVN_REV_MOD_5K=$(expr $(VBOX_SVN_REV) % 50000)
   ifdef TODO_MORE_WARNINGS
    TEMPLATE_VBoxRc_CXXFLAGS          = -Zi -Zl -GR- -EHs- -GF -GS- -Zc:wchar_t- -Gs8192 $(VBOX_VCC_GC_OPT) $(VBOX_VCC_GC_FP) -W4 -wd4244 -wd4996 -wd4127 -wd4100 -wd4214 -wd4706 $(VBOX_VCC_WERR)
@@ -3426 +3526 @@
 ifeq ($(VBOX_LDR_FMT),pe)
 TEMPLATE_VBoxR0_TOOL                = $(VBOX_VCC_TOOL)
+TEMPLATE_VBoxR0_RCDEFS              = VBOX_SVN_REV=$(VBOX_SVN_REV) VBOX_SVN_REV_MOD_5K=$(expr $(VBOX_SVN_REV) % 50000)
  ifdef TODO_MORE_WARNINGS
 TEMPLATE_VBoxR0_CXXFLAGS            = -Zi -Zl -GR- -EHs- -GF -GS- -Zc:wchar_t- $(VBOX_VCC_OPT) $(VBOX_VCC_FP) -W4 -wd4244 -wd4127 -wd4100 -wd4214 -wd4706 -wd4996 $(VBOX_VCC_WERR)

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

@@ -39 +39 @@
 VBoxSDLHardened_SOURCES.win = $(VBoxSDL_0_OUTDIR)/VBoxSDL-icon.rc
 VBoxSDLHardened_NAME = VBoxSDL
+$(evalcall2 VBOX_SET_VER_INFO_EXE,VBoxSDLHardened,VirtualBox Pure SDL Frontend,$(VBOX_WINDOWS_ICON_FILE)) # Version info / description.
 
 
@@ -105 +106 @@
         $(QUIET)$(VBOX_BIN2C) Ico64x01 $< $@
 
-ifeq ($(KBUILD_TARGET),win)
-VBoxSDL_SOURCES   += VBoxSDL.rc
-VBoxSDL.rc_INCS    = $(VBoxSDL_0_OUTDIR)
-VBoxSDL.rc_DEPS    = $(VBoxSDL_0_OUTDIR)/VBoxSDL-icon.rc
-VBoxSDL.rc_CLEAN   = $(VBoxSDL_0_OUTDIR)/VBoxSDL-icon.rc
-# Icon include file.
-$$(VBoxSDL_0_OUTDIR)/VBoxSDL-icon.rc: $(VBOX_WINDOWS_ICON_FILE) $$(VBoxSDL_DEFPATH)/Makefile.kmk | $$(dir $$@)
-        $(RM) -f $@
-        $(APPEND) $@ 'IDI_VIRTUALBOX ICON DISCARDABLE "$(subst /,\\,$(VBOX_WINDOWS_ICON_FILE))"'
+ifdef VBOX_WITH_HARDENING
+$(evalcall2 VBOX_SET_VER_INFO_DLL,VBoxSDL,VirtualBox Pure SDL Frontend,$(VBOX_WINDOWS_ICON_FILE)) # Version info / description.
+else
+$(evalcall2 VBOX_SET_VER_INFO_EXE,VBoxSDL,VirtualBox Pure SDL Frontend,$(VBOX_WINDOWS_ICON_FILE)) # Version info / description.
 endif
-
 
 

trunk/src/VBox/VMM/Makefile.kmk

@@ -281 +281 @@
 VBoxVMM_SOURCES.amd64 += \
         VMMSwitcher/AMD64Stub.asm
-VBoxVMM_SOURCES.win += \
-        VMMR3/VMMR3.rc
 
 VBoxVMM_LIBS = \
@@ -311 +309 @@
 # endif
 #endif
+
+$(evalcall2 VBOX_SET_VER_INFO_DLL,VBoxVMM,VirtualBox VMM) # Version info / description.
 
 
@@ -518 +518 @@
 
  VMMRC/VMMRCDeps.cpp_CXXFLAGS.win = -Oi- -TC ## @todo rename VMMRCDeps.cpp to .c
+
+ $(evalcall2 VBOX_SET_VER_INFO_RC,VMMRC,VirtualBox VMM - raw-mode context parts) # Version info / description.
 endif # VBOX_WITH_RAW_MODE && !VBOX_ONLY_EXTPACKS
 
@@ -641 +643 @@
         $(PATH_STAGE_LIB)/SUPR0$(VBOX_SUFF_LIB)
  endif
+
+ $(evalcall2 VBOX_SET_VER_INFO_R0,VMMR0,VirtualBox VMM - ring-0 context parts) # Version info / description.
 endif # !VBOX_ONLY_EXTPACKS