Changeset 51225 in vbox for trunk/src/VBox/Installer/win/VirtualBox.wxs

Timestamp:

May 9, 2014 1:08:07 PM (11 years ago)

Author:

vboxsync

Message:

Windows host installer: Fixes for non-MSM builds.

File:

• trunk/src/VBox/Installer/win/VirtualBox.wxs (modified) (5 diffs)

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

@@ -196 +196 @@
     <?endif ?>
 <?else ?>
-                <?include VBoxMergeApp.wxi ?>
+                <Directory Id="msm_VBoxApplicationFolder" FileSource=".">
+                    <?include VBoxMergeApp.wxi ?>
     <?if $(env.VBOX_WITH_32_ON_64_MAIN_API) = "yes" ?>
-                <?include VBoxMergeCOM32On64.wxi ?>
+                    <?include VBoxMergeCOM32On64.wxi ?>
+                </Directory>
     <?endif ?>
 <?endif ?>
@@ -206 +208 @@
                         <Merge Id="msm_VBoxUSB" Language="!(loc.LANG)" SourceFile="$(var.Property_VBoxMergeUSB)" DiskId="1" />
 <?else ?>
-                        <?include VBoxMergeUSB.wxi ?>
+                        <Directory Id="msm_VBoxUSBFolder" FileSource=".">
+                            <?include VBoxMergeUSB.wxi ?>
+                        </Directory>
 <?endif ?>
                     </Directory>
@@ -215 +219 @@
                             <Merge Id="msm_VBoxNetworkFlt" Language="!(loc.LANG)" SourceFile="$(var.Property_VBoxMergeNetworkFlt)" DiskId="1" />
     <?else ?>
-                            <?include VBoxMergeNetFlt.wxi ?>
+                            <Directory Id="msm_VBoxNetworkFltFolder" FileSource=".">
+                                <?include VBoxMergeNetFlt.wxi ?>
+                            </Directory>
     <?endif ?>
                         </Directory>
@@ -223 +229 @@
                             <Merge Id="msm_VBoxNetworkAdp" Language="!(loc.LANG)" SourceFile="$(var.Property_VBoxMergeNetworkAdp)" DiskId="1" />
 <?else ?>
-                            <?include VBoxMergeNetAdp.wxi ?>
+                            <Directory Id="msm_VBoxNetworkAdpFolder" FileSource=".">
+                                <?include VBoxMergeNetAdp.wxi ?>
+                            </Directory>
 <?endif ?>
                         </Directory>
@@ -234 +242 @@
                         <Merge Id="msm_VBoxPython" Language="!(loc.LANG)" SourceFile="$(var.Property_VBoxMergePython)" DiskId="1" />
     <?else ?>
-                        <?include VBoxMergePython.wxi ?>
+                        <Directory Id="msm_VBoxPythonFolder" FileSource=".">
+                            <?include VBoxMergePython.wxi ?>
+                        </Directory>
     <?endif ?>
                     </Directory>