Changeset 51127 in vbox for trunk/src/VBox/Installer/win/VBoxMergeCOM32On64.wxi

Timestamp:

Apr 23, 2014 3:22:43 PM (11 years ago)

Author:

vboxsync

Message:

Windows host installer: Split off 32-bit on 64-bit COM support into own module, bugfixes, added some more build dependencies.

File:

• trunk/src/VBox/Installer/win/VBoxMergeCOM32On64.wxi (copied) (copied from trunk/src/VBox/Installer/win/VBoxMergeUSB.wxi ) (1 diff)

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

@@ -17 +17 @@
          xmlns:difxapp="http://schemas.microsoft.com/wix/DifxAppExtension">
 
-    <Directory Id="dir_VBoxUSBFilter" Name="filter">
-        <Component Id="cp_USBFilterDriver" Guid="B7D782D2-96DF-4775-A0E1-A76CF7B04B65" Win64="$(var.Property_Win64)">
-            <difxapp:Driver AddRemovePrograms="no" ForceInstall="yes"
-                            Legacy="$(var.Property_DriverLegacy)" Sequence="0" PlugAndPlayPrompt="no"/>
-            <File Id="file_VBoxUSBMon.sys" Name="VBoxUSBMon.sys"
-                  Source="$(env.PATH_OUT)\bin\VBoxUSBMon.sys" />
-            <File Id="file_VBoxUSBMon.inf" Name="VBoxUSBMon.inf"
-                  Source="$(env.PATH_OUT)\bin\VBoxUSBMon.inf" />
-<?if $(env.VBOX_SIGNING_MODE) != none ?>
-            <File Id="file_VBoxUSBMon.cat" Name="VBoxUSBMon.cat"
-                  Source="$(env.PATH_OUT)\bin\VBoxUSBMon.cat" />
-<?endif ?>
+<?if $(env.VBOX_WITH_32_ON_64_MAIN_API) = "yes" ?>
+    <Directory Id="dir_VBoxCOM32On64X86" Name="x86">
+        <!-- The 32-bit client COM component (see also cp_MainCom below) -->
+        <Component Id="cp_MainCOM_x86" Guid="B600824E-4A25-2EB3-4B44-3D8CB7F9B92D" Win64="no">
+            <!-- Note: This file ID *must not* be changed because of our typelib template generation file! -->
+            <File Id="VBoxClient_x86" Name="VBoxClient-x86.dll"
+                  Source="$(env.PATH_OUT)\bin\x86\VBoxClient-x86.dll" KeyPath="yes"
+                  DiskId="$(var.Property_DiskIdCommon)">
+            </File>
+            <File Id="file_VBoxRT_x86" Name="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 ?>
+    <?if $(env.VBOX_VCC_TOOL_STEM) = "VCC100" ?>
+            <!-- MS C/C++ v10.0 32 bit Runtime DLL files -->
+            <File Id="file_msvcr100_x86" Name="msvcr100.dll"
+                  Source="$(env.PATH_OUT)\bin\x86\msvcr100.dll"
+                  DiskId="$(var.Property_DiskIdCommon)" />
+            <File Id="file_msvcp100_x86" Name="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_x86" Name="msvcr110.dll"
+                  Source="$(env.PATH_OUT)\bin\x86\msvcr110.dll"
+                  DiskId="$(var.Property_DiskIdCommon)" />
+            <File Id="file_msvcp110_x86" Name="msvcp110.dll"
+                  Source="$(env.PATH_OUT)\bin\x86\msvcp110.dll"
+                  DiskId="$(var.Property_DiskIdCommon)" />
+    <?endif?>
         </Component>
     </Directory>
-
-    <Directory Id="dir_VBoxUSBDevice" Name="device">
-        <Component Id="cp_USBDeviceDriver" Guid="010FE46A-E358-43E2-8BDC-38BC8BEC82E0" Win64="$(var.Property_Win64)">
-            <difxapp:Driver AddRemovePrograms="no" ForceInstall="yes"
-                            Legacy="$(var.Property_DriverLegacy)" Sequence="0" PlugAndPlayPrompt="no"/>
-            <File Id="file_VBoxUSB.sys" Name="VBoxUSB.sys"
-                  Source="$(env.PATH_OUT)\bin\VBoxUSB.sys" />
-            <File Id="file_VBoxUSB.inf" Name="VBoxUSB.inf"
-                  Source="$(env.PATH_OUT)\bin\VBoxUSB.inf" />
-<?if $(env.VBOX_SIGNING_MODE) != none ?>
-            <File Id="file_VBoxUSB.cat" Name="VBoxUSB.cat"
-                  Source="$(env.PATH_OUT)\bin\VBoxUSB.cat" />
-<?endif ?>
-        </Component>
-    </Directory>
+<?endif?>
 
 </Include>