Changeset 37016 in vbox for trunk/src/VBox

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

Files:

• Additions/WINNT/Installer/Makefile.kmk (modified) (2 diffs)
• Additions/WINNT/Installer/VBoxGuestAdditions.nsi (modified) (1 diff)
• Additions/common/VBoxGuestLib/VBoxGuestR3LibAdditions.cpp (modified) (2 diffs)
• Installer/win/Makefile.kmk (modified) (3 diffs)
• Installer/win/VBoxKey.wxi (modified) (1 diff)
• Installer/win/VirtualBox.wxs (modified) (3 diffs)
• Main/src-client/ConsoleImpl2.cpp (modified) (2 diffs)
• Runtime/testcase/tstRTStrVersion.cpp (modified) (3 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;

trunk/src/VBox/Installer/win/Makefile.kmk

@@ -5 +5 @@
 
 #
-# Copyright (C) 2006-2010 Oracle Corporation
+# Copyright (C) 2006-2011 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
@@ -356 +356 @@
                 -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_INST=$(VBOX_VERSION_MAJOR)' \
                 -E 'VBOX_VERSION_MINOR_INST=$(VBOX_VERSION_MINOR)' \
@@ -427 +428 @@
 #
 $(VBOX_WIN_INST_OUT_DIR)/VBoxKey.wxi: $(PATH_SUB_CURRENT)/VBoxKey.wxi $(VBOX_VERSION_STAMP) | $$(dir $$@)
-        $(SED) -e 's/%VER%/$(VBOX_VERSION_STRING)/' --output $@ $<
+        $(SED) -e 's/%VER%/$(VBOX_VERSION_STRING_RAW)/' --output $@ $<
+        $(SED) -e 's/%VER_EXT%/$(VBOX_VERSION_STRING)/' --output $@ $<
 
 #

trunk/src/VBox/Installer/win/VBoxKey.wxi

@@ -1 +1 @@
 <Include>
     <Registry Root="HKLM" Key="$(var.Property_RegKey)" Name="Version" Value="%VER%" Type="string" />
+    <Registry Root="HKLM" Key="$(var.Property_RegKey)" Name="VersionExt" Value="%VER_EXT%" Type="string" />
     <Registry Root="HKLM" Key="$(var.Property_RegKey)" Name="InstallDir" Value="[INSTALLDIR]" Type="string" />
 </Include>

trunk/src/VBox/Installer/win/VirtualBox.wxs

@@ -3 +3 @@
     VirtualBox Windows Installation Script (WiX)
 
-    Copyright (C) 2006-2010 Oracle Corporation
+    Copyright (C) 2006-2011 Oracle Corporation
 
     This file is part of VirtualBox Open Source Edition (OSE), as
@@ -15 +15 @@
 
 <?define Property_RegKey ="Software\$(env.VBOX_VENDOR_SHORT)\VirtualBox" ?>
-<?define Property_Version = "$(env.VBOX_VERSION_STRING)" ?>
+<?define Property_Version = "$(env.VBOX_VERSION_STRING_RAW)" ?>
+<?define Property_VersionExt = "$(env.VBOX_VERSION_STRING)" ?>
 <?define Property_Upgrade = "yes" ?>
 
@@ -74 +75 @@
         <!-- Package GUIDs must be different for each package. The "???" directs WiX to create one. -->
         <Package Id="????????-????-????-????-????????????" Keywords="Installer"
-                 Description="$(env.VBOX_PRODUCT) $(var.Property_Version) installation package"
+                 Description="$(env.VBOX_PRODUCT) $(var.Property_VersionExt) installation package"
                  Comments="$(env.VBOX_PRODUCT) installation package"
                  Manufacturer="$(env.VBOX_VENDOR)"

trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp

@@ -10 +10 @@
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2011 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -4675 +4675 @@
          * will override them.
          */
-        /* Set the VBox version string as a guest property */
+        /* Set the raw VBox version string as a guest property. Used for host/guest
+         * version comparison. */
         configSetProperty(pConsole->m_pVMMDev, "/VirtualBox/HostInfo/VBoxVer",
+                          VBOX_VERSION_STRING_RAW, "TRANSIENT, RDONLYGUEST");
+        /* Set the full VBox version string as a guest property. Can contain vendor-specific
+         * information/branding and/or pre-release tags. */
+        configSetProperty(pConsole->m_pVMMDev, "/VirtualBox/HostInfo/VBoxVerExt",
                           VBOX_VERSION_STRING, "TRANSIENT, RDONLYGUEST");
         /* Set the VBox SVN revision as a guest property */

trunk/src/VBox/Runtime/testcase/tstRTStrVersion.cpp

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2009 Oracle Corporation
+ * Copyright (C) 2011 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -97 +97 @@
         { "3.1.0_BETA2-r12345",         "3.1.0_BETA1-r12345",                1 },
         { "3.1.0_BETA2-r12345",         "3.1.0_BETA999-r12345",             -1 },
-        { "3.1.0_BETA2",                "3.1.0_ABC",                        -1 }, /* ABC isn't indicating a prerelease, BETA does */
+        { "3.1.0_BETA2",                "3.1.0_ABC",                        -1 }, /* ABC isn't indicating a prerelease, BETA does. */
         { "3.1.0_BETA",                 "3.1.0_ATEB",                       -1 },
         { "4.0.0_ALPHAr68482",          "4.0.0_ALPHAr68483",                -1 },
@@ -106 +106 @@
         { "4.0.0_ALPHAr68483",          "4.0.0_BETA2r68783",                -1 },
         { "4.0.0_ALPHAr68483",          "4.0.0_BETA2r68784",                -1 },
+        { "4.0.6",                      "4.0.6_Ubuntu",                     -1 }, /* Without stripped guest OS string (Ubuntu). */
+        { "4.0.6_Windows",              "4.0.6",                             1 }  /* Without stripped guest OS string (Windows). */
     };
     for (unsigned iTest = 0; iTest < RT_ELEMENTS(aTests); iTest++)