Changeset 58599 in vbox

Timestamp:

Nov 6, 2015 11:36:54 AM (9 years ago)

Author:

vboxsync

Message:

Windows host installer: Try to move our public properties into the include file to also have them redefined in the MSM modules, as defining those properties currently does not work when using an MSM module (follow-up for r103958).

Location:

trunk/src/VBox/Installer/win

Files:

• Properties.wxi (modified) (1 diff)
• PublicProperties.wxi (added)
• VBoxMergeApp.wxs (modified) (1 diff)
• VBoxMergeCOM32On64.wxs (modified) (1 diff)
• VBoxMergeNetAdp.wxs (modified) (1 diff)
• VBoxMergeNetAdp6.wxs (modified) (1 diff)
• VBoxMergeNetFlt.wxs (modified) (1 diff)
• VBoxMergeNetLwf.wxs (modified) (1 diff)
• VBoxMergePython.wxs (modified) (1 diff)
• VBoxMergeUSB.wxs (modified) (1 diff)
• VirtualBox.wxs (modified) (2 diffs)

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

@@ -58 +58 @@
   <?endif ?>
 
-  <!-- Define our own public properties here in order to get those also recognized in case
-       case we're building the installer as MSM modules -->
-
-  <!-- Default property for network adapter type -->
-  <Property Id="NETWORKTYPE" Value="NDIS6" Secure="yes"/>
-
-  <!-- Force NDIS5 on pre-Vista -->
-  <SetProperty Id="NETWORKTYPE" After="CostFinalize" Value="NDIS5"><![CDATA[(NETWORKTYPE="NDIS6") AND (VersionNT < 600)]]></SetProperty>
-
-    <!-- Whether or not a desktop shortcut should be created. -->
-    <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="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="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="VBOX_START" Value="1" Secure="yes"/>
-    <SetProperty Id="VBOX_START" After="AppSearch" Sequence="both"
-                 Value="{}"><![CDATA[VBOX_START="0"]]></SetProperty>
-
 </Include>

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

@@ -49 +49 @@
                  SummaryCodepage="1252"/>
 
+        <?include PublicProperties.wxi ?>
+
         <!-- Here comes the file/directory list -->
         <Directory Id="TARGETDIR" Name="SourceDir">

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

@@ -34 +34 @@
                  SummaryCodepage="1252"/>
 
+        <?include PublicProperties.wxi ?>
+
         <!-- Here comes the file/directory list -->
         <Directory Id="TARGETDIR" Name="SourceDir">

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

@@ -34 +34 @@
                  SummaryCodepage="1252"/>
 
+        <?include PublicProperties.wxi ?>
+
         <!-- Here comes the file/directory list -->
         <Directory Id="TARGETDIR" Name="SourceDir">

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

@@ -34 +34 @@
                  SummaryCodepage="1252"/>
 
+        <?include PublicProperties.wxi ?>
+
         <!-- Here comes the file/directory list -->
         <Directory Id="TARGETDIR" Name="SourceDir">

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

@@ -34 +34 @@
                  SummaryCodepage="1252"/>
 
+        <?include PublicProperties.wxi ?>                 
+
         <!-- Here comes the file/directory list -->
         <Directory Id="TARGETDIR" Name="SourceDir">

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

@@ -34 +34 @@
                  SummaryCodepage="1252"/>
 
+        <?include PublicProperties.wxi ?>
+
         <!-- Here comes the file/directory list -->
         <Directory Id="TARGETDIR" Name="SourceDir">

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

@@ -34 +34 @@
                  SummaryCodepage="1252"/>
 
+        <?include PublicProperties.wxi ?>
+
         <!-- Here comes the file/directory list -->
         <Directory Id="TARGETDIR" Name="SourceDir">

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

@@ -34 +34 @@
                  SummaryCodepage="1252"/>
 
+        <?include PublicProperties.wxi ?>
+
         <!-- Here comes the file/directory list -->
         <Directory Id="TARGETDIR" Name="SourceDir">

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

@@ -61 +61 @@
     <Property Id="ARPURLINFOABOUT">http://www.virtualbox.org</Property>
     <Property Id="ARPURLUPDATEINFO">http://www.virtualbox.org</Property>
-    
+
     <!-- Install the product for all users on the system -->
     <Property Id="ALLUSERS"><![CDATA[1]]></Property>
@@ -67 +67 @@
     <!-- Force overwriting all files and re-create shortcuts to guarantee a working environment -->
     <Property Id='REINSTALLMODE' Value='amus'/>
+
+    <?include PublicProperties.wxi ?>
 
     <!-- Make sure installation will not start on anything other but the NT family -->