Installer

Timestamp:

Apr 25, 2014 2:02:37 PM (11 years ago)

Author:

vboxsync

Message:

Windows host installer: More explicit 64-bit properties for WiX not bitching around.

Location:

trunk/src/VBox/Installer/win

Files:

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

-              r51127
+              r51144
              into pieces if ever necessary. Maintenance is easier, too. The following component
              will be installed in the "doc" folder -->
+        <Component Id="cp_Docs" Guid="40BD12C5-89A8-4B81-8A5E-5EEE2C2763C4">
+        <Component Id="cp_Docs" Guid="40BD12C5-89A8-4B81-8A5E-5EEE2C2763C4"
+                   Win64="$(var.Property_Win64)">
             <?include $(env.PATH_TARGET)\Files_Doc.wxi ?>
         </Component>
 …
 <?if $(env.VBOX_WITH_WEBSERVICES) = "yes" ?>
     <!-- Webservice -->
+    <Component Id="cp_VBoxWebService" Guid="DD404F04-9874-43E9-AEE2-7762924D922E">
+    <Component Id="cp_VBoxWebService" Guid="DD404F04-9874-43E9-AEE2-7762924D922E"
+               Win64="$(var.Property_Win64)">
         <File Id="file_VBoxWebSrv.exe" Name="VBoxWebSrv.exe"
               Source="$(env.PATH_OUT)\bin\vboxwebsrv.exe" />

-              r51127
+              r51144
 <?if $(env.VBOX_WITH_MSM_INSTALL) = "no" ?>
         <?include VBoxMergeAppSeq.wxi ?>
+        <?if $(env.VBOX_WITH_32_ON_64_MAIN_API) = "yes" ?>
+            <?include VBoxMergeCOM32On64Seq.wxi ?>
+        <?endif ?>
         <?if $(env.VBOX_WITH_NETFLT) = "yes" ?>
             <?include VBoxMergeNetFltSeq.wxi ?>

Note: See TracChangeset for help on using the changeset viewer.