Index: /trunk/Config.kmk =================================================================== --- /trunk/Config.kmk (revision 55770) +++ /trunk/Config.kmk (revision 55771) @@ -3530,13 +3530,5 @@ ifeq ($(KBUILD_TARGET),win) TEMPLATE_VBOXR0DRV_TOOL = $(VBOX_VCC_TOOL) - TEMPLATE_VBOXR0DRV_RCDEFS = \ - VBOX_VERSION_MAJOR=\"$(VBOX_VERSION_MAJOR)\" \ - VBOX_VERSION_MINOR=\"$(VBOX_VERSION_MINOR)\" \ - VBOX_VERSION_BUILD=\"$(VBOX_VERSION_BUILD)\" \ - VBOX_SVN_REV=\"$(VBOX_SVN_REV)\" \ - VBOX_VERSION_MAJOR_NR=$(VBOX_VERSION_MAJOR) \ - VBOX_VERSION_MINOR_NR=$(VBOX_VERSION_MINOR) \ - VBOX_VERSION_BUILD_NR=$(VBOX_VERSION_BUILD) \ - VBOX_SVN_REV_NR=$(VBOX_SVN_REV) + TEMPLATE_VBOXR0DRV_RCDEFS = VBOX_SVN_REV=$(VBOX_SVN_REV) TEMPLATE_VBOXR0DRV_DEFS.x86 = _X86_ TEMPLATE_VBOXR0DRV_DEFS.x86 += NO_INTERLOCKED_INTRINSICS # Avoids intrisic VC/WDK trouble @@ -3828,13 +3820,5 @@ TEMPLATE_VBOXR3EXE_TOOL.win.x86 = $(VBOX_VCC_TOOL_STEM)X86 TEMPLATE_VBOXR3EXE_TOOL.win.amd64 = $(VBOX_VCC_TOOL_STEM)AMD64 - TEMPLATE_VBOXR3EXE_RCDEFS = \ - VBOX_VERSION_MAJOR=\"$(VBOX_VERSION_MAJOR)\" \ - VBOX_VERSION_MINOR=\"$(VBOX_VERSION_MINOR)\" \ - VBOX_VERSION_BUILD=\"$(VBOX_VERSION_BUILD)\" \ - VBOX_SVN_REV=\"$(VBOX_SVN_REV)\" \ - VBOX_VERSION_MAJOR_NR=$(VBOX_VERSION_MAJOR) \ - VBOX_VERSION_MINOR_NR=$(VBOX_VERSION_MINOR) \ - VBOX_VERSION_BUILD_NR=$(VBOX_VERSION_BUILD) \ - VBOX_SVN_REV_NR=$(VBOX_SVN_REV) + TEMPLATE_VBOXR3EXE_RCDEFS = VBOX_SVN_REV=$(VBOX_SVN_REV) TEMPLATE_VBOXR3EXE_SDKS = ReorderCompilerIncs $(VBOX_WINPSDK) TEMPLATE_VBOXR3EXE_CXXFLAGS = -Zi -Zl -GR- -EHsc -GF -MD$(VBOX_VCC_CRT_TYPE) -W3 -wd4065 -wd4244 -wd4996 -Zc:wchar_t- $(VBOX_VCC_OPT) $(VBOX_VCC_FP) Index: /trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/VBoxDispD3D.rc =================================================================== --- /trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/VBoxDispD3D.rc (revision 55770) +++ /trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/VBoxDispD3D.rc (revision 55771) @@ -23,6 +23,6 @@ VS_VERSION_INFO VERSIONINFO - FILEVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 - PRODUCTVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 + FILEVERSION VBOX_RC_FILE_VERSION + PRODUCTVERSION VBOX_RC_FILE_VERSION FILEFLAGSMASK 0x3fL FILEFLAGS 0x0L @@ -38,14 +38,14 @@ VALUE "CompanyName", VBOX_RC_COMPANY_NAME VALUE "FileDescription", "VirtualBox Video Usermode D3D 64bit Driver\0" - VALUE "FileVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD "." VBOX_SVN_REV "\0" + VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR VALUE "InternalName", "VBoxDispD3D\0" VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT VALUE "OriginalFilename", "VBoxDispD3D.dll\0" VALUE "ProductName", VBOX_PRODUCT " Guest Additions\0" - VALUE "ProductVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD ".r" VBOX_SVN_REV "\0" + VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR #else VALUE "CompanyName", VBOX_RC_COMPANY_NAME VALUE "FileDescription", "VirtualBox Video Usermode D3D Driver\0" - VALUE "FileVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD "." VBOX_SVN_REV "\0" + VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR VALUE "InternalName", "VBoxDispD3D\0" VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT @@ -56,5 +56,5 @@ #endif VALUE "ProductName", VBOX_PRODUCT " Guest Additions\0" - VALUE "ProductVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD ".r" VBOX_SVN_REV "\0" + VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR #endif END Index: /trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/xpdm/VBoxDisp.rc =================================================================== --- /trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/xpdm/VBoxDisp.rc (revision 55770) +++ /trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/xpdm/VBoxDisp.rc (revision 55771) @@ -23,6 +23,6 @@ VS_VERSION_INFO VERSIONINFO - FILEVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 - PRODUCTVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 + FILEVERSION VBOX_RC_FILE_VERSION + PRODUCTVERSION VBOX_RC_FILE_VERSION FILEFLAGSMASK 0x3fL FILEFLAGS 0x0L @@ -37,10 +37,10 @@ VALUE "CompanyName", VBOX_RC_COMPANY_NAME VALUE "FileDescription", "VirtualBox Display Driver\0" - VALUE "FileVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD "." VBOX_SVN_REV "\0" + VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR VALUE "InternalName", "VBoxDisp\0" VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT VALUE "OriginalFilename", "VBoxDisp.dll\0" VALUE "ProductName", VBOX_PRODUCT " Guest Additions\0" - VALUE "ProductVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD ".r" VBOX_SVN_REV "\0" + VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR END END Index: /trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPW8.rc =================================================================== --- /trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPW8.rc (revision 55770) +++ /trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPW8.rc (revision 55771) @@ -22,6 +22,6 @@ VS_VERSION_INFO VERSIONINFO - FILEVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 - PRODUCTVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 + FILEVERSION VBOX_RC_FILE_VERSION + PRODUCTVERSION VBOX_RC_FILE_VERSION FILEFLAGSMASK 0x3fL FILEFLAGS 0x0L @@ -36,10 +36,10 @@ VALUE "CompanyName", VBOX_RC_COMPANY_NAME VALUE "FileDescription", "VirtualBox Video Driver for Windows 8\0" - VALUE "FileVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD "." VBOX_SVN_REV "\0" + VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR VALUE "InternalName", "VBoxMPW8\0" VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT VALUE "OriginalFilename", "VBoxVideoW8.sys\0" VALUE "ProductName", VBOX_PRODUCT " Guest Additions\0" - VALUE "ProductVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD ".r" VBOX_SVN_REV "\0" + VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR END END Index: /trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPWddm.rc =================================================================== --- /trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPWddm.rc (revision 55770) +++ /trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPWddm.rc (revision 55771) @@ -22,6 +22,6 @@ VS_VERSION_INFO VERSIONINFO - FILEVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 - PRODUCTVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 + FILEVERSION VBOX_RC_FILE_VERSION + PRODUCTVERSION VBOX_RC_FILE_VERSION FILEFLAGSMASK 0x3fL FILEFLAGS 0x0L @@ -36,10 +36,10 @@ VALUE "CompanyName", VBOX_RC_COMPANY_NAME VALUE "FileDescription", "VirtualBox Video Driver for Windows Vista and 7\0" - VALUE "FileVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD "." VBOX_SVN_REV "\0" + VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR VALUE "InternalName", "VBoxMPWddm\0" VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT VALUE "OriginalFilename", "VBoxVideoWddm.sys\0" VALUE "ProductName", VBOX_PRODUCT " Guest Additions\0" - VALUE "ProductVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD ".r" VBOX_SVN_REV "\0" + VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR END END Index: /trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/xpdm/VBoxMP.rc =================================================================== --- /trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/xpdm/VBoxMP.rc (revision 55770) +++ /trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/xpdm/VBoxMP.rc (revision 55771) @@ -23,6 +23,6 @@ VS_VERSION_INFO VERSIONINFO - FILEVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 - PRODUCTVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 + FILEVERSION VBOX_RC_FILE_VERSION + PRODUCTVERSION VBOX_RC_FILE_VERSION FILEFLAGSMASK 0x3fL FILEFLAGS 0x0L @@ -37,10 +37,10 @@ VALUE "CompanyName", VBOX_RC_COMPANY_NAME VALUE "FileDescription", "VirtualBox Video Driver\0" - VALUE "FileVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD "." VBOX_SVN_REV "\0" + VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR VALUE "InternalName", "VBoxMP\0" VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT VALUE "OriginalFilename", "VBoxVideo.sys\0" VALUE "ProductName", VBOX_PRODUCT " Guest Additions\0" - VALUE "ProductVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD ".r" VBOX_SVN_REV "\0" + VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR END END Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/switcher/d3d8.rc =================================================================== --- /trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/switcher/d3d8.rc (revision 55770) +++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/switcher/d3d8.rc (revision 55771) @@ -22,6 +22,6 @@ VS_VERSION_INFO VERSIONINFO - FILEVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 - PRODUCTVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 + FILEVERSION VBOX_RC_FILE_VERSION + PRODUCTVERSION VBOX_RC_FILE_VERSION FILEFLAGSMASK 0x3fL FILEFLAGS 0x0L @@ -36,10 +36,10 @@ VALUE "CompanyName", VBOX_RC_COMPANY_NAME VALUE "FileDescription", "VirtualBox D3D8 switcher\0" - VALUE "FileVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD "." VBOX_SVN_REV "\0" + VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR VALUE "InternalName", "D3D8\0" VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT VALUE "OriginalFilename", "D3D8.dll\0" VALUE "ProductName", VBOX_PRODUCT " Guest Additions\0" - VALUE "ProductVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD ".r" VBOX_SVN_REV "\0" + VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR END END Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/switcher/d3d9.rc =================================================================== --- /trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/switcher/d3d9.rc (revision 55770) +++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/switcher/d3d9.rc (revision 55771) @@ -22,6 +22,6 @@ VS_VERSION_INFO VERSIONINFO - FILEVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 - PRODUCTVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 + FILEVERSION VBOX_RC_FILE_VERSION + PRODUCTVERSION VBOX_RC_FILE_VERSION FILEFLAGSMASK 0x3fL FILEFLAGS 0x0L @@ -36,10 +36,10 @@ VALUE "CompanyName", VBOX_RC_COMPANY_NAME VALUE "FileDescription", "VirtualBox D3D9 switcher\0" - VALUE "FileVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD "." VBOX_SVN_REV "\0" + VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR VALUE "InternalName", "D3D9\0" VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT VALUE "OriginalFilename", "D3D9.dll\0" VALUE "ProductName", VBOX_PRODUCT " Guest Additions\0" - VALUE "ProductVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD ".r" VBOX_SVN_REV "\0" + VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR END END Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/vbox/d3d8.rc =================================================================== --- /trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/vbox/d3d8.rc (revision 55770) +++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/vbox/d3d8.rc (revision 55771) @@ -22,6 +22,6 @@ VS_VERSION_INFO VERSIONINFO - FILEVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 - PRODUCTVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 + FILEVERSION VBOX_RC_FILE_VERSION + PRODUCTVERSION VBOX_RC_FILE_VERSION FILEFLAGSMASK 0x3fL FILEFLAGS 0x0L @@ -36,10 +36,10 @@ VALUE "CompanyName", VBOX_RC_COMPANY_NAME VALUE "FileDescription", "VirtualBox Wine D3D8\0" - VALUE "FileVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD "." VBOX_SVN_REV "\0" + VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR VALUE "InternalName", "VBoxD3D8\0" VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT VALUE "OriginalFilename", "VBoxD3D8.dll\0" VALUE "ProductName", VBOX_PRODUCT " Guest Additions\0" - VALUE "ProductVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD ".r" VBOX_SVN_REV "\0" + VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR END END Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/vbox/d3d9wddm.rc =================================================================== --- /trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/vbox/d3d9wddm.rc (revision 55770) +++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/vbox/d3d9wddm.rc (revision 55771) @@ -22,6 +22,6 @@ VS_VERSION_INFO VERSIONINFO - FILEVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 - PRODUCTVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 + FILEVERSION VBOX_RC_FILE_VERSION + PRODUCTVERSION VBOX_RC_FILE_VERSION FILEFLAGSMASK 0x3fL FILEFLAGS 0x0L @@ -36,10 +36,10 @@ VALUE "CompanyName", VBOX_RC_COMPANY_NAME VALUE "FileDescription", "VirtualBox Wine D3D9 (WDDM)\0" - VALUE "FileVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD "." VBOX_SVN_REV "\0" + VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR VALUE "InternalName", "VBoxD3D9\0" VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT VALUE "OriginalFilename", "VBoxD3D9.dll\0" VALUE "ProductName", VBOX_PRODUCT " Guest Additions\0" - VALUE "ProductVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD ".r" VBOX_SVN_REV "\0" + VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR END END Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/vbox/d3d9xpdm.rc =================================================================== --- /trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/vbox/d3d9xpdm.rc (revision 55770) +++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/vbox/d3d9xpdm.rc (revision 55771) @@ -22,6 +22,6 @@ VS_VERSION_INFO VERSIONINFO - FILEVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 - PRODUCTVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 + FILEVERSION VBOX_RC_FILE_VERSION + PRODUCTVERSION VBOX_RC_FILE_VERSION FILEFLAGSMASK 0x3fL FILEFLAGS 0x0L @@ -36,10 +36,10 @@ VALUE "CompanyName", VBOX_RC_COMPANY_NAME VALUE "FileDescription", "VirtualBox Wine D3D9 (XPDM)\0" - VALUE "FileVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD "." VBOX_SVN_REV "\0" + VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR VALUE "InternalName", "VBoxD3D9\0" VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT VALUE "OriginalFilename", "VBoxD3D9.dll\0" VALUE "ProductName", VBOX_PRODUCT " Guest Additions\0" - VALUE "ProductVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD ".r" VBOX_SVN_REV "\0" + VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR END END Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/vbox/wined3dwddm.rc =================================================================== --- /trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/vbox/wined3dwddm.rc (revision 55770) +++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/vbox/wined3dwddm.rc (revision 55771) @@ -22,6 +22,6 @@ VS_VERSION_INFO VERSIONINFO - FILEVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 - PRODUCTVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 + FILEVERSION VBOX_RC_FILE_VERSION + PRODUCTVERSION VBOX_RC_FILE_VERSION FILEFLAGSMASK 0x3fL FILEFLAGS 0x0L @@ -36,10 +36,10 @@ VALUE "CompanyName", VBOX_RC_COMPANY_NAME VALUE "FileDescription", "VirtualBox Wine D3D (WDDM)\0" - VALUE "FileVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD "." VBOX_SVN_REV "\0" + VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR VALUE "InternalName", "wined3dwddm\0" VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT VALUE "OriginalFilename", "wined3dwddm.dll\0" VALUE "ProductName", VBOX_PRODUCT " Guest Additions\0" - VALUE "ProductVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD ".r" VBOX_SVN_REV "\0" + VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR END END Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/vbox/wined3dxpdm.rc =================================================================== --- /trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/vbox/wined3dxpdm.rc (revision 55770) +++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/vbox/wined3dxpdm.rc (revision 55771) @@ -22,6 +22,6 @@ VS_VERSION_INFO VERSIONINFO - FILEVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 - PRODUCTVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 + FILEVERSION VBOX_RC_FILE_VERSION + PRODUCTVERSION VBOX_RC_FILE_VERSION FILEFLAGSMASK 0x3fL FILEFLAGS 0x0L @@ -36,10 +36,10 @@ VALUE "CompanyName", VBOX_RC_COMPANY_NAME VALUE "FileDescription", "VirtualBox Wine D3D (XPDM)\0" - VALUE "FileVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD "." VBOX_SVN_REV "\0" + VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR VALUE "InternalName", "wined3d\0" VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT VALUE "OriginalFilename", "wined3d.dll\0" VALUE "ProductName", VBOX_PRODUCT " Guest Additions\0" - VALUE "ProductVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD ".r" VBOX_SVN_REV "\0" + VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR END END Index: /trunk/src/VBox/Additions/WINNT/Installer/InstallHelper/VBoxGuestInstallHelper.rc =================================================================== --- /trunk/src/VBox/Additions/WINNT/Installer/InstallHelper/VBoxGuestInstallHelper.rc (revision 55770) +++ /trunk/src/VBox/Additions/WINNT/Installer/InstallHelper/VBoxGuestInstallHelper.rc (revision 55771) @@ -22,6 +22,6 @@ VS_VERSION_INFO VERSIONINFO - FILEVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 - PRODUCTVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 + FILEVERSION VBOX_RC_FILE_VERSION + PRODUCTVERSION VBOX_RC_FILE_VERSION FILEFLAGSMASK 0x3fL FILEFLAGS 0x0L @@ -36,10 +36,10 @@ VALUE "CompanyName", VBOX_RC_COMPANY_NAME VALUE "FileDescription", "VirtualBox Guest Install Helper\0" - VALUE "FileVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD "." VBOX_SVN_REV "\0" + VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR VALUE "InternalName", "VBoxGuestInstallHelper\0" VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT VALUE "OriginalFilename", "VBoxGuestInstallHelper.dll\0" VALUE "ProductName", VBOX_PRODUCT " Guest Additions\0" - VALUE "ProductVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD ".r" VBOX_SVN_REV "\0" + VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR END END Index: /trunk/src/VBox/Additions/WINNT/Installer/Loader/VBoxWindowsAdditions.rc =================================================================== --- /trunk/src/VBox/Additions/WINNT/Installer/Loader/VBoxWindowsAdditions.rc (revision 55770) +++ /trunk/src/VBox/Additions/WINNT/Installer/Loader/VBoxWindowsAdditions.rc (revision 55771) @@ -23,6 +23,6 @@ VS_VERSION_INFO VERSIONINFO - FILEVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 - PRODUCTVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 + FILEVERSION VBOX_RC_FILE_VERSION + PRODUCTVERSION VBOX_RC_FILE_VERSION FILEFLAGSMASK 0x3fL FILEFLAGS 0x0L @@ -37,10 +37,10 @@ VALUE "CompanyName", VBOX_RC_COMPANY_NAME VALUE "FileDescription", "VirtualBox Guest Additions Loader\0" - VALUE "FileVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD "." VBOX_SVN_REV "\0" + VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR VALUE "InternalName", "VBoxWindowsAdditions\0" VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT VALUE "OriginalFilename", "VBoxWindowsAdditions.exe\0" VALUE "ProductName", VBOX_PRODUCT " Guest Additions\0" - VALUE "ProductVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD ".r" VBOX_SVN_REV "\0" + VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR END END Index: /trunk/src/VBox/Additions/WINNT/Installer/RegCleanup.rc =================================================================== --- /trunk/src/VBox/Additions/WINNT/Installer/RegCleanup.rc (revision 55770) +++ /trunk/src/VBox/Additions/WINNT/Installer/RegCleanup.rc (revision 55771) @@ -22,6 +22,6 @@ VS_VERSION_INFO VERSIONINFO - FILEVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 - PRODUCTVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 + FILEVERSION VBOX_RC_FILE_VERSION + PRODUCTVERSION VBOX_RC_FILE_VERSION FILEFLAGSMASK 0x3fL FILEFLAGS 0x0L @@ -36,10 +36,10 @@ VALUE "CompanyName", VBOX_RC_COMPANY_NAME VALUE "FileDescription", "VirtualBox RegCleanup\0" - VALUE "FileVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD "." VBOX_SVN_REV "\0" + VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR VALUE "InternalName", "VBoxRegCleanup\0" VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT VALUE "OriginalFilename", "VBoxRegCleanup.exe\0" VALUE "ProductName", VBOX_PRODUCT " Guest Additions\0" - VALUE "ProductVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD ".r" VBOX_SVN_REV "\0" + VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR END END Index: /trunk/src/VBox/Additions/WINNT/Installer/VBoxDrvInst.rc =================================================================== --- /trunk/src/VBox/Additions/WINNT/Installer/VBoxDrvInst.rc (revision 55770) +++ /trunk/src/VBox/Additions/WINNT/Installer/VBoxDrvInst.rc (revision 55771) @@ -22,6 +22,6 @@ VS_VERSION_INFO VERSIONINFO - FILEVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 - PRODUCTVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 + FILEVERSION VBOX_RC_FILE_VERSION + PRODUCTVERSION VBOX_RC_FILE_VERSION FILEFLAGSMASK 0x3fL FILEFLAGS 0x0L @@ -36,10 +36,10 @@ VALUE "CompanyName", VBOX_RC_COMPANY_NAME VALUE "FileDescription", "VirtualBox Driver Installer\0" - VALUE "FileVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD "." VBOX_SVN_REV "\0" + VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR VALUE "InternalName", "VBoxDrvInst\0" VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT VALUE "OriginalFilename", "VBoxDrvInst.exe\0" VALUE "ProductName", VBOX_PRODUCT " Guest Additions\0" - VALUE "ProductVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD ".r" VBOX_SVN_REV "\0" + VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR END END Index: /trunk/src/VBox/Additions/WINNT/Installer/VBoxGuestDrvInst.rc =================================================================== --- /trunk/src/VBox/Additions/WINNT/Installer/VBoxGuestDrvInst.rc (revision 55770) +++ /trunk/src/VBox/Additions/WINNT/Installer/VBoxGuestDrvInst.rc (revision 55771) @@ -22,6 +22,6 @@ VS_VERSION_INFO VERSIONINFO - FILEVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 - PRODUCTVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 + FILEVERSION VBOX_RC_FILE_VERSION + PRODUCTVERSION VBOX_RC_FILE_VERSION FILEFLAGSMASK 0x3fL FILEFLAGS 0x0L @@ -36,10 +36,10 @@ VALUE "CompanyName", VBOX_RC_COMPANY_NAME VALUE "FileDescription", "VirtualBox Guest Driver Installer\0" - VALUE "FileVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD "." VBOX_SVN_REV "\0" + VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR VALUE "InternalName", "VBoxGuestDrvInst\0" VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT VALUE "OriginalFilename", "VBoxGuestDrvInst.exe\0" VALUE "ProductName", VBOX_PRODUCT " Guest Additions\0" - VALUE "ProductVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD ".r" VBOX_SVN_REV "\0" + VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR END END Index: /trunk/src/VBox/Additions/WINNT/Mouse/NT4/VBoxPS2NT.rc =================================================================== --- /trunk/src/VBox/Additions/WINNT/Mouse/NT4/VBoxPS2NT.rc (revision 55770) +++ /trunk/src/VBox/Additions/WINNT/Mouse/NT4/VBoxPS2NT.rc (revision 55771) @@ -22,6 +22,6 @@ VS_VERSION_INFO VERSIONINFO - FILEVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 - PRODUCTVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 + FILEVERSION VBOX_RC_FILE_VERSION + PRODUCTVERSION VBOX_RC_FILE_VERSION FILEFLAGSMASK 0x3fL FILEFLAGS 0x0L @@ -36,10 +36,10 @@ VALUE "CompanyName", VBOX_RC_COMPANY_NAME VALUE "FileDescription", "VirtualBox Keyboard/Mouse Port Driver\0" - VALUE "FileVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD "." VBOX_SVN_REV "\0" + VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR VALUE "InternalName", "i8042prt\0" VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT VALUE "OriginalFilename", "VBoxMouseNT.sys\0" VALUE "ProductName", VBOX_PRODUCT " Guest Additions\0" - VALUE "ProductVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD ".r" VBOX_SVN_REV "\0" + VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR END END Index: /trunk/src/VBox/Additions/WINNT/Mouse/NT5/VBoxMF.rc =================================================================== --- /trunk/src/VBox/Additions/WINNT/Mouse/NT5/VBoxMF.rc (revision 55770) +++ /trunk/src/VBox/Additions/WINNT/Mouse/NT5/VBoxMF.rc (revision 55771) @@ -22,6 +22,6 @@ VS_VERSION_INFO VERSIONINFO - FILEVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 - PRODUCTVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 + FILEVERSION VBOX_RC_FILE_VERSION + PRODUCTVERSION VBOX_RC_FILE_VERSION FILEFLAGSMASK 0x3fL FILEFLAGS 0x0L @@ -36,10 +36,10 @@ VALUE "CompanyName", VBOX_RC_COMPANY_NAME VALUE "FileDescription", "VirtualBox Mouse Filter\0" - VALUE "FileVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD "." VBOX_SVN_REV "\0" + VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR VALUE "InternalName", "VBoxMouse\0" VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT VALUE "OriginalFilename", "VBoxMouse.sys\0" VALUE "ProductName", VBOX_PRODUCT " Guest Additions\0" - VALUE "ProductVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD ".r" VBOX_SVN_REV "\0" + VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR END END Index: /trunk/src/VBox/Additions/WINNT/SharedFolders/driver/VBoxSF.rc =================================================================== --- /trunk/src/VBox/Additions/WINNT/SharedFolders/driver/VBoxSF.rc (revision 55770) +++ /trunk/src/VBox/Additions/WINNT/SharedFolders/driver/VBoxSF.rc (revision 55771) @@ -22,6 +22,6 @@ VS_VERSION_INFO VERSIONINFO - FILEVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 - PRODUCTVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 + FILEVERSION VBOX_RC_FILE_VERSION + PRODUCTVERSION VBOX_RC_FILE_VERSION FILEFLAGSMASK 0x3fL FILEFLAGS 0x0L @@ -36,10 +36,10 @@ VALUE "CompanyName", VBOX_RC_COMPANY_NAME VALUE "FileDescription", "VirtualBox Shared Folders Minirdr\0" - VALUE "FileVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD "." VBOX_SVN_REV "\0" + VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR VALUE "InternalName", "VBoxSF\0" VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT VALUE "OriginalFilename", "VBoxSF.sys\0" VALUE "ProductName", VBOX_PRODUCT " Guest Additions\0" - VALUE "ProductVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD ".r" VBOX_SVN_REV "\0" + VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR END END Index: /trunk/src/VBox/Additions/WINNT/SharedFolders/np/vboxmrxnp.rc =================================================================== --- /trunk/src/VBox/Additions/WINNT/SharedFolders/np/vboxmrxnp.rc (revision 55770) +++ /trunk/src/VBox/Additions/WINNT/SharedFolders/np/vboxmrxnp.rc (revision 55771) @@ -22,6 +22,6 @@ VS_VERSION_INFO VERSIONINFO - FILEVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 - PRODUCTVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 + FILEVERSION VBOX_RC_FILE_VERSION + PRODUCTVERSION VBOX_RC_FILE_VERSION FILEFLAGSMASK 0x3fL FILEFLAGS 0x0L @@ -36,5 +36,5 @@ VALUE "CompanyName", VBOX_RC_COMPANY_NAME VALUE "FileDescription", "VirtualBox Shared Folders Minirdr NP\0" - VALUE "FileVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD "." VBOX_SVN_REV "\0" + VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR VALUE "InternalName", "VBoxMRXNP\0" VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT @@ -45,5 +45,5 @@ #endif VALUE "ProductName", VBOX_PRODUCT " Guest Additions\0" - VALUE "ProductVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD ".r" VBOX_SVN_REV "\0" + VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR END END Index: /trunk/src/VBox/Additions/WINNT/VBoxCredProv/VBoxCredentialProvider.rc =================================================================== --- /trunk/src/VBox/Additions/WINNT/VBoxCredProv/VBoxCredentialProvider.rc (revision 55770) +++ /trunk/src/VBox/Additions/WINNT/VBoxCredProv/VBoxCredentialProvider.rc (revision 55771) @@ -22,6 +22,6 @@ VS_VERSION_INFO VERSIONINFO - FILEVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 - PRODUCTVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 + FILEVERSION VBOX_RC_FILE_VERSION + PRODUCTVERSION VBOX_RC_FILE_VERSION FILEFLAGSMASK 0x3fL FILEFLAGS 0x0L @@ -36,10 +36,10 @@ VALUE "CompanyName", VBOX_RC_COMPANY_NAME VALUE "FileDescription", "VirtualBox Credential Provider\0" - VALUE "FileVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD "." VBOX_SVN_REV "\0" + VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR VALUE "InternalName", "VBoxCredProv\0" VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT VALUE "OriginalFilename", "VBoxCredProv.dll\0" VALUE "ProductName", VBOX_PRODUCT " Guest Additions\0" - VALUE "ProductVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD ".r" VBOX_SVN_REV "\0" + VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR END END Index: /trunk/src/VBox/Additions/WINNT/VBoxGINA/VBoxGINA.rc =================================================================== --- /trunk/src/VBox/Additions/WINNT/VBoxGINA/VBoxGINA.rc (revision 55770) +++ /trunk/src/VBox/Additions/WINNT/VBoxGINA/VBoxGINA.rc (revision 55771) @@ -22,6 +22,6 @@ VS_VERSION_INFO VERSIONINFO - FILEVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 - PRODUCTVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 + FILEVERSION VBOX_RC_FILE_VERSION + PRODUCTVERSION VBOX_RC_FILE_VERSION FILEFLAGSMASK 0x3fL FILEFLAGS 0x0L @@ -36,10 +36,10 @@ VALUE "CompanyName", VBOX_RC_COMPANY_NAME VALUE "FileDescription", "VirtualBox GINA\0" - VALUE "FileVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD "." VBOX_SVN_REV "\0" + VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR VALUE "InternalName", "VBoxGina\0" VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT VALUE "OriginalFilename", "VBoxGina.dll\0" VALUE "ProductName", VBOX_PRODUCT " Guest Additions\0" - VALUE "ProductVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD ".r" VBOX_SVN_REV "\0" + VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR END END Index: /trunk/src/VBox/Additions/WINNT/VBoxHook/VBoxHook.rc =================================================================== --- /trunk/src/VBox/Additions/WINNT/VBoxHook/VBoxHook.rc (revision 55770) +++ /trunk/src/VBox/Additions/WINNT/VBoxHook/VBoxHook.rc (revision 55771) @@ -22,6 +22,6 @@ VS_VERSION_INFO VERSIONINFO - FILEVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 - PRODUCTVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 + FILEVERSION VBOX_RC_FILE_VERSION + PRODUCTVERSION VBOX_RC_FILE_VERSION FILEFLAGSMASK 0x3fL FILEFLAGS 0x0L @@ -36,10 +36,10 @@ VALUE "CompanyName", VBOX_RC_COMPANY_NAME VALUE "FileDescription", "VirtualBox Hook Driver\0" - VALUE "FileVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD "." VBOX_SVN_REV "\0" + VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR VALUE "InternalName", "VBoxHook\0" VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT VALUE "OriginalFilename", "VBoxHook.dll\0" VALUE "ProductName", VBOX_PRODUCT " Guest Additions\0" - VALUE "ProductVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD ".r" VBOX_SVN_REV "\0" + VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR END END Index: /trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxTray.rc =================================================================== --- /trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxTray.rc (revision 55770) +++ /trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxTray.rc (revision 55771) @@ -23,6 +23,6 @@ VS_VERSION_INFO VERSIONINFO - FILEVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 - PRODUCTVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 + FILEVERSION VBOX_RC_FILE_VERSION + PRODUCTVERSION VBOX_RC_FILE_VERSION FILEFLAGSMASK 0x3fL FILEFLAGS 0x0L @@ -37,10 +37,10 @@ VALUE "CompanyName", VBOX_RC_COMPANY_NAME VALUE "FileDescription", "VirtualBox Guest Additions Tray Application\0" - VALUE "FileVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD "." VBOX_SVN_REV "\0" + VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR VALUE "InternalName", "VBoxTray\0" VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT VALUE "OriginalFilename", "VBoxTray.exe\0" VALUE "ProductName", VBOX_PRODUCT " Guest Additions\0" - VALUE "ProductVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD ".r" VBOX_SVN_REV "\0" + VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR END END Index: /trunk/src/VBox/Additions/WINNT/tools/VBoxCertUtil.rc =================================================================== --- /trunk/src/VBox/Additions/WINNT/tools/VBoxCertUtil.rc (revision 55770) +++ /trunk/src/VBox/Additions/WINNT/tools/VBoxCertUtil.rc (revision 55771) @@ -23,6 +23,6 @@ VS_VERSION_INFO VERSIONINFO - FILEVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 - PRODUCTVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 + FILEVERSION VBOX_RC_FILE_VERSION + PRODUCTVERSION VBOX_RC_FILE_VERSION FILEFLAGSMASK 0x3fL FILEFLAGS 0x0L @@ -37,10 +37,10 @@ VALUE "CompanyName", VBOX_RC_COMPANY_NAME VALUE "FileDescription", "VirtualBox Certificate Utility\0" - VALUE "FileVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD "." VBOX_SVN_REV "\0" + VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR VALUE "InternalName", "VBoxCertUtil\0" VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT VALUE "OriginalFilename", "VBoxCertUtil.exe\0" VALUE "ProductName", VBOX_PRODUCT " Guest Additions\0" - VALUE "ProductVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD ".r" VBOX_SVN_REV "\0" + VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR END END Index: /trunk/src/VBox/Additions/common/VBoxControl/VBoxControl.rc =================================================================== --- /trunk/src/VBox/Additions/common/VBoxControl/VBoxControl.rc (revision 55770) +++ /trunk/src/VBox/Additions/common/VBoxControl/VBoxControl.rc (revision 55771) @@ -22,6 +22,6 @@ VS_VERSION_INFO VERSIONINFO - FILEVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 - PRODUCTVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 + FILEVERSION VBOX_RC_FILE_VERSION + PRODUCTVERSION VBOX_RC_FILE_VERSION FILEFLAGSMASK 0x3fL FILEFLAGS 0x0L @@ -36,10 +36,10 @@ VALUE "CompanyName", VBOX_RC_COMPANY_NAME VALUE "FileDescription", "VirtualBox Guest Additions Utility\0" - VALUE "FileVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD "." VBOX_SVN_REV "\0" + VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR VALUE "InternalName", "VBoxControl\0" VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT VALUE "OriginalFilename", "VBoxControl.exe\0" VALUE "ProductName", VBOX_PRODUCT " Guest Additions\0" - VALUE "ProductVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD ".r" VBOX_SVN_REV "\0" + VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR END END Index: /trunk/src/VBox/Additions/common/VBoxGuest/win/VBoxGuest.rc =================================================================== --- /trunk/src/VBox/Additions/common/VBoxGuest/win/VBoxGuest.rc (revision 55770) +++ /trunk/src/VBox/Additions/common/VBoxGuest/win/VBoxGuest.rc (revision 55771) @@ -22,6 +22,6 @@ VS_VERSION_INFO VERSIONINFO - FILEVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 - PRODUCTVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 + FILEVERSION VBOX_RC_FILE_VERSION + PRODUCTVERSION VBOX_RC_FILE_VERSION FILEFLAGSMASK 0x3fL FILEFLAGS 0x0L @@ -36,10 +36,10 @@ VALUE "CompanyName", VBOX_RC_COMPANY_NAME VALUE "FileDescription", "VirtualBox Guest Driver\0" - VALUE "FileVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD "." VBOX_SVN_REV "\0" + VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR VALUE "InternalName", "VBoxGuest\0" VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT VALUE "OriginalFilename", "VBoxGuest.sys\0" VALUE "ProductName", VBOX_PRODUCT " Guest Additions\0" - VALUE "ProductVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD ".r" VBOX_SVN_REV "\0" + VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR END END Index: /trunk/src/VBox/Additions/common/VBoxService/VBoxService-win.rc =================================================================== --- /trunk/src/VBox/Additions/common/VBoxService/VBoxService-win.rc (revision 55770) +++ /trunk/src/VBox/Additions/common/VBoxService/VBoxService-win.rc (revision 55771) @@ -23,6 +23,6 @@ VS_VERSION_INFO VERSIONINFO - FILEVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 - PRODUCTVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 + FILEVERSION VBOX_RC_FILE_VERSION + PRODUCTVERSION VBOX_RC_FILE_VERSION FILEFLAGSMASK 0x3fL FILEFLAGS 0x0L @@ -37,10 +37,10 @@ VALUE "CompanyName", VBOX_RC_COMPANY_NAME VALUE "FileDescription", "VirtualBox Guest Additions Service\0" - VALUE "FileVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD "." VBOX_SVN_REV "\0" + VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR VALUE "InternalName", "VBoxService\0" VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT VALUE "OriginalFilename", "VBoxService.exe\0" VALUE "ProductName", VBOX_PRODUCT " Guest Additions\0" - VALUE "ProductVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD ".r" VBOX_SVN_REV "\0" + VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR END END Index: /trunk/src/VBox/Additions/common/crOpenGL/VBoxCROGL.rc =================================================================== --- /trunk/src/VBox/Additions/common/crOpenGL/VBoxCROGL.rc (revision 55770) +++ /trunk/src/VBox/Additions/common/crOpenGL/VBoxCROGL.rc (revision 55771) @@ -22,6 +22,6 @@ VS_VERSION_INFO VERSIONINFO - FILEVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 - PRODUCTVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 + FILEVERSION VBOX_RC_FILE_VERSION + PRODUCTVERSION VBOX_RC_FILE_VERSION FILEFLAGSMASK 0x3fL FILEFLAGS 0x0L @@ -36,5 +36,5 @@ VALUE "CompanyName", VBOX_RC_COMPANY_NAME VALUE "FileDescription", "VirtualBox crOpenGL ICD\0" - VALUE "FileVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD "." VBOX_SVN_REV "\0" + VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR VALUE "InternalName", "VBoxCROGL\0" VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT @@ -45,5 +45,5 @@ #endif VALUE "ProductName", VBOX_PRODUCT " Guest Additions\0" - VALUE "ProductVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD ".r" VBOX_SVN_REV "\0" + VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR END END Index: /trunk/src/VBox/Additions/common/crOpenGL/array/arrayspu.rc =================================================================== --- /trunk/src/VBox/Additions/common/crOpenGL/array/arrayspu.rc (revision 55770) +++ /trunk/src/VBox/Additions/common/crOpenGL/array/arrayspu.rc (revision 55771) @@ -22,6 +22,6 @@ VS_VERSION_INFO VERSIONINFO - FILEVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 - PRODUCTVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 + FILEVERSION VBOX_RC_FILE_VERSION + PRODUCTVERSION VBOX_RC_FILE_VERSION FILEFLAGSMASK 0x3fL FILEFLAGS 0x0L @@ -36,5 +36,5 @@ VALUE "CompanyName", VBOX_RC_COMPANY_NAME VALUE "FileDescription", "VirtualBox crOpenGL ICD\0" - VALUE "FileVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD "." VBOX_SVN_REV "\0" + VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR VALUE "InternalName", "VBoxOGLarrayspu\0" VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT @@ -45,5 +45,5 @@ #endif VALUE "ProductName", VBOX_PRODUCT " Guest Additions\0" - VALUE "ProductVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD ".r" VBOX_SVN_REV "\0" + VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR END END Index: /trunk/src/VBox/Additions/common/crOpenGL/feedback/feedbackspu.rc =================================================================== --- /trunk/src/VBox/Additions/common/crOpenGL/feedback/feedbackspu.rc (revision 55770) +++ /trunk/src/VBox/Additions/common/crOpenGL/feedback/feedbackspu.rc (revision 55771) @@ -22,6 +22,6 @@ VS_VERSION_INFO VERSIONINFO - FILEVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 - PRODUCTVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 + FILEVERSION VBOX_RC_FILE_VERSION + PRODUCTVERSION VBOX_RC_FILE_VERSION FILEFLAGSMASK 0x3fL FILEFLAGS 0x0L @@ -36,5 +36,5 @@ VALUE "CompanyName", VBOX_RC_COMPANY_NAME VALUE "FileDescription", "VirtualBox crOpenGL ICD\0" - VALUE "FileVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD "." VBOX_SVN_REV "\0" + VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR VALUE "InternalName", "VBoxOGLfeedbackpu\0" VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT @@ -45,5 +45,5 @@ #endif VALUE "ProductName", VBOX_PRODUCT " Guest Additions\0" - VALUE "ProductVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD ".r" VBOX_SVN_REV "\0" + VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR END END Index: /trunk/src/VBox/Additions/common/crOpenGL/pack/packspu.rc =================================================================== --- /trunk/src/VBox/Additions/common/crOpenGL/pack/packspu.rc (revision 55770) +++ /trunk/src/VBox/Additions/common/crOpenGL/pack/packspu.rc (revision 55771) @@ -22,6 +22,6 @@ VS_VERSION_INFO VERSIONINFO - FILEVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 - PRODUCTVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 + FILEVERSION VBOX_RC_FILE_VERSION + PRODUCTVERSION VBOX_RC_FILE_VERSION FILEFLAGSMASK 0x3fL FILEFLAGS 0x0L @@ -36,5 +36,5 @@ VALUE "CompanyName", VBOX_RC_COMPANY_NAME VALUE "FileDescription", "VirtualBox crOpenGL ICD\0" - VALUE "FileVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD "." VBOX_SVN_REV "\0" + VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR VALUE "InternalName", "VBoxOGLpackspu\0" VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT @@ -45,5 +45,5 @@ #endif VALUE "ProductName", VBOX_PRODUCT " Guest Additions\0" - VALUE "ProductVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD ".r" VBOX_SVN_REV "\0" + VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR END END Index: /trunk/src/VBox/Additions/common/crOpenGL/passthrough/passthroughspu.rc =================================================================== --- /trunk/src/VBox/Additions/common/crOpenGL/passthrough/passthroughspu.rc (revision 55770) +++ /trunk/src/VBox/Additions/common/crOpenGL/passthrough/passthroughspu.rc (revision 55771) @@ -22,6 +22,6 @@ VS_VERSION_INFO VERSIONINFO - FILEVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 - PRODUCTVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 + FILEVERSION VBOX_RC_FILE_VERSION + PRODUCTVERSION VBOX_RC_FILE_VERSION FILEFLAGSMASK 0x3fL FILEFLAGS 0x0L @@ -36,5 +36,5 @@ VALUE "CompanyName", VBOX_RC_COMPANY_NAME VALUE "FileDescription", "VirtualBox crOpenGL ICD\0" - VALUE "FileVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD "." VBOX_SVN_REV "\0" + VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR VALUE "InternalName", "VBoxOGLpassthroughspu\0" VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT @@ -45,5 +45,5 @@ #endif VALUE "ProductName", VBOX_PRODUCT " Guest Additions\0" - VALUE "ProductVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD ".r" VBOX_SVN_REV "\0" + VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR END END Index: /trunk/src/VBox/Debugger/DBGCPlugInDiggers.rc =================================================================== --- /trunk/src/VBox/Debugger/DBGCPlugInDiggers.rc (revision 55770) +++ /trunk/src/VBox/Debugger/DBGCPlugInDiggers.rc (revision 55771) @@ -22,6 +22,6 @@ VS_VERSION_INFO VERSIONINFO - FILEVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 - PRODUCTVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 + FILEVERSION VBOX_RC_FILE_VERSION + PRODUCTVERSION VBOX_RC_FILE_VERSION FILEFLAGSMASK VS_FFI_FILEFLAGSMASK FILEFLAGS 0x0L @@ -36,10 +36,10 @@ VALUE "CompanyName", VBOX_RC_COMPANY_NAME VALUE "FileDescription", "VirtualBox Debugger Plug-in\0" - VALUE "FileVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD "." VBOX_SVN_REV "\0" + VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR VALUE "InternalName", "DBGCPlugInDiggers\0" VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT VALUE "OriginalFilename", "DBGCPlugInDiggers.dll\0" VALUE "ProductName", VBOX_PRODUCT "\0" - VALUE "ProductVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD ".r" VBOX_SVN_REV "\0" + VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR END END Index: /trunk/src/VBox/Debugger/VBoxDbg.rc =================================================================== --- /trunk/src/VBox/Debugger/VBoxDbg.rc (revision 55770) +++ /trunk/src/VBox/Debugger/VBoxDbg.rc (revision 55771) @@ -22,6 +22,6 @@ VS_VERSION_INFO VERSIONINFO - FILEVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 - PRODUCTVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 + FILEVERSION VBOX_RC_FILE_VERSION + PRODUCTVERSION VBOX_RC_FILE_VERSION FILEFLAGSMASK VS_FFI_FILEFLAGSMASK FILEFLAGS 0x0L @@ -36,10 +36,10 @@ VALUE "CompanyName", VBOX_RC_COMPANY_NAME VALUE "FileDescription", "VirtualBox Debugger\0" - VALUE "FileVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD "." VBOX_SVN_REV "\0" + VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR VALUE "InternalName", "VBoxDbg\0" VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT VALUE "OriginalFilename", "VBoxDbg.dll\0" VALUE "ProductName", VBOX_PRODUCT "\0" - VALUE "ProductVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD ".r" VBOX_SVN_REV "\0" + VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR END END Index: /trunk/src/VBox/Devices/Graphics/VBoxSVGA3D.rc =================================================================== --- /trunk/src/VBox/Devices/Graphics/VBoxSVGA3D.rc (revision 55770) +++ /trunk/src/VBox/Devices/Graphics/VBoxSVGA3D.rc (revision 55771) @@ -22,6 +22,6 @@ VS_VERSION_INFO VERSIONINFO - FILEVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 - PRODUCTVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 + FILEVERSION VBOX_RC_FILE_VERSION + PRODUCTVERSION VBOX_RC_FILE_VERSION FILEFLAGSMASK VS_FFI_FILEFLAGSMASK FILEFLAGS 0x0L @@ -36,10 +36,10 @@ VALUE "CompanyName", VBOX_RC_COMPANY_NAME VALUE "FileDescription", "VirtualBox VMSVGA 3D\0" - VALUE "FileVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD "." VBOX_SVN_REV "\0" + VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR VALUE "InternalName", "VBoxSVGA3D\0" VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT VALUE "OriginalFilename", "VBoxSVGA3D.dll\0" VALUE "ProductName", VBOX_PRODUCT "\0" - VALUE "ProductVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD ".r" VBOX_SVN_REV "\0" + VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR END END Index: /trunk/src/VBox/Devices/build/VBoxDD.rc =================================================================== --- /trunk/src/VBox/Devices/build/VBoxDD.rc (revision 55770) +++ /trunk/src/VBox/Devices/build/VBoxDD.rc (revision 55771) @@ -22,6 +22,6 @@ VS_VERSION_INFO VERSIONINFO - FILEVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 - PRODUCTVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 + FILEVERSION VBOX_RC_FILE_VERSION + PRODUCTVERSION VBOX_RC_FILE_VERSION FILEFLAGSMASK VS_FFI_FILEFLAGSMASK FILEFLAGS 0x0L @@ -36,10 +36,10 @@ VALUE "CompanyName", VBOX_RC_COMPANY_NAME VALUE "FileDescription", "VirtualBox VMM Devices and Drivers\0" - VALUE "FileVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD "." VBOX_SVN_REV "\0" + VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR VALUE "InternalName", "VBoxDD\0" VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT VALUE "OriginalFilename", "VBoxDD.dll\0" VALUE "ProductName", VBOX_PRODUCT "\0" - VALUE "ProductVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD ".r" VBOX_SVN_REV "\0" + VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR END END Index: /trunk/src/VBox/Devices/build/VBoxDD2.rc =================================================================== --- /trunk/src/VBox/Devices/build/VBoxDD2.rc (revision 55770) +++ /trunk/src/VBox/Devices/build/VBoxDD2.rc (revision 55771) @@ -22,6 +22,6 @@ VS_VERSION_INFO VERSIONINFO - FILEVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 - PRODUCTVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 + FILEVERSION VBOX_RC_FILE_VERSION + PRODUCTVERSION VBOX_RC_FILE_VERSION FILEFLAGSMASK VS_FFI_FILEFLAGSMASK FILEFLAGS 0x0L @@ -36,10 +36,10 @@ VALUE "CompanyName", VBOX_RC_COMPANY_NAME VALUE "FileDescription", "VirtualBox VMM Devices and Drivers 2\0" - VALUE "FileVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD "." VBOX_SVN_REV "\0" + VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR VALUE "InternalName", "VBoxDD2\0" VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT VALUE "OriginalFilename", "VBoxDD2.dll\0" VALUE "ProductName", VBOX_PRODUCT "\0" - VALUE "ProductVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD ".r" VBOX_SVN_REV "\0" + VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR END END Index: /trunk/src/VBox/Devices/build/VBoxDDU.rc =================================================================== --- /trunk/src/VBox/Devices/build/VBoxDDU.rc (revision 55770) +++ /trunk/src/VBox/Devices/build/VBoxDDU.rc (revision 55771) @@ -22,6 +22,6 @@ VS_VERSION_INFO VERSIONINFO - FILEVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 - PRODUCTVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 + FILEVERSION VBOX_RC_FILE_VERSION + PRODUCTVERSION VBOX_RC_FILE_VERSION FILEFLAGSMASK VS_FFI_FILEFLAGSMASK FILEFLAGS 0x0L @@ -36,10 +36,10 @@ VALUE "CompanyName", VBOX_RC_COMPANY_NAME VALUE "FileDescription", "VirtualBox VMM Devices and Drivers Utilities\0" - VALUE "FileVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD "." VBOX_SVN_REV "\0" + VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR VALUE "InternalName", "VBoxDDU\0" VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT VALUE "OriginalFilename", "VBoxDDU.dll\0" VALUE "ProductName", VBOX_PRODUCT "\0" - VALUE "ProductVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD ".r" VBOX_SVN_REV "\0" + VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR END END Index: /trunk/src/VBox/Frontends/VBoxBalloonCtrl/VBoxBalloonCtrl.rc =================================================================== --- /trunk/src/VBox/Frontends/VBoxBalloonCtrl/VBoxBalloonCtrl.rc (revision 55770) +++ /trunk/src/VBox/Frontends/VBoxBalloonCtrl/VBoxBalloonCtrl.rc (revision 55771) @@ -22,6 +22,6 @@ VS_VERSION_INFO VERSIONINFO - FILEVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 - PRODUCTVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 + FILEVERSION VBOX_RC_FILE_VERSION + PRODUCTVERSION VBOX_RC_FILE_VERSION FILEFLAGSMASK VS_FFI_FILEFLAGSMASK FILEFLAGS 0x0L @@ -36,10 +36,10 @@ VALUE "CompanyName", VBOX_RC_COMPANY_NAME VALUE "FileDescription", "VirtualBox Balloon Control Tool\0" - VALUE "FileVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD "." VBOX_SVN_REV "\0" + VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR VALUE "InternalName", "VBoxBalloonCtrl\0" VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT VALUE "OriginalFilename", "VBoxBalloonCtrl.exe\0" VALUE "ProductName", VBOX_PRODUCT "\0" - VALUE "ProductVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD ".r" VBOX_SVN_REV "\0" + VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR END END Index: /trunk/src/VBox/Frontends/VBoxHeadless/VBoxHeadless.rc =================================================================== --- /trunk/src/VBox/Frontends/VBoxHeadless/VBoxHeadless.rc (revision 55770) +++ /trunk/src/VBox/Frontends/VBoxHeadless/VBoxHeadless.rc (revision 55771) @@ -20,6 +20,6 @@ VS_VERSION_INFO VERSIONINFO - FILEVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 - PRODUCTVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 + FILEVERSION VBOX_RC_FILE_VERSION + PRODUCTVERSION VBOX_RC_FILE_VERSION FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG @@ -42,5 +42,5 @@ VALUE "CompanyName", VBOX_RC_COMPANY_NAME VALUE "FileDescription", "VirtualBox Headless Frontend\0" - VALUE "FileVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD "." VBOX_SVN_REV "\0" + VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR #ifdef VBOXR3_HARDENED_DLL VALUE "InternalName", "VBoxHeadless\0" @@ -55,5 +55,5 @@ #endif VALUE "ProductName", VBOX_PRODUCT "\0" - VALUE "ProductVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD ".r" VBOX_SVN_REV "\0" + VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR END END Index: /trunk/src/VBox/Frontends/VBoxManage/VBoxManage.rc =================================================================== --- /trunk/src/VBox/Frontends/VBoxManage/VBoxManage.rc (revision 55770) +++ /trunk/src/VBox/Frontends/VBoxManage/VBoxManage.rc (revision 55771) @@ -22,6 +22,6 @@ VS_VERSION_INFO VERSIONINFO - FILEVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 - PRODUCTVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 + FILEVERSION VBOX_RC_FILE_VERSION + PRODUCTVERSION VBOX_RC_FILE_VERSION FILEFLAGSMASK VS_FFI_FILEFLAGSMASK FILEFLAGS 0x0L @@ -36,10 +36,10 @@ VALUE "CompanyName", VBOX_RC_COMPANY_NAME VALUE "FileDescription", "VirtualBox Command Line Tool\0" - VALUE "FileVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD "." VBOX_SVN_REV "\0" + VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR VALUE "InternalName", "VBoxManage\0" VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT VALUE "OriginalFilename", "VBoxManage.exe\0" VALUE "ProductName", VBOX_PRODUCT "\0" - VALUE "ProductVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD ".r" VBOX_SVN_REV "\0" + VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR END END Index: /trunk/src/VBox/Frontends/VBoxSDL/VBoxSDL.rc =================================================================== --- /trunk/src/VBox/Frontends/VBoxSDL/VBoxSDL.rc (revision 55770) +++ /trunk/src/VBox/Frontends/VBoxSDL/VBoxSDL.rc (revision 55771) @@ -20,6 +20,6 @@ VS_VERSION_INFO VERSIONINFO - FILEVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 - PRODUCTVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 + FILEVERSION VBOX_RC_FILE_VERSION + PRODUCTVERSION VBOX_RC_FILE_VERSION FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG @@ -42,5 +42,5 @@ VALUE "CompanyName", VBOX_RC_COMPANY_NAME VALUE "FileDescription", "VirtualBox Pure SDL Frontend\0" - VALUE "FileVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD "." VBOX_SVN_REV "\0" + VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR #ifdef VBOXR3_HARDENED_DLL VALUE "InternalName", "VBoxSDL\0" @@ -55,5 +55,5 @@ #endif VALUE "ProductName", VBOX_PRODUCT "\0" - VALUE "ProductVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD ".r" VBOX_SVN_REV "\0" + VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR END END Index: /trunk/src/VBox/Frontends/VirtualBox/src/platform/win/VirtualBox.rc =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/platform/win/VirtualBox.rc (revision 55770) +++ /trunk/src/VBox/Frontends/VirtualBox/src/platform/win/VirtualBox.rc (revision 55771) @@ -20,6 +20,6 @@ VS_VERSION_INFO VERSIONINFO - FILEVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 - PRODUCTVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 + FILEVERSION VBOX_RC_FILE_VERSION + PRODUCTVERSION VBOX_RC_FILE_VERSION FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG @@ -42,5 +42,5 @@ VALUE "CompanyName", VBOX_RC_COMPANY_NAME VALUE "FileDescription", "VirtualBox Manager\0" - VALUE "FileVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD "." VBOX_SVN_REV "\0" + VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR #ifdef VBOXR3_HARDENED_DLL VALUE "InternalName", "VirtualBox\0" @@ -55,5 +55,5 @@ #endif VALUE "ProductName", VBOX_PRODUCT "\0" - VALUE "ProductVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD ".r" VBOX_SVN_REV "\0" + VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR END END Index: /trunk/src/VBox/Frontends/VirtualBox/src/platform/win/VirtualBoxHardened.rc =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/platform/win/VirtualBoxHardened.rc (revision 55770) +++ /trunk/src/VBox/Frontends/VirtualBox/src/platform/win/VirtualBoxHardened.rc (revision 55771) @@ -21,6 +21,6 @@ #if 0 /* Causes more DLLs to be loaded, don't enable it! */ VS_VERSION_INFO VERSIONINFO - FILEVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 - PRODUCTVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 + FILEVERSION VBOX_RC_FILE_VERSION + PRODUCTVERSION VBOX_RC_FILE_VERSION FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG @@ -39,10 +39,10 @@ VALUE "CompanyName", VBOX_RC_COMPANY_NAME VALUE "FileDescription", "VirtualBox Manager\0" - VALUE "FileVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD "." VBOX_SVN_REV "\0" + VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR VALUE "InternalName", "VirtualBox\0" VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT VALUE "OriginalFilename","VirtualBox.exe\0" VALUE "ProductName", VBOX_PRODUCT "\0" - VALUE "ProductVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD ".r" VBOX_SVN_REV "\0" + VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR END END Index: /trunk/src/VBox/GuestHost/OpenGL/error/VBoxOGLerrorspu.rc =================================================================== --- /trunk/src/VBox/GuestHost/OpenGL/error/VBoxOGLerrorspu.rc (revision 55770) +++ /trunk/src/VBox/GuestHost/OpenGL/error/VBoxOGLerrorspu.rc (revision 55771) @@ -36,6 +36,6 @@ VS_VERSION_INFO VERSIONINFO - FILEVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 - PRODUCTVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 + FILEVERSION VBOX_RC_FILE_VERSION + PRODUCTVERSION VBOX_RC_FILE_VERSION FILEFLAGSMASK VS_FFI_FILEFLAGSMASK FILEFLAGS 0x0L @@ -50,10 +50,10 @@ VALUE "CompanyName", VBOX_RC_COMPANY_NAME VALUE "FileDescription", DESCRIPTION_STR - VALUE "FileVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD "." VBOX_SVN_REV "\0" + VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR VALUE "InternalName", FILENAME_STR "\0" VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT VALUE "OriginalFilename", FILENAME_STR ".dll\0" VALUE "ProductName", PRODUCT_STR - VALUE "ProductVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD ".r" VBOX_SVN_REV "\0" + VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR END END Index: /trunk/src/VBox/GuestHost/OpenGL/error/errorspu.rc =================================================================== --- /trunk/src/VBox/GuestHost/OpenGL/error/errorspu.rc (revision 55770) +++ /trunk/src/VBox/GuestHost/OpenGL/error/errorspu.rc (revision 55771) @@ -22,6 +22,6 @@ VS_VERSION_INFO VERSIONINFO - FILEVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 - PRODUCTVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 + FILEVERSION VBOX_RC_FILE_VERSION + PRODUCTVERSION VBOX_RC_FILE_VERSION FILEFLAGSMASK 0x3fL FILEFLAGS 0x0L @@ -36,5 +36,5 @@ VALUE "CompanyName", VBOX_RC_COMPANY_NAME VALUE "FileDescription", "VirtualBox crOpenGL ICD\0" - VALUE "FileVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD "." VBOX_SVN_REV "\0" + VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR VALUE "InternalName", "VBoxOGLerrorspu\0" VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT @@ -45,5 +45,5 @@ #endif VALUE "ProductName", VBOX_PRODUCT " Guest Additions\0" - VALUE "ProductVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD ".r" VBOX_SVN_REV "\0" + VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR END END Index: /trunk/src/VBox/GuestHost/OpenGL/util/VBoxOGLcrutil.rc =================================================================== --- /trunk/src/VBox/GuestHost/OpenGL/util/VBoxOGLcrutil.rc (revision 55770) +++ /trunk/src/VBox/GuestHost/OpenGL/util/VBoxOGLcrutil.rc (revision 55771) @@ -36,6 +36,6 @@ VS_VERSION_INFO VERSIONINFO - FILEVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 - PRODUCTVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 + FILEVERSION VBOX_RC_FILE_VERSION + PRODUCTVERSION VBOX_RC_FILE_VERSION FILEFLAGSMASK VS_FFI_FILEFLAGSMASK FILEFLAGS 0x0L @@ -50,10 +50,10 @@ VALUE "CompanyName", VBOX_RC_COMPANY_NAME VALUE "FileDescription", DESCRIPTION_STR - VALUE "FileVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD "." VBOX_SVN_REV "\0" + VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR VALUE "InternalName", FILENAME_STR "\0" VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT VALUE "OriginalFilename", FILENAME_STR ".dll\0" VALUE "ProductName", PRODUCT_STR - VALUE "ProductVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD ".r" VBOX_SVN_REV "\0" + VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR END END Index: /trunk/src/VBox/GuestHost/OpenGL/util/util.rc =================================================================== --- /trunk/src/VBox/GuestHost/OpenGL/util/util.rc (revision 55770) +++ /trunk/src/VBox/GuestHost/OpenGL/util/util.rc (revision 55771) @@ -22,6 +22,6 @@ VS_VERSION_INFO VERSIONINFO - FILEVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 - PRODUCTVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 + FILEVERSION VBOX_RC_FILE_VERSION + PRODUCTVERSION VBOX_RC_FILE_VERSION FILEFLAGSMASK 0x3fL FILEFLAGS 0x0L @@ -36,5 +36,5 @@ VALUE "CompanyName", VBOX_RC_COMPANY_NAME VALUE "FileDescription", "VirtualBox crOpenGL crutil ICD\0" - VALUE "FileVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD "." VBOX_SVN_REV "\0" + VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR VALUE "InternalName", "VBoxOGLcrutil\0" VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT @@ -45,5 +45,5 @@ #endif VALUE "ProductName", VBOX_PRODUCT " Guest Additions\0" - VALUE "ProductVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD ".r" VBOX_SVN_REV "\0" + VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR END END Index: /trunk/src/VBox/HostDrivers/Support/win/VBoxDrv.rc =================================================================== --- /trunk/src/VBox/HostDrivers/Support/win/VBoxDrv.rc (revision 55770) +++ /trunk/src/VBox/HostDrivers/Support/win/VBoxDrv.rc (revision 55771) @@ -31,6 +31,6 @@ VS_VERSION_INFO VERSIONINFO - FILEVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 - PRODUCTVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 + FILEVERSION VBOX_RC_FILE_VERSION + PRODUCTVERSION VBOX_RC_FILE_VERSION FILEFLAGSMASK VS_FFI_FILEFLAGSMASK FILEFLAGS 0x0L @@ -45,10 +45,10 @@ VALUE "CompanyName", VBOX_RC_COMPANY_NAME VALUE "FileDescription", "VirtualBox Support Driver\0" - VALUE "FileVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD "." VBOX_SVN_REV "\0" + VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR VALUE "InternalName", "VBoxDrv\0" VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT VALUE "OriginalFilename", "VBoxDrv.sys\0" VALUE "ProductName", VBOX_PRODUCT "\0" - VALUE "ProductVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD ".r" VBOX_SVN_REV "\0" + VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR END END Index: /trunk/src/VBox/HostDrivers/Support/win/VBoxSupLib.rc =================================================================== --- /trunk/src/VBox/HostDrivers/Support/win/VBoxSupLib.rc (revision 55770) +++ /trunk/src/VBox/HostDrivers/Support/win/VBoxSupLib.rc (revision 55771) @@ -31,6 +31,6 @@ VS_VERSION_INFO VERSIONINFO - FILEVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 - PRODUCTVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 + FILEVERSION VBOX_RC_FILE_VERSION + PRODUCTVERSION VBOX_RC_FILE_VERSION FILEFLAGSMASK VS_FFI_FILEFLAGSMASK FILEFLAGS 0x0L @@ -45,10 +45,10 @@ VALUE "CompanyName", VBOX_RC_COMPANY_NAME VALUE "FileDescription", "VirtualBox Kernel Support\0" - VALUE "FileVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD "." VBOX_SVN_REV "\0" + VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR VALUE "InternalName", "VBoxSupLib\0" VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT VALUE "OriginalFilename", "VBoxSupLib.dll\0" VALUE "ProductName", VBOX_PRODUCT "\0" - VALUE "ProductVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD ".r" VBOX_SVN_REV "\0" + VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR END END Index: /trunk/src/VBox/HostDrivers/VBoxNetFlt/VBoxNetFlt.rc =================================================================== --- /trunk/src/VBox/HostDrivers/VBoxNetFlt/VBoxNetFlt.rc (revision 55770) +++ /trunk/src/VBox/HostDrivers/VBoxNetFlt/VBoxNetFlt.rc (revision 55771) @@ -24,6 +24,6 @@ VS_VERSION_INFO VERSIONINFO - FILEVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 - PRODUCTVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 + FILEVERSION VBOX_RC_FILE_VERSION + PRODUCTVERSION VBOX_RC_FILE_VERSION FILEFLAGSMASK VS_FFI_FILEFLAGSMASK FILEFLAGS 0x0L @@ -38,10 +38,10 @@ VALUE "CompanyName", VBOX_RC_COMPANY_NAME VALUE "FileDescription", DESCRIPTION_STR - VALUE "FileVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD "." VBOX_SVN_REV "\0" + VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR VALUE "InternalName", FILENAME_STR "\0" VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT VALUE "OriginalFilename", FILENAME_STR ".sys\0" VALUE "ProductName", VBOX_PRODUCT "\0" - VALUE "ProductVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD ".r" VBOX_SVN_REV "\0" + VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR END END Index: /trunk/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetFlt-win.rc =================================================================== --- /trunk/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetFlt-win.rc (revision 55770) +++ /trunk/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetFlt-win.rc (revision 55771) @@ -29,6 +29,6 @@ VS_VERSION_INFO VERSIONINFO - FILEVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 - PRODUCTVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 + FILEVERSION VBOX_RC_FILE_VERSION + PRODUCTVERSION VBOX_RC_FILE_VERSION FILEFLAGSMASK VS_FFI_FILEFLAGSMASK FILEFLAGS 0x0L @@ -43,10 +43,10 @@ VALUE "CompanyName", VBOX_RC_COMPANY_NAME VALUE "FileDescription", DESCRIPTION_STR - VALUE "FileVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD "." VBOX_SVN_REV "\0" + VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR VALUE "InternalName", FILENAME_STR "\0" VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT VALUE "OriginalFilename", FILENAME_STR ".sys\0" VALUE "ProductName", VBOX_PRODUCT "\0" - VALUE "ProductVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD ".r" VBOX_SVN_REV "\0" + VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR END END Index: /trunk/src/VBox/HostDrivers/VBoxNetFlt/win/ndis6/VBoxNetAdp-win.rc =================================================================== --- /trunk/src/VBox/HostDrivers/VBoxNetFlt/win/ndis6/VBoxNetAdp-win.rc (revision 55770) +++ /trunk/src/VBox/HostDrivers/VBoxNetFlt/win/ndis6/VBoxNetAdp-win.rc (revision 55771) @@ -24,6 +24,6 @@ VS_VERSION_INFO VERSIONINFO - FILEVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 - PRODUCTVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 + FILEVERSION VBOX_RC_FILE_VERSION + PRODUCTVERSION VBOX_RC_FILE_VERSION FILEFLAGSMASK VS_FFI_FILEFLAGSMASK FILEFLAGS 0x0L @@ -38,10 +38,10 @@ VALUE "CompanyName", VBOX_RC_COMPANY_NAME VALUE "FileDescription", DESCRIPTION_STR - VALUE "FileVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD "." VBOX_SVN_REV "\0" + VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR VALUE "InternalName", FILENAME_STR "\0" VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT VALUE "OriginalFilename", FILENAME_STR ".sys\0" VALUE "ProductName", VBOX_PRODUCT "\0" - VALUE "ProductVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD ".r" VBOX_SVN_REV "\0" + VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR END END Index: /trunk/src/VBox/HostDrivers/VBoxNetFlt/win/nobj/VBoxNetFltNobj.rc =================================================================== --- /trunk/src/VBox/HostDrivers/VBoxNetFlt/win/nobj/VBoxNetFltNobj.rc (revision 55770) +++ /trunk/src/VBox/HostDrivers/VBoxNetFlt/win/nobj/VBoxNetFltNobj.rc (revision 55771) @@ -21,6 +21,6 @@ VS_VERSION_INFO VERSIONINFO - FILEVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 - PRODUCTVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 + FILEVERSION VBOX_RC_FILE_VERSION + PRODUCTVERSION VBOX_RC_FILE_VERSION FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG @@ -39,10 +39,10 @@ VALUE "CompanyName", VBOX_RC_COMPANY_NAME VALUE "FileDescription", "VirtualBox Bridged Networking Driver Notify Object v1.1\0" - VALUE "FileVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD "." VBOX_SVN_REV "\0" + VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR VALUE "InternalName", "VBoxNetFltNobj\0" VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT VALUE "OriginalFilename", "VBoxNetFltNobj.dll\0" VALUE "ProductName", VBOX_PRODUCT "\0" - VALUE "ProductVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD ".r" VBOX_SVN_REV "\0" + VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR END END Index: /trunk/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbDev.rc =================================================================== --- /trunk/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbDev.rc (revision 55770) +++ /trunk/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbDev.rc (revision 55771) @@ -22,6 +22,6 @@ VS_VERSION_INFO VERSIONINFO - FILEVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 - PRODUCTVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 + FILEVERSION VBOX_RC_FILE_VERSION + PRODUCTVERSION VBOX_RC_FILE_VERSION FILEFLAGSMASK VS_FFI_FILEFLAGSMASK FILEFLAGS 0x0L @@ -36,10 +36,10 @@ VALUE "CompanyName", VBOX_RC_COMPANY_NAME VALUE "FileDescription", "VirtualBox USB Driver\0" - VALUE "FileVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD "." VBOX_SVN_REV "\0" + VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR VALUE "InternalName", "VBoxUSB\0" VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT VALUE "OriginalFilename", "VBoxUSB.sys\0" VALUE "ProductName", VBOX_PRODUCT "\0" - VALUE "ProductVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD ".r" VBOX_SVN_REV "\0" + VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR END END Index: /trunk/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.rc =================================================================== --- /trunk/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.rc (revision 55770) +++ /trunk/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.rc (revision 55771) @@ -22,6 +22,6 @@ VS_VERSION_INFO VERSIONINFO - FILEVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 - PRODUCTVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 + FILEVERSION VBOX_RC_FILE_VERSION + PRODUCTVERSION VBOX_RC_FILE_VERSION FILEFLAGSMASK VS_FFI_FILEFLAGSMASK FILEFLAGS 0x0L @@ -36,10 +36,10 @@ VALUE "CompanyName", VBOX_RC_COMPANY_NAME VALUE "FileDescription", "VirtualBox USB Monitor Driver\0" - VALUE "FileVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD "." VBOX_SVN_REV "\0" + VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR VALUE "InternalName", "VBoxUSBMon\0" VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT VALUE "OriginalFilename", "VBoxUSBMon.sys\0" VALUE "ProductName", VBOX_PRODUCT "\0" - VALUE "ProductVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD ".r" VBOX_SVN_REV "\0" + VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR END END Index: /trunk/src/VBox/HostServices/DragAndDrop/VBoxDragAndDropSvc.rc =================================================================== --- /trunk/src/VBox/HostServices/DragAndDrop/VBoxDragAndDropSvc.rc (revision 55770) +++ /trunk/src/VBox/HostServices/DragAndDrop/VBoxDragAndDropSvc.rc (revision 55771) @@ -22,6 +22,6 @@ VS_VERSION_INFO VERSIONINFO - FILEVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 - PRODUCTVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 + FILEVERSION VBOX_RC_FILE_VERSION + PRODUCTVERSION VBOX_RC_FILE_VERSION FILEFLAGSMASK VS_FFI_FILEFLAGSMASK FILEFLAGS 0x0L @@ -36,10 +36,10 @@ VALUE "CompanyName", VBOX_RC_COMPANY_NAME VALUE "FileDescription", "VirtualBox Drag and Drop Host Service\0" - VALUE "FileVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD "." VBOX_SVN_REV "\0" + VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR VALUE "InternalName", "VBoxDragAndDropSvc\0" VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT VALUE "OriginalFilename", "VBoxDragAndDropSvc.dll\0" VALUE "ProductName", VBOX_PRODUCT "\0" - VALUE "ProductVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD ".r" VBOX_SVN_REV "\0" + VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR END END Index: /trunk/src/VBox/HostServices/GuestControl/VBoxGuestControlSvc.rc =================================================================== --- /trunk/src/VBox/HostServices/GuestControl/VBoxGuestControlSvc.rc (revision 55770) +++ /trunk/src/VBox/HostServices/GuestControl/VBoxGuestControlSvc.rc (revision 55771) @@ -22,6 +22,6 @@ VS_VERSION_INFO VERSIONINFO - FILEVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 - PRODUCTVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 + FILEVERSION VBOX_RC_FILE_VERSION + PRODUCTVERSION VBOX_RC_FILE_VERSION FILEFLAGSMASK VS_FFI_FILEFLAGSMASK FILEFLAGS 0x0L @@ -36,10 +36,10 @@ VALUE "CompanyName", VBOX_RC_COMPANY_NAME VALUE "FileDescription", "VirtualBox Guest Control Host Service\0" - VALUE "FileVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD "." VBOX_SVN_REV "\0" + VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR VALUE "InternalName", "VBoxGuestControl\0" VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT VALUE "OriginalFilename", "VBoxGuestControl.dll\0" VALUE "ProductName", VBOX_PRODUCT "\0" - VALUE "ProductVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD ".r" VBOX_SVN_REV "\0" + VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR END END Index: /trunk/src/VBox/HostServices/GuestProperties/VBoxGuestPropSvc.rc =================================================================== --- /trunk/src/VBox/HostServices/GuestProperties/VBoxGuestPropSvc.rc (revision 55770) +++ /trunk/src/VBox/HostServices/GuestProperties/VBoxGuestPropSvc.rc (revision 55771) @@ -22,6 +22,6 @@ VS_VERSION_INFO VERSIONINFO - FILEVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 - PRODUCTVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 + FILEVERSION VBOX_RC_FILE_VERSION + PRODUCTVERSION VBOX_RC_FILE_VERSION FILEFLAGSMASK VS_FFI_FILEFLAGSMASK FILEFLAGS 0x0L @@ -36,10 +36,10 @@ VALUE "CompanyName", VBOX_RC_COMPANY_NAME VALUE "FileDescription", "VirtualBox Guest Properties Service\0" - VALUE "FileVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD "." VBOX_SVN_REV "\0" + VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR VALUE "InternalName", "VBoxGuestPropSvc\0" VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT VALUE "OriginalFilename", "VBoxGuestPropSvc.dll\0" VALUE "ProductName", VBOX_PRODUCT "\0" - VALUE "ProductVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD ".r" VBOX_SVN_REV "\0" + VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR END END Index: /trunk/src/VBox/HostServices/HostChannel/VBoxHostChannel.rc =================================================================== --- /trunk/src/VBox/HostServices/HostChannel/VBoxHostChannel.rc (revision 55770) +++ /trunk/src/VBox/HostServices/HostChannel/VBoxHostChannel.rc (revision 55771) @@ -22,6 +22,6 @@ VS_VERSION_INFO VERSIONINFO - FILEVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 - PRODUCTVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 + FILEVERSION VBOX_RC_FILE_VERSION + PRODUCTVERSION VBOX_RC_FILE_VERSION FILEFLAGSMASK VS_FFI_FILEFLAGSMASK FILEFLAGS 0x0L @@ -36,10 +36,10 @@ VALUE "CompanyName", VBOX_RC_COMPANY_NAME VALUE "FileDescription", "VirtualBox Host Channel Service\0" - VALUE "FileVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD "." VBOX_SVN_REV "\0" + VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR VALUE "InternalName", "VBoxHostChannel\0" VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT VALUE "OriginalFilename", "VBoxHostChannel.dll\0" VALUE "ProductName", VBOX_PRODUCT "\0" - VALUE "ProductVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD ".r" VBOX_SVN_REV "\0" + VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR END END Index: /trunk/src/VBox/HostServices/SharedClipboard/VBoxSharedClipboard.rc =================================================================== --- /trunk/src/VBox/HostServices/SharedClipboard/VBoxSharedClipboard.rc (revision 55770) +++ /trunk/src/VBox/HostServices/SharedClipboard/VBoxSharedClipboard.rc (revision 55771) @@ -22,6 +22,6 @@ VS_VERSION_INFO VERSIONINFO - FILEVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 - PRODUCTVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 + FILEVERSION VBOX_RC_FILE_VERSION + PRODUCTVERSION VBOX_RC_FILE_VERSION FILEFLAGSMASK VS_FFI_FILEFLAGSMASK FILEFLAGS 0x0L @@ -36,10 +36,10 @@ VALUE "CompanyName", VBOX_RC_COMPANY_NAME VALUE "FileDescription", "VirtualBox Shared Clipboard Host Service\0" - VALUE "FileVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD "." VBOX_SVN_REV "\0" + VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR VALUE "InternalName", "VBoxSharedClipboard\0" VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT VALUE "OriginalFilename", "VBoxSharedClipboard.dll\0" VALUE "ProductName", VBOX_PRODUCT "\0" - VALUE "ProductVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD ".r" VBOX_SVN_REV "\0" + VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR END END Index: /trunk/src/VBox/HostServices/SharedFolders/VBoxSharedFolders.rc =================================================================== --- /trunk/src/VBox/HostServices/SharedFolders/VBoxSharedFolders.rc (revision 55770) +++ /trunk/src/VBox/HostServices/SharedFolders/VBoxSharedFolders.rc (revision 55771) @@ -22,6 +22,6 @@ VS_VERSION_INFO VERSIONINFO - FILEVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 - PRODUCTVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 + FILEVERSION VBOX_RC_FILE_VERSION + PRODUCTVERSION VBOX_RC_FILE_VERSION FILEFLAGSMASK VS_FFI_FILEFLAGSMASK FILEFLAGS 0x0L @@ -36,10 +36,10 @@ VALUE "CompanyName", VBOX_RC_COMPANY_NAME VALUE "FileDescription", "VirtualBox Shared Folders Host Service\0" - VALUE "FileVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD "." VBOX_SVN_REV "\0" + VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR VALUE "InternalName", "VBoxSharedFolders\0" VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT VALUE "OriginalFilename", "VBoxSharedFolders.dll\0" VALUE "ProductName", VBOX_PRODUCT "\0" - VALUE "ProductVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD ".r" VBOX_SVN_REV "\0" + VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR END END Index: /trunk/src/VBox/HostServices/SharedOpenGL/OpenGLTest/VBoxTestOGL.rc =================================================================== --- /trunk/src/VBox/HostServices/SharedOpenGL/OpenGLTest/VBoxTestOGL.rc (revision 55770) +++ /trunk/src/VBox/HostServices/SharedOpenGL/OpenGLTest/VBoxTestOGL.rc (revision 55771) @@ -22,6 +22,6 @@ VS_VERSION_INFO VERSIONINFO - FILEVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 - PRODUCTVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 + FILEVERSION VBOX_RC_FILE_VERSION + PRODUCTVERSION VBOX_RC_FILE_VERSION FILEFLAGSMASK VS_FFI_FILEFLAGSMASK FILEFLAGS 0x0L @@ -36,10 +36,10 @@ VALUE "CompanyName", VBOX_RC_COMPANY_NAME VALUE "FileDescription", "VirtualBox OpenGL Test Tool\0" - VALUE "FileVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD "." VBOX_SVN_REV "\0" + VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR VALUE "InternalName", "VBoxTestOGL\0" VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT VALUE "OriginalFilename", "VBoxTestOGL.exe\0" VALUE "ProductName", VBOX_PRODUCT "\0" - VALUE "ProductVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD ".r" VBOX_SVN_REV "\0" + VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR END END Index: /trunk/src/VBox/HostServices/SharedOpenGL/crserver/VBoxSharedCrOpenGL.rc =================================================================== --- /trunk/src/VBox/HostServices/SharedOpenGL/crserver/VBoxSharedCrOpenGL.rc (revision 55770) +++ /trunk/src/VBox/HostServices/SharedOpenGL/crserver/VBoxSharedCrOpenGL.rc (revision 55771) @@ -22,6 +22,6 @@ VS_VERSION_INFO VERSIONINFO - FILEVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 - PRODUCTVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 + FILEVERSION VBOX_RC_FILE_VERSION + PRODUCTVERSION VBOX_RC_FILE_VERSION FILEFLAGSMASK VS_FFI_FILEFLAGSMASK FILEFLAGS 0x0L @@ -36,10 +36,10 @@ VALUE "CompanyName", VBOX_RC_COMPANY_NAME VALUE "FileDescription", "VirtualBox crOpenGL Host Service\0" - VALUE "FileVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD "." VBOX_SVN_REV "\0" + VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR VALUE "InternalName", "VBoxSharedCrOpenGL\0" VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT VALUE "OriginalFilename", "VBoxSharedCrOpenGL.dll\0" VALUE "ProductName", VBOX_PRODUCT "\0" - VALUE "ProductVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD ".r" VBOX_SVN_REV "\0" + VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR END END Index: /trunk/src/VBox/HostServices/SharedOpenGL/render/VBoxOGLrenderspu.rc =================================================================== --- /trunk/src/VBox/HostServices/SharedOpenGL/render/VBoxOGLrenderspu.rc (revision 55770) +++ /trunk/src/VBox/HostServices/SharedOpenGL/render/VBoxOGLrenderspu.rc (revision 55771) @@ -22,6 +22,6 @@ VS_VERSION_INFO VERSIONINFO - FILEVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 - PRODUCTVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 + FILEVERSION VBOX_RC_FILE_VERSION + PRODUCTVERSION VBOX_RC_FILE_VERSION FILEFLAGSMASK VS_FFI_FILEFLAGSMASK FILEFLAGS 0x0L @@ -36,10 +36,10 @@ VALUE "CompanyName", VBOX_RC_COMPANY_NAME VALUE "FileDescription", "VirtualBox crOpenGL ICD\0" - VALUE "FileVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD "." VBOX_SVN_REV "\0" + VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR VALUE "InternalName", "VBoxOGLrenderspu\0" VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT VALUE "OriginalFilename", "VBoxOGLrenderspu.dll\0" VALUE "ProductName", VBOX_PRODUCT "\0" - VALUE "ProductVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD ".r" VBOX_SVN_REV "\0" + VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR END END Index: /trunk/src/VBox/HostServices/auth/simple/VBoxAuthSimple.rc =================================================================== --- /trunk/src/VBox/HostServices/auth/simple/VBoxAuthSimple.rc (revision 55770) +++ /trunk/src/VBox/HostServices/auth/simple/VBoxAuthSimple.rc (revision 55771) @@ -22,6 +22,6 @@ VS_VERSION_INFO VERSIONINFO - FILEVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 - PRODUCTVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 + FILEVERSION VBOX_RC_FILE_VERSION + PRODUCTVERSION VBOX_RC_FILE_VERSION FILEFLAGSMASK VS_FFI_FILEFLAGSMASK FILEFLAGS 0x0L @@ -36,10 +36,10 @@ VALUE "CompanyName", VBOX_RC_COMPANY_NAME VALUE "FileDescription", "VirtualBox Simple Authentication Host Service\0" - VALUE "FileVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD "." VBOX_SVN_REV "\0" + VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR VALUE "InternalName", "VBoxAuthSimple\0" VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT VALUE "OriginalFilename", "VBoxAuthSimple.dll\0" VALUE "ProductName", VBOX_PRODUCT "\0" - VALUE "ProductVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD ".r" VBOX_SVN_REV "\0" + VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR END END Index: /trunk/src/VBox/HostServices/auth/winlogon/VBoxAuth.rc =================================================================== --- /trunk/src/VBox/HostServices/auth/winlogon/VBoxAuth.rc (revision 55770) +++ /trunk/src/VBox/HostServices/auth/winlogon/VBoxAuth.rc (revision 55771) @@ -22,6 +22,6 @@ VS_VERSION_INFO VERSIONINFO - FILEVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 - PRODUCTVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 + FILEVERSION VBOX_RC_FILE_VERSION + PRODUCTVERSION VBOX_RC_FILE_VERSION FILEFLAGSMASK VS_FFI_FILEFLAGSMASK FILEFLAGS 0x0L @@ -36,10 +36,10 @@ VALUE "CompanyName", VBOX_RC_COMPANY_NAME VALUE "FileDescription", "VirtualBox Authentication Host Service\0" - VALUE "FileVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD "." VBOX_SVN_REV "\0" + VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR VALUE "InternalName", "VBoxAuth\0" VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT VALUE "OriginalFilename", "VBoxAuth.dll\0" VALUE "ProductName", VBOX_PRODUCT "\0" - VALUE "ProductVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD ".r" VBOX_SVN_REV "\0" + VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR END END Index: /trunk/src/VBox/Installer/win/InstallHelper/VBoxInstallHelper.rc =================================================================== --- /trunk/src/VBox/Installer/win/InstallHelper/VBoxInstallHelper.rc (revision 55770) +++ /trunk/src/VBox/Installer/win/InstallHelper/VBoxInstallHelper.rc (revision 55771) @@ -22,6 +22,6 @@ VS_VERSION_INFO VERSIONINFO - FILEVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 - PRODUCTVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 + FILEVERSION VBOX_RC_FILE_VERSION + PRODUCTVERSION VBOX_RC_FILE_VERSION FILEFLAGSMASK VS_FFI_FILEFLAGSMASK FILEFLAGS 0x0L @@ -36,10 +36,10 @@ VALUE "CompanyName", VBOX_RC_COMPANY_NAME VALUE "FileDescription", "VirtualBox Installation Helper\0" - VALUE "FileVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD "." VBOX_SVN_REV "\0" + VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR VALUE "InternalName", "VBoxInstallHelper\0" VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT VALUE "OriginalFilename", "VBoxInstallHelper.dll\0" VALUE "ProductName", VBOX_PRODUCT "\0" - VALUE "ProductVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD ".r" VBOX_SVN_REV "\0" + VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR END END Index: /trunk/src/VBox/Installer/win/Resources/VBoxRes.rc =================================================================== --- /trunk/src/VBox/Installer/win/Resources/VBoxRes.rc (revision 55770) +++ /trunk/src/VBox/Installer/win/Resources/VBoxRes.rc (revision 55771) @@ -23,6 +23,6 @@ VS_VERSION_INFO VERSIONINFO - FILEVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 - PRODUCTVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 + FILEVERSION VBOX_RC_FILE_VERSION + PRODUCTVERSION VBOX_RC_FILE_VERSION FILEFLAGSMASK 0x3fL FILEFLAGS 0x0L @@ -37,10 +37,10 @@ VALUE "CompanyName", VBOX_RC_COMPANY_NAME VALUE "FileDescription", "VirtualBox Resources\0" - VALUE "FileVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD "." VBOX_SVN_REV "\0" + VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR VALUE "InternalName", "VBoxRes\0" VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT VALUE "OriginalFilename", "VBoxRes.dll\0" VALUE "ProductName", VBOX_PRODUCT "\0" - VALUE "ProductVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD ".r" VBOX_SVN_REV "\0" + VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR END END Index: /trunk/src/VBox/Installer/win/Stub/VBoxStub.rc =================================================================== --- /trunk/src/VBox/Installer/win/Stub/VBoxStub.rc (revision 55770) +++ /trunk/src/VBox/Installer/win/Stub/VBoxStub.rc (revision 55771) @@ -23,6 +23,6 @@ VS_VERSION_INFO VERSIONINFO - FILEVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 - PRODUCTVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 + FILEVERSION VBOX_RC_FILE_VERSION + PRODUCTVERSION VBOX_RC_FILE_VERSION FILEFLAGSMASK 0x3fL FILEFLAGS 0x0L @@ -37,10 +37,10 @@ VALUE "CompanyName", VBOX_RC_COMPANY_NAME VALUE "FileDescription", "VirtualBox\0" - VALUE "FileVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD "." VBOX_SVN_REV "\0" + VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR VALUE "InternalName", "VirtualBox\0" VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT VALUE "OriginalFilename", "VirtualBox.exe\0" VALUE "ProductName", VBOX_PRODUCT "\0" - VALUE "ProductVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD ".r" VBOX_SVN_REV "\0" + VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR END END Index: /trunk/src/VBox/Main/cbinding/VBoxCAPI.rc =================================================================== --- /trunk/src/VBox/Main/cbinding/VBoxCAPI.rc (revision 55770) +++ /trunk/src/VBox/Main/cbinding/VBoxCAPI.rc (revision 55771) @@ -22,6 +22,6 @@ VS_VERSION_INFO VERSIONINFO - FILEVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 - PRODUCTVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 + FILEVERSION VBOX_RC_FILE_VERSION + PRODUCTVERSION VBOX_RC_FILE_VERSION FILEFLAGSMASK VS_FFI_FILEFLAGSMASK FILEFLAGS 0x0L @@ -36,10 +36,10 @@ VALUE "CompanyName", VBOX_RC_COMPANY_NAME VALUE "FileDescription", "VirtualBox C Bindings\0" - VALUE "FileVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD "." VBOX_SVN_REV "\0" + VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR VALUE "InternalName", "VBoxCAPI\0" VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT VALUE "OriginalFilename", "VBoxCAPI.dll\0" VALUE "ProductName", VBOX_PRODUCT "\0" - VALUE "ProductVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD ".r" VBOX_SVN_REV "\0" + VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR END END Index: /trunk/src/VBox/Main/src-client/win/VBoxC.rc =================================================================== --- /trunk/src/VBox/Main/src-client/win/VBoxC.rc (revision 55770) +++ /trunk/src/VBox/Main/src-client/win/VBoxC.rc (revision 55771) @@ -22,6 +22,6 @@ VS_VERSION_INFO VERSIONINFO - FILEVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 - PRODUCTVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 + FILEVERSION VBOX_RC_FILE_VERSION + PRODUCTVERSION VBOX_RC_FILE_VERSION FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG @@ -40,10 +40,10 @@ VALUE "CompanyName", VBOX_RC_COMPANY_NAME VALUE "FileDescription", "VirtualBox Interface\0" - VALUE "FileVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD "." VBOX_SVN_REV "\0" + VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR VALUE "InternalName", "VBoxC\0" VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT VALUE "OriginalFilename", "VBoxC.dll\0" VALUE "ProductName", VBOX_PRODUCT "\0" - VALUE "ProductVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD ".r" VBOX_SVN_REV "\0" + VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR VALUE "OLESelfRegister", "\0" Index: /trunk/src/VBox/Main/src-client/win/VBoxClient-x86.rc =================================================================== --- /trunk/src/VBox/Main/src-client/win/VBoxClient-x86.rc (revision 55770) +++ /trunk/src/VBox/Main/src-client/win/VBoxClient-x86.rc (revision 55771) @@ -22,6 +22,6 @@ VS_VERSION_INFO VERSIONINFO - FILEVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 - PRODUCTVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 + FILEVERSION VBOX_RC_FILE_VERSION + PRODUCTVERSION VBOX_RC_FILE_VERSION FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG @@ -40,10 +40,10 @@ VALUE "CompanyName", VBOX_RC_COMPANY_NAME VALUE "FileDescription", "VirtualBox Interface (32-bit)\0" - VALUE "FileVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD "." VBOX_SVN_REV "\0" + VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR VALUE "InternalName", "VBoxClient-x86\0" VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT VALUE "OriginalFilename", "VBoxClient-x86.dll\0" VALUE "ProductName", VBOX_PRODUCT "\0" - VALUE "ProductVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD ".r" VBOX_SVN_REV "\0" + VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR VALUE "OLESelfRegister", "\0" Index: /trunk/src/VBox/Main/src-helper-apps/VBoxExtPackHelperApp.rc =================================================================== --- /trunk/src/VBox/Main/src-helper-apps/VBoxExtPackHelperApp.rc (revision 55770) +++ /trunk/src/VBox/Main/src-helper-apps/VBoxExtPackHelperApp.rc (revision 55771) @@ -22,6 +22,6 @@ VS_VERSION_INFO VERSIONINFO - FILEVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 - PRODUCTVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 + FILEVERSION VBOX_RC_FILE_VERSION + PRODUCTVERSION VBOX_RC_FILE_VERSION FILEFLAGSMASK VS_FFI_FILEFLAGSMASK FILEFLAGS 0x0L @@ -36,10 +36,10 @@ VALUE "CompanyName", VBOX_RC_COMPANY_NAME VALUE "FileDescription", "VirtualBox ExtPack Helper\0" - VALUE "FileVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD "." VBOX_SVN_REV "\0" + VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR VALUE "InternalName", "VBoxExtPackHelperApp\0" VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT VALUE "OriginalFilename", "VBoxExtPackHelperApp.exe\0" VALUE "ProductName", VBOX_PRODUCT "\0" - VALUE "ProductVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD ".r" VBOX_SVN_REV "\0" + VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR END END Index: /trunk/src/VBox/Main/src-server/win/VBoxSVC.rc =================================================================== --- /trunk/src/VBox/Main/src-server/win/VBoxSVC.rc (revision 55770) +++ /trunk/src/VBox/Main/src-server/win/VBoxSVC.rc (revision 55771) @@ -22,6 +22,6 @@ VS_VERSION_INFO VERSIONINFO - FILEVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 - PRODUCTVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 + FILEVERSION VBOX_RC_FILE_VERSION + PRODUCTVERSION VBOX_RC_FILE_VERSION FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG @@ -40,10 +40,10 @@ VALUE "CompanyName", VBOX_RC_COMPANY_NAME VALUE "FileDescription", "VirtualBox Interface\0" - VALUE "FileVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD "." VBOX_SVN_REV "\0" + VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR VALUE "InternalName", "VBoxSVC\0" VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT VALUE "OriginalFilename", "VBoxSVC.exe\0" VALUE "ProductName", VBOX_PRODUCT "\0" - VALUE "ProductVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD ".r" VBOX_SVN_REV "\0" + VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR VALUE "OLESelfRegister", "\0" Index: /trunk/src/VBox/Main/webservice/VBoxWebSrv.rc =================================================================== --- /trunk/src/VBox/Main/webservice/VBoxWebSrv.rc (revision 55770) +++ /trunk/src/VBox/Main/webservice/VBoxWebSrv.rc (revision 55771) @@ -22,6 +22,6 @@ VS_VERSION_INFO VERSIONINFO - FILEVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 - PRODUCTVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 + FILEVERSION VBOX_RC_FILE_VERSION + PRODUCTVERSION VBOX_RC_FILE_VERSION FILEFLAGSMASK VS_FFI_FILEFLAGSMASK FILEFLAGS 0x0L @@ -36,10 +36,10 @@ VALUE "CompanyName", VBOX_RC_COMPANY_NAME VALUE "FileDescription", "VirtualBox Web Service\0" - VALUE "FileVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD "." VBOX_SVN_REV "\0" + VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR VALUE "InternalName", "VBoxWebSrv\0" VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT VALUE "OriginalFilename", "VBoxWebSrv.exe\0" VALUE "ProductName", VBOX_PRODUCT "\0" - VALUE "ProductVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD ".r" VBOX_SVN_REV "\0" + VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR END END Index: /trunk/src/VBox/NetworkServices/DHCP/VBoxNetDHCP.rc =================================================================== --- /trunk/src/VBox/NetworkServices/DHCP/VBoxNetDHCP.rc (revision 55770) +++ /trunk/src/VBox/NetworkServices/DHCP/VBoxNetDHCP.rc (revision 55771) @@ -22,6 +22,6 @@ VS_VERSION_INFO VERSIONINFO - FILEVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 - PRODUCTVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 + FILEVERSION VBOX_RC_FILE_VERSION + PRODUCTVERSION VBOX_RC_FILE_VERSION FILEFLAGSMASK VS_FFI_FILEFLAGSMASK FILEFLAGS 0x0L @@ -36,10 +36,10 @@ VALUE "CompanyName", VBOX_RC_COMPANY_NAME VALUE "FileDescription", "VirtualBox DHCP Server\0" - VALUE "FileVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD "." VBOX_SVN_REV "\0" + VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR VALUE "InternalName", "VBoxNetDHCP\0" VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT VALUE "OriginalFilename", "VBoxNetDHCP.dll\0" VALUE "ProductName", VBOX_PRODUCT "\0" - VALUE "ProductVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD ".r" VBOX_SVN_REV "\0" + VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR END END Index: /trunk/src/VBox/NetworkServices/NAT/VBoxNetNAT.rc =================================================================== --- /trunk/src/VBox/NetworkServices/NAT/VBoxNetNAT.rc (revision 55770) +++ /trunk/src/VBox/NetworkServices/NAT/VBoxNetNAT.rc (revision 55771) @@ -22,6 +22,6 @@ VS_VERSION_INFO VERSIONINFO - FILEVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 - PRODUCTVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 + FILEVERSION VBOX_RC_FILE_VERSION + PRODUCTVERSION VBOX_RC_FILE_VERSION FILEFLAGSMASK VS_FFI_FILEFLAGSMASK FILEFLAGS 0x0L @@ -36,10 +36,10 @@ VALUE "CompanyName", VBOX_RC_COMPANY_NAME VALUE "FileDescription", "VirtualBox NAT Engine\0" - VALUE "FileVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD "." VBOX_SVN_REV "\0" + VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR VALUE "InternalName", "VBoxNetNAT\0" VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT VALUE "OriginalFilename", "VBoxNetNAT.dll\0" VALUE "ProductName", VBOX_PRODUCT "\0" - VALUE "ProductVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD ".r" VBOX_SVN_REV "\0" + VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR END END Index: /trunk/src/VBox/Runtime/r3/win/VBoxRT.rc =================================================================== --- /trunk/src/VBox/Runtime/r3/win/VBoxRT.rc (revision 55770) +++ /trunk/src/VBox/Runtime/r3/win/VBoxRT.rc (revision 55771) @@ -31,6 +31,6 @@ VS_VERSION_INFO VERSIONINFO - FILEVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 - PRODUCTVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 + FILEVERSION VBOX_RC_FILE_VERSION + PRODUCTVERSION VBOX_RC_FILE_VERSION FILEFLAGSMASK VS_FFI_FILEFLAGSMASK FILEFLAGS 0x0L @@ -45,10 +45,10 @@ VALUE "CompanyName", VBOX_RC_COMPANY_NAME VALUE "FileDescription", "VirtualBox Runtime\0" - VALUE "FileVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD "." VBOX_SVN_REV "\0" + VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR VALUE "InternalName", "VBoxRT\0" VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT VALUE "OriginalFilename", "VBoxRT.dll\0" VALUE "ProductName", VBOX_PRODUCT "\0" - VALUE "ProductVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD ".r" VBOX_SVN_REV "\0" + VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR END END Index: /trunk/src/VBox/Storage/testcase/vbox-img.rc =================================================================== --- /trunk/src/VBox/Storage/testcase/vbox-img.rc (revision 55770) +++ /trunk/src/VBox/Storage/testcase/vbox-img.rc (revision 55771) @@ -22,6 +22,6 @@ VS_VERSION_INFO VERSIONINFO - FILEVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 - PRODUCTVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 + FILEVERSION VBOX_RC_FILE_VERSION + PRODUCTVERSION VBOX_RC_FILE_VERSION FILEFLAGSMASK VS_FFI_FILEFLAGSMASK FILEFLAGS 0x0L @@ -36,10 +36,10 @@ VALUE "CompanyName", VBOX_RC_COMPANY_NAME VALUE "FileDescription", "VirtualBox Virtual Disk Utility\0" - VALUE "FileVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD "." VBOX_SVN_REV "\0" + VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR VALUE "InternalName", "vbox-img\0" VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT VALUE "OriginalFilename", "vbox-img.exe\0" VALUE "ProductName", VBOX_PRODUCT "\0" - VALUE "ProductVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD ".r" VBOX_SVN_REV "\0" + VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR END END Index: /trunk/src/VBox/VMM/VMMR3/VMMR3.rc =================================================================== --- /trunk/src/VBox/VMM/VMMR3/VMMR3.rc (revision 55770) +++ /trunk/src/VBox/VMM/VMMR3/VMMR3.rc (revision 55771) @@ -22,6 +22,6 @@ VS_VERSION_INFO VERSIONINFO - FILEVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 - PRODUCTVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 + FILEVERSION VBOX_RC_FILE_VERSION + PRODUCTVERSION VBOX_RC_FILE_VERSION FILEFLAGSMASK VS_FFI_FILEFLAGSMASK FILEFLAGS 0x0L @@ -36,10 +36,10 @@ VALUE "CompanyName", VBOX_RC_COMPANY_NAME VALUE "FileDescription", "VirtualBox VMM\0" - VALUE "FileVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD "." VBOX_SVN_REV "\0" + VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR VALUE "InternalName", "VBoxVMM\0" VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT VALUE "OriginalFilename", "VBoxVMM.dll\0" VALUE "ProductName", VBOX_PRODUCT "\0" - VALUE "ProductVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD ".r" VBOX_SVN_REV "\0" + VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR END END Index: /trunk/src/recompiler/Makefile.kmk =================================================================== --- /trunk/src/recompiler/Makefile.kmk (revision 55770) +++ /trunk/src/recompiler/Makefile.kmk (revision 55771) @@ -323,8 +323,5 @@ $(QUIET)$(REDIRECT) -E 'COMSPEC=$(VBOX_GOOD_COMSPEC_BS)' -- $(TOOL_MINGWW64_PREFIX)windres \ $(addprefix -I,$(INCS) $(PATH_SDK_$(VBOX_WINPSDK)_INC) $(PATH_TOOL_$(VBOX_VCC_TOOL)_INC)) \ - -DVBOX_VERSION_MAJOR_NR=$(VBOX_VERSION_MAJOR) \ - -DVBOX_VERSION_MINOR_NR=$(VBOX_VERSION_MINOR) \ - -DVBOX_VERSION_BUILD_NR=$(VBOX_VERSION_BUILD) \ - -DVBOX_SVN_REV_NR=$(VBOX_SVN_REV) $< $@ + -DVBOX_SVN_REV=$(VBOX_SVN_REV) -DIN_RING3 $< $@ # Index: /trunk/src/recompiler/VBoxREM.rc =================================================================== --- /trunk/src/recompiler/VBoxREM.rc (revision 55770) +++ /trunk/src/recompiler/VBoxREM.rc (revision 55771) @@ -19,13 +19,9 @@ #include -/* stupid windres! */ -#define RT_STR(x) #x -#define RT_XSTR(x) RT_STR(x) - LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US VS_VERSION_INFO VERSIONINFO - FILEVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 - PRODUCTVERSION VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0 + FILEVERSION VBOX_RC_FILE_VERSION + PRODUCTVERSION VBOX_RC_PRODUCT_VERSION FILEFLAGSMASK VS_FFI_FILEFLAGSMASK FILEFLAGS 0x0L @@ -38,12 +34,12 @@ BLOCK "040904b0" // Lang=US English, CharSet=Unicode BEGIN + VALUE "FileDescription", "VirtualBox Recompiler\0" + VALUE "InternalName", "VBoxREM\0" + VALUE "OriginalFilename", "VBoxREM.dll\0" VALUE "CompanyName", VBOX_RC_COMPANY_NAME - VALUE "FileDescription", "VirtualBox Recompiler\0" - VALUE "FileVersion", RT_XSTR(VBOX_VERSION_MAJOR_NR) "." RT_XSTR(VBOX_VERSION_MINOR_NR) "." RT_XSTR(VBOX_VERSION_BUILD_NR) "." RT_XSTR(VBOX_SVN_REV_NR) "\0" - VALUE "InternalName", "VBoxREM\0" + VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT - VALUE "OriginalFilename", "VBoxREM.dll\0" VALUE "ProductName", VBOX_PRODUCT "\0" - VALUE "ProductVersion", RT_XSTR(VBOX_VERSION_MAJOR_NR) "." RT_XSTR(VBOX_VERSION_MINOR_NR) "." RT_XSTR(VBOX_VERSION_BUILD_NR) ".r" RT_XSTR(VBOX_SVN_REV_NR) "\0" + VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR END END