Changeset 58565 in vbox for trunk/src/VBox/Installer/win

Timestamp:

Nov 4, 2015 2:02:02 PM (9 years ago)

Author:

vboxsync

Message:

Windows host installer: Reverted experiment from r103894 -- not needed.

Location:

trunk/src/VBox/Installer/win

Files:

• UserInterface.wxi (modified) (1 diff)
• VirtualBox.wxs (modified) (1 diff)

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

@@ -394 +394 @@
                  Also see: http://osdir.com/ml/windows.devel.wix.user/2005-02/msg00300.html -->
             <Control Id="DesktopShortcutCheckBox" Type="CheckBox" X="25" Y="95" Width="200" Height="17"
-                     Property="VBOXINSTALLDESKTOPSHORTCUT" CheckBoxValue="1" Default="no">
+                     Property="VBOX_INSTALLDESKTOPSHORTCUT" CheckBoxValue="1" Default="no">
                 <Text>!(loc.Customize2Dlg_CreateShortcut)</Text>
             </Control>
             <Control Id="QuicklaunchShortcutCheckBox" Type="CheckBox" X="25" Y="115" Width="200" Height="17"
-                     Property="VBOXINSTALLQUICKLAUNCHSHORTCUT" CheckBoxValue="1" Default="no">
+                     Property="VBOX_INSTALLQUICKLAUNCHSHORTCUT" CheckBoxValue="1" Default="no">
                 <Text>!(loc.Customize2Dlg_CreateQuickLaunch)</Text>
             </Control>
             <Control Id="RegisterFileExtensionsCheckBox" Type="CheckBox" X="25" Y="135" Width="200" Height="17"
-                     Property="VBOXREGISTERFILEEXTENSIONS" CheckBoxValue="1" Default="no">
+                     Property="VBOX_REGISTERFILEEXTENSIONS" CheckBoxValue="1" Default="no">
                 <Text>!(loc.Customize2Dlg_RegisterFileExtensions)</Text>
             </Control>

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

@@ -76 +76 @@
 
     <!-- Whether or not a desktop shortcut should be created. -->
-    <Property Id="VBOXINSTALLDESKTOPSHORTCUT" Value="1" Secure="yes"/>
-    <SetProperty Id="VBOXINSTALLDESKTOPSHORTCUT" After="AppSearch" Sequence="both"
-                 Value="{}"><![CDATA[VBOXINSTALLDESKTOPSHORTCUT="0"]]></SetProperty>
+    <Property Id="VBOX_INSTALLDESKTOPSHORTCUT" Value="1" Secure="yes"/>
+    <SetProperty Id="VBOX_INSTALLDESKTOPSHORTCUT" After="AppSearch" Sequence="both"
+                 Value="{}"><![CDATA[VBOX_INSTALLDESKTOPSHORTCUT="0"]]></SetProperty>
 
     <!-- Whether or not a desktop shortcut for the Quick Launch Bar should be created -->
-    <Property Id="VBOXINSTALLQUICKLAUNCHSHORTCUT" Value="1" Secure="yes"/>
-    <SetProperty Id="VBOXINSTALLQUICKLAUNCHSHORTCUT" After="AppSearch" Sequence="both"
-                 Value="{}"><![CDATA[VBOXINSTALLQUICKLAUNCHSHORTCUT="0"]]></SetProperty>
+    <Property Id="VBOX_INSTALLQUICKLAUNCHSHORTCUT" Value="1" Secure="yes"/>
+    <SetProperty Id="VBOX_INSTALLQUICKLAUNCHSHORTCUT" After="AppSearch" Sequence="both"
+                 Value="{}"><![CDATA[VBOX_INSTALLQUICKLAUNCHSHORTCUT="0"]]></SetProperty>
 
     <!-- Whether or not registering of known desktop shortcut for the Quick Launch Bar should be created -->
-    <Property Id="VBOXREGISTERFILEEXTENSIONS" Value="1" Secure="yes"/>
-    <SetProperty Id="VBOXREGISTERFILEEXTENSIONS" After="AppSearch" Sequence="both"
-                 Value="{}"><![CDATA[VBOXREGISTERFILEEXTENSIONS="0"]]></SetProperty>
+    <Property Id="VBOX_REGISTERFILEEXTENSIONS" Value="1" Secure="yes"/>
+    <SetProperty Id="VBOX_REGISTERFILEEXTENSIONS" After="AppSearch" Sequence="both"
+                 Value="{}"><![CDATA[VBOX_REGISTERFILEEXTENSIONS="0"]]></SetProperty>
 
     <!-- Whether or not VirtualBox should be started automatically right after successful installation -->
-    <Property Id="VBOXSTART" Value="1" Secure="yes"/>
-    <SetProperty Id="VBOXSTART" After="AppSearch" Sequence="both"
-                 Value="{}"><![CDATA[VBOXSTART="0"]]></SetProperty>
+    <Property Id="VBOX_START" Value="1" Secure="yes"/>
+    <SetProperty Id="VBOX_START" After="AppSearch" Sequence="both"
+                 Value="{}"><![CDATA[VBOX_START="0"]]></SetProperty>
 
     <!-- Make sure installation will not start on anything other but the NT family -->