VirtualBox

Changeset 55789 in vbox


Ignore:
Timestamp:
May 9, 2015 11:19:51 PM (10 years ago)
Author:
vboxsync
Message:

Resources: Some simplifications.

Location:
trunk
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • trunk/Config.kmk

    r55788 r55789  
    29702970
    29712971##
    2972 # Macro for setting DLL/SO/DYLIB version information and description.
    2973 #
    2974 # The macro must be invoked using evalcall2 after the whole target has
    2975 # been declared.
     2972# Internal macro.
    29762973#
    29772974# @param 1     The target name.
    29782975# @param 2     The description
    29792976# @param 3     Optional icon file.
    2980 # @param 4     Optional file name. Uses $1 + default suffix by default.
    2981 define VBOX_SET_VER_INFO_DLL
     2977# @param 4     The template base name.
     2978# @param 5     Additional RC options.
     2979#
     2980# @remarks     ASSUMES RCFLAGS isn't a simple variable (var := value).
     2981define VBOX_SET_VER_INFO_INTERNAL
    29822982ifeq ($(KBUILD_TARGET),win)
    2983 $(1)_SOURCES.win += $(PATH_ROOT)/src/VBox/Resources/win/TemplateDll.rc
    2984 $(1)_RCFLAGS += /nologo /dIN_FILE_BASENAME="\"$(1)\"" /dIN_FILE_DESCRIPTION="\"$(2)\"" \
    2985         $(if $(3), /dIN_ICON_FILE="\"$(subst \\,/,$(strip $(3)))\"") $(if $(4), /dIN_FILE_NAME="\"$(4)\"")
     2983$(1)_SOURCES.win += $(PATH_ROOT)/src/VBox/Resources/win/$(4)
     2984$(1)_RCFLAGS += /nologo /dIN_INTERNAL_NAME="\"$(1)\"" /dIN_FILE_DESCRIPTION="\"$(2)\"" \
     2985        /dIN_ORIGINAL_NAME="\"$$(notdir $$($(1)_1_INST_TARGET))\"" \
     2986        $(if $(3), /dIN_ICON_FILE="\"$(subst \\,/,$(strip $(3)))\"") $(5)
     2987$$$$($(1)_0_OUTDIR)/src/VBox/Resources/win/$(basename $(4)).res: \
     2988        $(PATH_ROOT)/include/VBox/version.h $$$$(VBOX_VERSION_HEADER)
    29862989endif
    29872990endef
    29882991
    29892992##
    2990 # Macro for setting EXE version information and description.
     2993# Macro for setting DLL/SO/DYLIB version information and description.
    29912994#
    29922995# The macro must be invoked using evalcall2 after the whole target has
    … …  
    29962999# @param 2     The description
    29973000# @param 3     Optional icon file.
    2998 # @param 4     Optional file name. Uses $1 + default suffix by default.
    2999 define VBOX_SET_VER_INFO_EXE
    3000 ifeq ($(KBUILD_TARGET),win)
    3001 $(1)_SOURCES.win += $(PATH_ROOT)/src/VBox/Resources/win/TemplateExe.rc
    3002 $(1)_RCFLAGS += /nologo /dIN_FILE_BASENAME="\"$(1)\"" /dIN_FILE_DESCRIPTION="\"$(2)\"" \
    3003         $(if $(3), /dIN_ICON_FILE="\"$(subst \\,/,$(strip $(3)))\"") $(if $(4), /dIN_FILE_NAME="\"$(4)\"")
    3004 endif
    3005 endef
     3001VBOX_SET_VER_INFO_DLL = $(evalcall2 VBOX_SET_VER_INFO_INTERNAL,$1,$2,$3,TemplateDll.rc,)
    30063002
    30073003##
    3008 # Macro for setting driver version information and description.
    3009 #
    3010 # The macro must be invoked using evalcall2 after the whole target has
    3011 # been declared.
     3004# Macro for setting EXE version information and description.
     3005#
     3006# The macro must be invoked using call after the whole target has been declared.
    30123007#
    30133008# @param 1     The target name.
    30143009# @param 2     The description
    30153010# @param 3     Optional icon file.
    3016 # @param 4     Optional file name. Uses $1 + default suffix by default.
    3017 # @param 5     Optional VFT2_DRV_xxx define for windows.  Uses VFT2_UNKNOWN by default.
    3018 define VBOX_SET_VER_INFO_DRV
    3019 ifeq ($(KBUILD_TARGET),win)
    3020 $(1)_SOURCES.win += $(PATH_ROOT)/src/VBox/Resources/win/TemplateDrv.rc
    3021 $(1)_RCFLAGS += /nologo /dIN_FILE_BASENAME="\"$(1)\"" /dIN_FILE_DESCRIPTION="\"$(2)\"" \
    3022         $(if $(3), /dIN_ICON_FILE="\"$(subst \\,/,$(strip $(3)))\"") $(if $(4), /dIN_FILE_NAME="\"$(4)\"")
    3023         $(if $(5), /dIN_FILE_SUBTYPE=$(5))
    3024 endif
    3025 endef
     3011VBOX_SET_VER_INFO_EXE = $(evalcall2 VBOX_SET_VER_INFO_INTERNAL,$1,$2,$3,TemplateExe.rc,)
    30263012
    30273013##
    3028 # Macro for setting the version information and description for a ring-0 module.
    3029 #
    3030 # The macro must be invoked using evalcall2 after the whole target has
    3031 # been declared.
     3014# Macro for setting driver version information and description.
     3015#
     3016# The macro must be invoked using call after the whole target has been declared.
    30323017#
    30333018# @param 1     The target name.
    30343019# @param 2     The description
    30353020# @param 3     Optional icon file.
    3036 # @param 4     Optional file name. Uses $1 + default suffix by default.
    3037 define VBOX_SET_VER_INFO_R0
    3038 ifeq ($(KBUILD_TARGET),win)
    3039 $(1)_SOURCES.win += $(PATH_ROOT)/src/VBox/Resources/win/TemplateR0.rc
    3040 $(1)_RCFLAGS += /nologo /dIN_FILE_BASENAME="\"$(1)\"" /dIN_FILE_DESCRIPTION="\"$(2)\"" \
    3041         $(if $(3), /dIN_ICON_FILE="\"$(subst \\,/,$(strip $(3)))\"") $(if $(4), /dIN_FILE_NAME="\"$(4)\"")
    3042 endif
    3043 endef
     3021# @param 4     Optional VFT2_DRV_xxx define for windows.  Uses VFT2_UNKNOWN by default.
     3022VBOX_SET_VER_INFO_DRV = $(evalcall2 VBOX_SET_VER_INFO_INTERNAL,$1,$2,$3,TemplateDrv.rc,$(if $(4), /dIN_FILE_SUBTYPE=$(4)))
    30443023
    30453024##
    3046 # Macro for setting the version information and description for a raw-mode context module.
    3047 #
    3048 # The macro must be invoked using evalcall2 after the whole target has
    3049 # been declared.
     3025# Macro for setting the version information and description for a ring-0 module.
     3026#
     3027# The macro must be invoked using call after the whole target has been declared.
    30503028#
    30513029# @param 1     The target name.
    30523030# @param 2     The description
    30533031# @param 3     Optional icon file.
    3054 # @param 4     Optional file name. Uses $1 + default suffix by default.
    3055 define VBOX_SET_VER_INFO_RC
    3056 ifeq ($(KBUILD_TARGET),win)
    3057 $(1)_SOURCES.win += $(PATH_ROOT)/src/VBox/Resources/win/TemplateR0.rc
    3058 $(1)_RCFLAGS += /nologo /dIN_FILE_BASENAME="\"$(1)\"" /dIN_FILE_DESCRIPTION="\"$(2)\"" \
    3059         $(if $(3), /dIN_ICON_FILE="\"$(subst \\,/,$(strip $(3)))\"") $(if $(4), /dIN_FILE_NAME="\"$(4)\"")
    3060 endif
    3061 endef
     3032VBOX_SET_VER_INFO_R0 = $(evalcall2 VBOX_SET_VER_INFO_INTERNAL,$1,$2,$3,TemplateR0.rc,)
     3033
     3034##
     3035# Macro for setting the version information and description for a raw-mode context module.
     3036#
     3037# The macro must be invoked using call after the whole target has been declared.
     3038#
     3039# @param 1     The target name.
     3040# @param 2     The description
     3041# @param 3     Optional icon file.
     3042VBOX_SET_VER_INFO_RC = $(evalcall2 VBOX_SET_VER_INFO_INTERNAL,$1,$2,$3,TemplateRc.rc,)
    30623043
    30633044
    … …  
    49914972  TEMPLATE_VBoxR3ExtPackPuel_EXTENDS = VBoxR3ExtPack
    49924973  TEMPLATE_VBoxR3ExtPackPuel_INST = $(INST_EXTPACK_PUEL)$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)/
     4974  TEMPLATE_VBoxR3ExtPackPuel_DEFS = $(TEMPLATE_VBoxR3ExtPack_DEFS) VBOX_IN_PUEL_EXTPACK
    49934975
    49944976  TEMPLATE_VBoxR0ExtPackPuel = For the ring-0 context modules in the PUEL extension pack.
    49954977  TEMPLATE_VBoxR0ExtPackPuel_EXTENDS = VBoxR0ExtPack
    49964978  TEMPLATE_VBoxR0ExtPackPuel_INST = $(INST_EXTPACK_PUEL)$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)/
     4979  TEMPLATE_VBoxR0ExtPackPuel_DEFS = $(TEMPLATE_VBoxR0ExtPack_DEFS) VBOX_IN_PUEL_EXTPACK
    49974980
    49984981  TEMPLATE_VBoxRcExtPackPuel = For the raw-mode context modules in the PUEL extension pack.
    49994982  TEMPLATE_VBoxRcExtPackPuel_EXTENDS = VBoxRcExtPack
    50004983  TEMPLATE_VBoxRcExtPackPuel_INST = $(INST_EXTPACK_PUEL)$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)/
     4984  TEMPLATE_VBoxRcExtPackPuel_DEFS = $(TEMPLATE_VBoxRcExtPack_DEFS) VBOX_IN_PUEL_EXTPACK
    50014985
    50024986  TEMPLATE_VBoxInsExtPackPuel = For the install targets of an extension pack.

  • trunk/include/VBox/version.h

    r55785 r55789  
    100100#define VBOX_RC_COMPANY_NAME            VBOX_VENDOR
    101101#define VBOX_RC_LEGAL_COPYRIGHT         "Copyright (C) 2009-" VBOX_C_YEAR " Oracle Corporation\0"
    102 #define VBOX_RC_PRODUCT_NAME_STR        VBOX_PRODUCT "\0"
    103 #define VBOX_RC_PRODUCT_NAME_GA_STR     VBOX_PRODUCT " Guest Additions\0"
     102#define VBOX_RC_PRODUCT_NAME                    VBOX_PRODUCT
     103#define VBOX_RC_PRODUCT_NAME_GA                 VBOX_PRODUCT " Guest Additions"
     104#define VBOX_RC_PRODUCT_NAME_PUEL_EXTPACK       VBOX_PRODUCT " Extension Pack"
     105#define VBOX_RC_PRODUCT_NAME_STR                VBOX_RC_PRODUCT_NAME "\0"
     106#define VBOX_RC_PRODUCT_NAME_GA_STR             VBOX_RC_PRODUCT_NAME_GA "\0"
     107#define VBOX_RC_PRODUCT_NAME_PUEL_EXTPACK_STR   VBOX_RC_PRODUCT_NAME_PUEL_EXTPACK "\0"
    104108#define VBOX_RC_PRODUCT_VERSION         VBOX_VERSION_MAJOR , VBOX_VERSION_MINOR , VBOX_VERSION_BUILD , VBOX_SVN_REV_MOD_5K
    105109#define VBOX_RC_FILE_VERSION            VBOX_VERSION_MAJOR , VBOX_VERSION_MINOR , VBOX_VERSION_BUILD , VBOX_SVN_REV_MOD_5K
    … …  
    116120#define VBOX_RC_TYPE_DRV                VFT_DRV
    117121/* Flags and extra strings depending on the build type and who's building. */
    118 #if defined(DEBUG) || defined(VBOX_WITH_STATISTICS) || defined(LOG_ENABLED)
     122#if defined(DEBUG) || defined(LOG_ENABLED) || defined(RT_STRICT) || defined(VBOX_STRICT) || defined(VBOX_WITH_STATISTICS)
    119123# define VBOX_RC_FILE_FLAGS_DEBUG       VS_FF_DEBUG
    120124#else

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

    r55788 r55789  
    2020if !defined(VBOX_WITH_HARDENING) || "$(KBUILD_TARGET)" != "darwin" # No hardened VBoxSDL on darwin.
    2121
    22 #
    23 # Targets.
    24 #
     22
    2523ifdef VBOX_WITH_HARDENING
     24 #
     25 # Hardened VBoxSDL
     26 #
    2627 PROGRAMS += VBoxSDLHardened
    27  DLLS += VBoxSDL
    28 else
    29  PROGRAMS += VBoxSDL
     28 VBoxSDLHardened_TEMPLATE = VBOXR3HARDENEDEXE
     29 VBoxSDLHardened_SOURCES = VBoxSDLHardened.cpp
     30 VBoxSDLHardened_NAME = VBoxSDL
     31 $(call VBOX_SET_VER_INFO_EXE,VBoxSDLHardened,VirtualBox Pure SDL Frontend,$(VBOX_WINDOWS_ICON_FILE)) # Version info / description.
    3032endif
    31 PROGRAMS += tstSDL
    32 
    33 
    34 #
    35 # Hardened VBoxSDL
    36 #
    37 VBoxSDLHardened_TEMPLATE = VBOXR3HARDENEDEXE
    38 VBoxSDLHardened_SOURCES = VBoxSDLHardened.cpp
    39 VBoxSDLHardened_SOURCES.win = $(VBoxSDL_0_OUTDIR)/VBoxSDL-icon.rc
    40 VBoxSDLHardened_NAME = VBoxSDL
    41 $(evalcall2 VBOX_SET_VER_INFO_EXE,VBoxSDLHardened,VirtualBox Pure SDL Frontend,$(VBOX_WINDOWS_ICON_FILE)) # Version info / description.
    4233
    4334
    … …  
    4536# VBoxSDL
    4637#
     38ifdef VBOX_WITH_HARDENING
     39 DLLS += VBoxSDL
     40else
     41 PROGRAMS += VBoxSDL
     42endif
    4743VBoxSDL_TEMPLATE  := $(if $(VBOX_WITH_HARDENING),VBOXMAINCLIENTDLL,VBOXMAINCLIENTEXE)
    4844VBoxSDL_SDKS       = LIBSDL
    … …  
    107103
    108104ifdef VBOX_WITH_HARDENING
    109 $(evalcall2 VBOX_SET_VER_INFO_DLL,VBoxSDL,VirtualBox Pure SDL Frontend,$(VBOX_WINDOWS_ICON_FILE)) # Version info / description.
     105$(call VBOX_SET_VER_INFO_DLL,VBoxSDL,VirtualBox Pure SDL Frontend,$(VBOX_WINDOWS_ICON_FILE)) # Version info / description.
    110106else
    111 $(evalcall2 VBOX_SET_VER_INFO_EXE,VBoxSDL,VirtualBox Pure SDL Frontend,$(VBOX_WINDOWS_ICON_FILE)) # Version info / description.
     107$(call VBOX_SET_VER_INFO_EXE,VBoxSDL,VirtualBox Pure SDL Frontend,$(VBOX_WINDOWS_ICON_FILE)) # Version info / description.
    112108endif
    113109
    … …  
    116112# tstSDL
    117113#
     114PROGRAMS += tstSDL
    118115tstSDL_TEMPLATE = VBOXR3NPEXE
    119116tstSDL_SDKS = LIBSDL

  • trunk/src/VBox/Resources/win/TemplateDll.rc

    r55788 r55789  
    3030*******************************************************************************/
    3131/* Validate input and deal with optional input. */
     32/** @def IN_FILE_DESCRIPTION
     33 * The file description string.
     34 */
    3235#ifndef IN_FILE_DESCRIPTION
    3336# error "Must define the IN_FILE_DESCRIPTION string!"
    3437#endif
    35 #ifndef IN_FILE_BASENAME
    36 # error "Must define the IN_FILE_BASENAME string!"
     38/** @def IN_INTERNAL_NAME
     39 * The internal name string, optional (requires IN_FILE_BASENAME then).
     40 */
     41#ifndef IN_INTERNAL_NAME
     42# ifndef IN_FILE_BASENAME
     43#  error "Must define the IN_FILE_BASENAME or the IN_INTERNAL_NAME string!"
     44# endif
     45# define IN_INTERNAL_NAME IN_FILE_BASENAME
    3746#endif
    38 #ifndef IN_FILE_NAME /* optional */
    39 # define IN_FILE_NAME IN_FILE_BASENAME ".dll"
     47/** @def IN_ORIGINAL_NAME
     48 * The original name string, optional (requires IN_FILE_BASENAME then).
     49 */
     50#ifndef IN_ORIGINAL_NAME
     51# ifndef IN_FILE_BASENAME
     52#  error "Must define the IN_FILE_BASENAME or the IN_ORIGINAL_NAME string!"
     53# endif
     54# define IN_ORIGINAL_NAME IN_FILE_BASENAME " .dll"
     55#endif
     56/** @def IN_PRODUCT_NAME
     57 * The product name string, optional.
     58 */
     59#ifndef IN_PRODUCT_NAME
     60# ifdef IN_GUEST
     61#  define IN_PRODUCT_NAME VBOX_RC_PRODUCT_NAME_GA
     62# elif defined(VBOX_IN_PUEL_EXTPACK)
     63#  define IN_PRODUCT_NAME VBOX_RC_PRODUCT_NAME_PUEL_EXTPACK
     64# else
     65#  define IN_PRODUCT_NAME VBOX_RC_PRODUCT_NAME
     66# endif
    4067#endif
    4168
    … …  
    6794        BLOCK "040904b0" /* Lang=US English, CodePage=utf-16 */
    6895        BEGIN
    69             VALUE "FileDescription",  IN_FILE_DESCRIPTION
    70             VALUE "InternalName",     IN_FILE_BASENAME "\0"
    71             VALUE "OriginalFilename", IN_FILE_NAME "\0"
    72             VALUE "CompanyName",      VBOX_RC_COMPANY_NAME
     96            VALUE "FileDescription",  IN_FILE_DESCRIPTION "\0"
     97            VALUE "InternalName",     IN_INTERNAL_NAME "\0"
     98            VALUE "OriginalFilename", IN_ORIGINAL_NAME "\0"
     99            VALUE "CompanyName",      VBOX_RC_COMPANY_NAME "\0"
    73100            VALUE "FileVersion",      VBOX_RC_FILE_VERSION_STR
    74101            VALUE "LegalCopyright",   VBOX_RC_LEGAL_COPYRIGHT
    75 #ifndef IN_GUEST
    76             VALUE "ProductName",      VBOX_RC_PRODUCT_NAME_STR
    77 #else
    78             VALUE "ProductName",      VBOX_RC_PRODUCT_NAME_GA_STR
    79 #endif
     102            VALUE "ProductName",      IN_PRODUCT_NAME
    80103            VALUE "ProductVersion",   VBOX_RC_PRODUCT_VERSION_STR
    81104            VBOX_RC_MORE_STRINGS

  • trunk/src/VBox/Resources/win/TemplateDrv.rc

    r55788 r55789  
    3030*******************************************************************************/
    3131/* Validate input and deal with optional input. */
     32/** @def IN_FILE_DESCRIPTION
     33 * The file description string.
     34 */
    3235#ifndef IN_FILE_DESCRIPTION
    3336# error "Must define the IN_FILE_DESCRIPTION string!"
    3437#endif
    35 #ifndef IN_FILE_BASENAME
    36 # error "Must define the IN_FILE_BASENAME string!"
     38/** @def IN_INTERNAL_NAME
     39 * The internal name string, optional (requires IN_FILE_BASENAME then).
     40 */
     41#ifndef IN_INTERNAL_NAME
     42# ifndef IN_FILE_BASENAME
     43#  error "Must define the IN_FILE_BASENAME or the IN_INTERNAL_NAME string!"
     44# endif
     45# define IN_INTERNAL_NAME IN_FILE_BASENAME
    3746#endif
    38 #ifndef IN_FILE_NAME /* optional */
    39 # define IN_FILE_NAME IN_FILE_BASENAME ".sys"
     47/** @def IN_ORIGINAL_NAME
     48 * The original name string, optional (requires IN_FILE_BASENAME then).
     49 */
     50#ifndef IN_ORIGINAL_NAME
     51# ifndef IN_FILE_BASENAME
     52#  error "Must define the IN_FILE_BASENAME or the IN_ORIGINAL_NAME string!"
     53# endif
     54# define IN_ORIGINAL_NAME IN_FILE_BASENAME " .dll"
     55#endif
     56/** @def IN_PRODUCT_NAME
     57 * The product name string, optional.
     58 */
     59#ifndef IN_PRODUCT_NAME
     60# ifdef IN_GUEST
     61#  define IN_PRODUCT_NAME VBOX_RC_PRODUCT_NAME_GA
     62# elif defined(VBOX_IN_PUEL_EXTPACK)
     63#  define IN_PRODUCT_NAME VBOX_RC_PRODUCT_NAME_PUEL_EXTPACK
     64# else
     65#  define IN_PRODUCT_NAME VBOX_RC_PRODUCT_NAME
     66# endif
    4067#endif
    4168#ifndef IN_FILE_SUBTYPE /* optional */
    … …  
    7097        BLOCK "040904b0" /* Lang=US English, CodePage=utf-16 */
    7198        BEGIN
    72             VALUE "FileDescription",  IN_FILE_DESCRIPTION
    73             VALUE "InternalName",     IN_FILE_BASENAME "\0"
    74             VALUE "OriginalFilename", IN_FILE_NAME "\0"
    75             VALUE "CompanyName",      VBOX_RC_COMPANY_NAME
     99            VALUE "FileDescription",  IN_FILE_DESCRIPTION "\0"
     100            VALUE "InternalName",     IN_INTERNAL_NAME "\0"
     101            VALUE "OriginalFilename", IN_ORIGINAL_NAME "\0"
     102            VALUE "CompanyName",      VBOX_RC_COMPANY_NAME "\0"
    76103            VALUE "FileVersion",      VBOX_RC_FILE_VERSION_STR
    77104            VALUE "LegalCopyright",   VBOX_RC_LEGAL_COPYRIGHT
    78 #ifndef IN_GUEST
    79             VALUE "ProductName",      VBOX_RC_PRODUCT_NAME_STR
    80 #else
    81             VALUE "ProductName",      VBOX_RC_PRODUCT_NAME_GA_STR
    82 #endif
     105            VALUE "ProductName",      IN_PRODUCT_NAME
    83106            VALUE "ProductVersion",   VBOX_RC_PRODUCT_VERSION_STR
    84107            VBOX_RC_MORE_STRINGS

  • trunk/src/VBox/Resources/win/TemplateExe.rc

    r55788 r55789  
    3030*******************************************************************************/
    3131/* Validate input and deal with optional input. */
     32/** @def IN_FILE_DESCRIPTION
     33 * The file description string.
     34 */
    3235#ifndef IN_FILE_DESCRIPTION
    3336# error "Must define the IN_FILE_DESCRIPTION string!"
    3437#endif
    35 #ifndef IN_FILE_BASENAME
    36 # error "Must define the IN_FILE_BASENAME string!"
     38/** @def IN_INTERNAL_NAME
     39 * The internal name string, optional (requires IN_FILE_BASENAME then).
     40 */
     41#ifndef IN_INTERNAL_NAME
     42# ifndef IN_FILE_BASENAME
     43#  error "Must define the IN_FILE_BASENAME or the IN_INTERNAL_NAME string!"
     44# endif
     45# define IN_INTERNAL_NAME IN_FILE_BASENAME
    3746#endif
    38 #ifndef IN_FILE_NAME /* optional */
    39 # define IN_FILE_NAME IN_FILE_BASENAME ".exe"
     47/** @def IN_ORIGINAL_NAME
     48 * The original name string, optional (requires IN_FILE_BASENAME then).
     49 */
     50#ifndef IN_ORIGINAL_NAME
     51# ifndef IN_FILE_BASENAME
     52#  error "Must define the IN_FILE_BASENAME or the IN_ORIGINAL_NAME string!"
     53# endif
     54# define IN_ORIGINAL_NAME IN_FILE_BASENAME " .dll"
     55#endif
     56/** @def IN_PRODUCT_NAME
     57 * The product name string, optional.
     58 */
     59#ifndef IN_PRODUCT_NAME
     60# ifdef IN_GUEST
     61#  define IN_PRODUCT_NAME VBOX_RC_PRODUCT_NAME_GA
     62# elif defined(VBOX_IN_PUEL_EXTPACK)
     63#  define IN_PRODUCT_NAME VBOX_RC_PRODUCT_NAME_PUEL_EXTPACK
     64# else
     65#  define IN_PRODUCT_NAME VBOX_RC_PRODUCT_NAME
     66# endif
    4067#endif
    4168
    … …  
    6794        BLOCK "040904b0" /* Lang=US English, CodePage=utf-16 */
    6895        BEGIN
    69             VALUE "FileDescription",  IN_FILE_DESCRIPTION
    70             VALUE "InternalName",     IN_FILE_BASENAME "\0"
    71             VALUE "OriginalFilename", IN_FILE_NAME "\0"
    72             VALUE "CompanyName",      VBOX_RC_COMPANY_NAME
     96            VALUE "FileDescription",  IN_FILE_DESCRIPTION "\0"
     97            VALUE "InternalName",     IN_INTERNAL_NAME "\0"
     98            VALUE "OriginalFilename", IN_ORIGINAL_NAME "\0"
     99            VALUE "CompanyName",      VBOX_RC_COMPANY_NAME "\0"
    73100            VALUE "FileVersion",      VBOX_RC_FILE_VERSION_STR
    74101            VALUE "LegalCopyright",   VBOX_RC_LEGAL_COPYRIGHT
    75 #ifndef IN_GUEST
    76             VALUE "ProductName",      VBOX_RC_PRODUCT_NAME_STR
    77 #else
    78             VALUE "ProductName",      VBOX_RC_PRODUCT_NAME_GA_STR
    79 #endif
     102            VALUE "ProductName",      IN_PRODUCT_NAME
    80103            VALUE "ProductVersion",   VBOX_RC_PRODUCT_VERSION_STR
    81104            VBOX_RC_MORE_STRINGS

  • trunk/src/VBox/Resources/win/TemplateR0.rc

    r55788 r55789  
    3030*******************************************************************************/
    3131/* Validate input and deal with optional input. */
     32/** @def IN_FILE_DESCRIPTION
     33 * The file description string.
     34 */
    3235#ifndef IN_FILE_DESCRIPTION
    3336# error "Must define the IN_FILE_DESCRIPTION string!"
    3437#endif
    35 #ifndef IN_FILE_BASENAME
    36 # error "Must define the IN_FILE_BASENAME string!"
     38/** @def IN_INTERNAL_NAME
     39 * The internal name string, optional (requires IN_FILE_BASENAME then).
     40 */
     41#ifndef IN_INTERNAL_NAME
     42# ifndef IN_FILE_BASENAME
     43#  error "Must define the IN_FILE_BASENAME or the IN_INTERNAL_NAME string!"
     44# endif
     45# define IN_INTERNAL_NAME IN_FILE_BASENAME
    3746#endif
    38 #ifndef IN_FILE_NAME /* optional */
    39 # define IN_FILE_NAME IN_FILE_BASENAME ".r0"
     47/** @def IN_ORIGINAL_NAME
     48 * The original name string, optional (requires IN_FILE_BASENAME then).
     49 */
     50#ifndef IN_ORIGINAL_NAME
     51# ifndef IN_FILE_BASENAME
     52#  error "Must define the IN_FILE_BASENAME or the IN_ORIGINAL_NAME string!"
     53# endif
     54# define IN_ORIGINAL_NAME IN_FILE_BASENAME " .dll"
     55#endif
     56/** @def IN_PRODUCT_NAME
     57 * The product name string, optional.
     58 */
     59#ifndef IN_PRODUCT_NAME
     60# ifdef VBOX_IN_PUEL_EXTPACK
     61#  define IN_PRODUCT_NAME VBOX_RC_PRODUCT_NAME_PUEL_EXTPACK
     62# else
     63#  define IN_PRODUCT_NAME VBOX_RC_PRODUCT_NAME
     64# endif
    4065#endif
    4166#ifdef IN_GUEST
    … …  
    7095        BLOCK "040904b0" /* Lang=US English, CodePage=utf-16 */
    7196        BEGIN
    72             VALUE "FileDescription",  IN_FILE_DESCRIPTION
    73             VALUE "InternalName",     IN_FILE_BASENAME "\0"
    74             VALUE "OriginalFilename", IN_FILE_NAME "\0"
    75             VALUE "CompanyName",      VBOX_RC_COMPANY_NAME
     97            VALUE "FileDescription",  IN_FILE_DESCRIPTION "\0"
     98            VALUE "InternalName",     IN_INTERNAL_NAME "\0"
     99            VALUE "OriginalFilename", IN_ORIGINAL_NAME "\0"
     100            VALUE "CompanyName",      VBOX_RC_COMPANY_NAME "\0"
    76101            VALUE "FileVersion",      VBOX_RC_FILE_VERSION_STR
    77102            VALUE "LegalCopyright",   VBOX_RC_LEGAL_COPYRIGHT
    78             VALUE "ProductName",      VBOX_RC_PRODUCT_NAME_STR
     103            VALUE "ProductName",      IN_PRODUCT_NAME
    79104            VALUE "ProductVersion",   VBOX_RC_PRODUCT_VERSION_STR
    80105            VBOX_RC_MORE_STRINGS

  • trunk/src/VBox/Resources/win/TemplateRC.rc

    r55788 r55789  
    3030*******************************************************************************/
    3131/* Validate input and deal with optional input. */
     32/** @def IN_FILE_DESCRIPTION
     33 * The file description string.
     34 */
    3235#ifndef IN_FILE_DESCRIPTION
    3336# error "Must define the IN_FILE_DESCRIPTION string!"
    3437#endif
    35 #ifndef IN_FILE_BASENAME
    36 # error "Must define the IN_FILE_BASENAME string!"
     38/** @def IN_INTERNAL_NAME
     39 * The internal name string, optional (requires IN_FILE_BASENAME then).
     40 */
     41#ifndef IN_INTERNAL_NAME
     42# ifndef IN_FILE_BASENAME
     43#  error "Must define the IN_FILE_BASENAME or the IN_INTERNAL_NAME string!"
     44# endif
     45# define IN_INTERNAL_NAME IN_FILE_BASENAME
    3746#endif
    38 #ifndef IN_FILE_NAME /* optional */
    39 # define IN_FILE_NAME IN_FILE_BASENAME ".rc"
     47/** @def IN_ORIGINAL_NAME
     48 * The original name string, optional (requires IN_FILE_BASENAME then).
     49 */
     50#ifndef IN_ORIGINAL_NAME
     51# ifndef IN_FILE_BASENAME
     52#  error "Must define the IN_FILE_BASENAME or the IN_ORIGINAL_NAME string!"
     53# endif
     54# define IN_ORIGINAL_NAME IN_FILE_BASENAME " .dll"
     55#endif
     56/** @def IN_PRODUCT_NAME
     57 * The product name string, optional.
     58 */
     59#ifndef IN_PRODUCT_NAME
     60# ifdef VBOX_IN_PUEL_EXTPACK
     61#  define IN_PRODUCT_NAME VBOX_RC_PRODUCT_NAME_PUEL_EXTPACK
     62# else
     63#  define IN_PRODUCT_NAME VBOX_RC_PRODUCT_NAME
     64# endif
    4065#endif
    4166#ifdef IN_GUEST
    … …  
    7095        BLOCK "040904b0" /* Lang=US English, CodePage=utf-16 */
    7196        BEGIN
    72             VALUE "FileDescription",  IN_FILE_DESCRIPTION
    73             VALUE "InternalName",     IN_FILE_BASENAME "\0"
    74             VALUE "OriginalFilename", IN_FILE_NAME "\0"
    75             VALUE "CompanyName",      VBOX_RC_COMPANY_NAME
     97            VALUE "FileDescription",  IN_FILE_DESCRIPTION "\0"
     98            VALUE "InternalName",     IN_INTERNAL_NAME "\0"
     99            VALUE "OriginalFilename", IN_ORIGINAL_NAME "\0"
     100            VALUE "CompanyName",      VBOX_RC_COMPANY_NAME "\0"
    76101            VALUE "FileVersion",      VBOX_RC_FILE_VERSION_STR
    77102            VALUE "LegalCopyright",   VBOX_RC_LEGAL_COPYRIGHT
    78             VALUE "ProductName",      VBOX_RC_PRODUCT_NAME_STR
     103            VALUE "ProductName",      IN_PRODUCT_NAME
    79104            VALUE "ProductVersion",   VBOX_RC_PRODUCT_VERSION_STR
    80105            VBOX_RC_MORE_STRINGS

  • trunk/src/VBox/VMM/Makefile.kmk

    r55788 r55789  
    310310#endif
    311311
    312 $(evalcall2 VBOX_SET_VER_INFO_DLL,VBoxVMM,VirtualBox VMM) # Version info / description.
     312$(call VBOX_SET_VER_INFO_DLL,VBoxVMM,VirtualBox VMM) # Version info / description.
    313313
    314314
    … …  
    519519 VMMRC/VMMRCDeps.cpp_CXXFLAGS.win = -Oi- -TC ## @todo rename VMMRCDeps.cpp to .c
    520520
    521  $(evalcall2 VBOX_SET_VER_INFO_RC,VMMRC,VirtualBox VMM - raw-mode context parts) # Version info / description.
     521 $(call VBOX_SET_VER_INFO_RC,VMMRC,VirtualBox VMM - raw-mode context parts) # Version info / description.
    522522endif # VBOX_WITH_RAW_MODE && !VBOX_ONLY_EXTPACKS
    523523
    … …  
    644644 endif
    645645
    646  $(evalcall2 VBOX_SET_VER_INFO_R0,VMMR0,VirtualBox VMM - ring-0 context parts) # Version info / description.
     646 $(call VBOX_SET_VER_INFO_R0,VMMR0,VirtualBox VMM - ring-0 context parts) # Version info / description.
    647647endif # !VBOX_ONLY_EXTPACKS
    648648
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette