Changeset 37016 in vbox for trunk/src/VBox/Additions

Timestamp:

May 9, 2011 5:48:43 PM (14 years ago)

Author:

vboxsync

Message:

Added VBOX_VERSION_STRING_RAW to only handle/store the pure VBox version without any suffixes. Fixes bug #8844.

Location:

trunk/src/VBox/Additions

Files:

• WINNT/Installer/Makefile.kmk (modified) (2 diffs)
• WINNT/Installer/VBoxGuestAdditions.nsi (modified) (1 diff)
• common/VBoxGuestLib/VBoxGuestR3LibAdditions.cpp (modified) (2 diffs)

trunk/src/VBox/Additions/WINNT/Installer/Makefile.kmk

@@ -5 +5 @@
 
 #
-# Copyright (C) 2006-2007 Oracle Corporation
+# Copyright (C) 2006-2011 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
@@ -172 +172 @@
         -E 'VBOX_C_YEAR=$(VBOX_C_YEAR)' \
         -E 'VBOX_VERSION_STRING=$(VBOX_VERSION_STRING)' \
+        -E 'VBOX_VERSION_STRING_RAW=$(VBOX_VERSION_STRING_RAW)' \
         -E 'VBOX_VERSION_MAJOR=$(VBOX_VERSION_MAJOR)' \
         -E 'VBOX_VERSION_MINOR=$(VBOX_VERSION_MINOR)' \

trunk/src/VBox/Additions/WINNT/Installer/VBoxGuestAdditions.nsi

@@ -675 +675 @@
 
   ; Write a registry key with version and installation path for later lookup
-  WriteRegStr HKLM "${PRODUCT_INSTALL_KEY}" "Version" "$%VBOX_VERSION_STRING%"
+  WriteRegStr HKLM "${PRODUCT_INSTALL_KEY}" "Version" "$%VBOX_VERSION_STRING_RAW%"
+  WriteRegStr HKLM "${PRODUCT_INSTALL_KEY}" "VersionExt" "$%VBOX_VERSION_STRING%"
   WriteRegStr HKLM "${PRODUCT_INSTALL_KEY}" "Revision" "$%VBOX_SVN_REV%"
   WriteRegStr HKLM "${PRODUCT_INSTALL_KEY}" "InstallDir" "$INSTDIR"

trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibAdditions.cpp

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2007-2010 Oracle Corporation
+ * Copyright (C) 2007-2011 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -43 +43 @@
     if (ppszVer)
     {
-        *ppszVer = RTStrDup(VBOX_VERSION_STRING);
+        *ppszVer = RTStrDup(VBOX_VERSION_STRING_RAW);
         if (!*ppszVer)
             return VERR_NO_STR_MEMORY;