Changeset 55771 in vbox for trunk/src/VBox/Main/src-client/win

Timestamp:

May 8, 2015 8:17:50 PM (10 years ago)

Author:

vboxsync

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

100197

Message:

Use defines in the RC files and make those defines compatible with what we use in C/C++ code.

Location:

trunk/src/VBox/Main/src-client/win

Files:

• VBoxC.rc (modified) (2 diffs)
• VBoxClient-x86.rc (modified) (2 diffs)

trunk/src/VBox/Main/src-client/win/VBoxC.rc

@@ -22 +22 @@
 
 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 +40 @@
       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"

trunk/src/VBox/Main/src-client/win/VBoxClient-x86.rc

@@ -22 +22 @@
 
 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 +40 @@
       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"