Changeset 106328 in vbox

Timestamp:

Oct 15, 2024 1:48:37 PM (6 weeks ago)

Author:

vboxsync

Message:

Windows installers: Big revamp for removing all DIFxApp-related / DIFxApi-related code and build dependencies for the host and guest installers [SCM fix]. bugref:10762

Location:

trunk/src/VBox/Installer/win

Files:

• VBoxMergeAppCA.wxi (modified) (1 diff)
• VBoxMergeAppSeq.wxi (modified) (1 diff)
• VBoxMergeUSBSeq.wxi (modified) (2 diffs)

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

@@ -26 +26 @@
 <Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
 
-    <CustomAction Id="ca_VBoxSupDrvInst" DllEntry="DriverInstall" Execute="immediate" Return="ignore" Impersonate="no" BinaryRef="VBoxInstallHelper" />                      
+    <CustomAction Id="ca_VBoxSupDrvInst" DllEntry="DriverInstall" Execute="immediate" Return="ignore" Impersonate="no" BinaryRef="VBoxInstallHelper" />
     <CustomAction Id="ca_VBoxSupDrvInstArgInfFile" Property="VBoxDrvInstInfFile" Value="[#file_VBoxSup.inf]" Execute="immediate" />
     <CustomAction Id="ca_VBoxSupDrvInstArgModel" Property="VBoxDrvInstModel" Value="VBoxSup" Execute="immediate" />

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

@@ -34 +34 @@
     <Custom Action="ca_VBoxSupDrvUninstArgModel" Before="ca_VBoxSupDrvUninst"
             Condition="NOT (UPGRADINGPRODUCTCODE) AND (Installed) AND (REMOVE=&quot;ALL&quot;)" />
-    <Custom Action="ca_VBoxSupDrvUninst" After="InstallInitialize" 
+    <Custom Action="ca_VBoxSupDrvUninst" After="InstallInitialize"
             Condition="NOT (UPGRADINGPRODUCTCODE) AND (Installed) AND (REMOVE=&quot;ALL&quot;)" />
 

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

@@ -32 +32 @@
     <Custom Action="ca_VBoxUSBDevDrvInst" After="InstallFinalize" Condition="NOT REMOVE" />
 
-    <Custom Action="ca_VBoxUSBDevDrvUninstArgModel" Before="ca_VBoxUSBDevDrvUninst" 
+    <Custom Action="ca_VBoxUSBDevDrvUninstArgModel" Before="ca_VBoxUSBDevDrvUninst"
             Condition="NOT (UPGRADINGPRODUCTCODE) AND (Installed) AND (REMOVE=&quot;ALL&quot;)" />
-    <Custom Action="ca_VBoxUSBDevDrvUninst" After="InstallInitialize" 
+    <Custom Action="ca_VBoxUSBDevDrvUninst" After="InstallInitialize"
             Condition="NOT (UPGRADINGPRODUCTCODE) AND (Installed) AND (REMOVE=&quot;ALL&quot;)"/>
 
@@ -45 +45 @@
     <Custom Action="ca_VBoxUSBMonDrvUninstArgModel" Before="ca_VBoxUSBMonDrvUninst"
             Condition="NOT (UPGRADINGPRODUCTCODE) AND (Installed) AND (REMOVE=&quot;ALL&quot;)" />
-    <Custom Action="ca_VBoxUSBMonDrvUninst" After="InstallInitialize" 
+    <Custom Action="ca_VBoxUSBMonDrvUninst" After="InstallInitialize"
             Condition="NOT (UPGRADINGPRODUCTCODE) AND (Installed) AND (REMOVE=&quot;ALL&quot;)" />