Changeset 38246 in vbox

Timestamp:

Aug 1, 2011 8:42:30 AM (13 years ago)

Author:

vboxsync

Message:

Windows host installer: Only ship vbox-img.exe in 32-bit.

File:

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

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

@@ -45 +45 @@
 <?endif ?>
 
+<!-- If we build a combined installer (32- and 64-bit in one installer), we
+     use two installer "disks": One for all platform-specific stuff and one which
+     contains all common (platform independent) stuff (like manuals, bitmaps etc). -->
 <?if $(env.VBOX_WITH_COMBINED_PACKAGE) = "yes" ?>
     <?define Property_DiskIdCommon = "2" ?>
@@ -425 +428 @@
 
                         <!-- Misc tools -->
-                        <File Id="file_VBoxImg.exe" Name="vbox-img.exe"
+                        <!-- We only ship vbox-img.exe in a 32-bit binary -- a 64-bit one
+                             is not required. -->
+                        <File Id="file_VBoxImg.exe" Name="vbox-img.exe" DiskId="$(var.Property_DiskIdCommon)"
                               Source="$(env.PATH_OUT)\bin\vbox-img.exe"/>
                         <File Id="file_VBoxNetDHCP.exe" Name="VBoxNetDHCP.exe"
@@ -548 +553 @@
 <?if $(env.VBOX_WITH_ADDITIONS_PACKING) = "yes" ?>
     <?if $(env.VBOX_WITH_COMBINED_PACKAGE) = "yes" ?>
-                        <File Id="file_VBoxGuestAdditions.iso" Name="VBoxGuestAdditions.iso" DiskId="2"
+                        <File Id="file_VBoxGuestAdditions.iso" Name="VBoxGuestAdditions.iso" DiskId="$(var.Property_DiskIdCommon)"
                               Source="$(env.PATH_MULTIARCH_GUEST_ADDITIONS_ISO)\VBoxGuestAdditions.iso" />
     <?else ?>