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

Timestamp:

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

Author:

vboxsync

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

71631

Message:

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

Location:

trunk/src/VBox/Installer/win

Files:

• Makefile.kmk (modified) (3 diffs)
• VBoxKey.wxi (modified) (1 diff)
• VirtualBox.wxs (modified) (3 diffs)

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)"