Changeset 51011 in vbox for trunk/src/VBox/Installer/win/VBoxMergeApp.wxs

Timestamp:

Apr 9, 2014 12:03:42 PM (11 years ago)

Author:

vboxsync

Message:

Windows host installer: Use the common.cab for merge modules as well; added a few more files to common.cab for further reducing the overall packet size.

File:

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

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

@@ -97 +97 @@
                     <Component Id="cp_MainCOM_x86" Guid="B600824E-4A25-2EB3-4B44-3D8CB7F9B92D" Win64="no">
                         <File Id="VBoxClient_x86" Name="VBoxClient-x86.dll"
-                            Source="$(env.PATH_OUT)\bin\x86\VBoxClient-x86.dll" KeyPath="yes">
+                            Source="$(env.PATH_OUT)\bin\x86\VBoxClient-x86.dll" KeyPath="yes"
+                            DiskId="$(var.Property_DiskIdCommon)">
                         </File>
                         <File Id="VBoxRT_x86" Name="VBoxRT-x86.dll"
-                            Source="$(env.PATH_OUT)\bin\x86\VBoxRT-x86.dll">
+                            Source="$(env.PATH_OUT)\bin\x86\VBoxRT-x86.dll"
+                            DiskId="$(var.Property_DiskIdCommon)">
                         </File>
                         <?include $(env.PATH_TARGET)\VirtualBox_TypeLib_x86.wxi ?>
@@ -106 +108 @@
                         <!-- MS C/C++ v10.0 32 bit Runtime DLL files. -->
                         <File Id="file_msvcr100.dll_x86" Name="msvcr100.dll"
-                              Source="$(env.PATH_OUT)\bin\x86\msvcr100.dll" />
+                              Source="$(env.PATH_OUT)\bin\x86\msvcr100.dll"
+                              DiskId="$(var.Property_DiskIdCommon)" />
                         <File Id="file_msvcp100.dll_x86" Name="msvcp100.dll"
-                              Source="$(env.PATH_OUT)\bin\x86\msvcp100.dll" />
+                              Source="$(env.PATH_OUT)\bin\x86\msvcp100.dll"
+                              DiskId="$(var.Property_DiskIdCommon)" />
 <?endif?>
 <?if $(env.VBOX_VCC_TOOL_STEM) = "VCC110" ?>
                         <!-- MS C/C++ v11.0 Runtime DLL files. -->
                         <File Id="file_msvcr110.dll_x86" Name="msvcr110.dll"
-                              Source="$(env.PATH_OUT)\bin\x86\msvcr110.dll" />
+                              Source="$(env.PATH_OUT)\bin\x86\msvcr110.dll"
+                              DiskId="$(var.Property_DiskIdCommon)" />
                         <File Id="file_msvcp110.dll_x86" Name="msvcp110.dll"
-                              Source="$(env.PATH_OUT)\bin\x86\msvcp110.dll" />
+                              Source="$(env.PATH_OUT)\bin\x86\msvcp110.dll"
+                              DiskId="$(var.Property_DiskIdCommon)" />
 <?endif?>
                     </Component>
@@ -342 +348 @@
 <?if $(env.VBOX_WITH_ADDITIONS_PACKING) = "yes" ?>
 <?if $(env.VBOX_WITH_COMBINED_PACKAGE) = "yes" ?>
-                    <File Id="file_VBoxGuestAdditions.iso" Name="VBoxGuestAdditions.iso" DiskId="$(var.Property_DiskIdCommon)"
-                          Source="$(env.PATH_MULTIARCH_GUEST_ADDITIONS_ISO)\VBoxGuestAdditions.iso" />
+                    <File Id="file_VBoxGuestAdditions.iso" Name="VBoxGuestAdditions.iso"
+                          Source="$(env.PATH_MULTIARCH_GUEST_ADDITIONS_ISO)\VBoxGuestAdditions.iso"
+                          DiskId="$(var.Property_DiskIdCommon)" />
 <?else ?>
                     <File Id="file_VBoxGuestAdditions.iso" Name="VBoxGuestAdditions.iso"