Changeset 52826 in vbox for trunk/src/VBox/Installer/win/VBoxMergeUSB.wxi

Timestamp:

Sep 23, 2014 10:42:43 AM (10 years ago)

Author:

vboxsync

Message:

pr7489. Windows installer: Added attribute DeleteFiles for the components cp_VBoxDrv, cp_USBFilterDriver, cp_USBDeviceDriver

File:

• trunk/src/VBox/Installer/win/VBoxMergeUSB.wxi (modified) (2 diffs)

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

@@ -19 +19 @@
     <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"/>
+            <difxapp:Driver AddRemovePrograms="no" ForceInstall="yes" DeleteFiles="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 ?>
+<?if $(env.VBOX_SIGNING_MODE)?>
             <File Id="file_VBoxUSBMon.cat" Name="VBoxUSBMon.cat"
                   Source="$(env.PATH_OUT)\bin\VBoxUSBMon.cat" />
@@ -34 +34 @@
     <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"/>
+            <difxapp:Driver AddRemovePrograms="no" ForceInstall="yes"  DeleteFiles="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 ?>
+<?if $(env.VBOX_SIGNING_MODE)?>
             <File Id="file_VBoxUSB.cat" Name="VBoxUSB.cat"
                   Source="$(env.PATH_OUT)\bin\VBoxUSB.cat" />