Changeset 95153 in vbox for trunk/src/VBox/Installer/win/VirtualBox.wxs

Timestamp:

Jun 1, 2022 7:47:19 AM (3 years ago)

Author:

vboxsync

Message:

Windows host installer: Also remove the created Python API cache on uninstall. bugref:10204

File:

• trunk/src/VBox/Installer/win/VirtualBox.wxs (modified) (6 diffs)

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

@@ -211 +211 @@
     </Property>
 
+<?if $(env.VBOX_WITH_PYTHON) = "yes" ?>
+    <Property Id="EXISTING_PYTHON_API_FOLDER" Secure="yes" >
+        <RegistrySearch Id="RegistryGetPythonApiInstallPath" Root="HKLM" Key="$(var.Property_RegKey)"
+                        Name="PythonApiInstallDir" Type="raw" Win64="$(var.Property_Win64)"/>
+    </Property>
+<?endif ?>
+
     <!--
                             install upgrade uninstall
@@ -269 +276 @@
             <Directory Id="VENDOR" Name="$(env.VBOX_VENDOR_SHORT)">
                 <Directory Id="INSTALLDIR" Name="VirtualBox">
+                    <!-- Components for removing empty folder after cleaning traces -->
+                    <Component Id="cp_INSTALLDIR" Guid="374723AF-5990-4552-A1B0-82C72EFA360F">
+                        <RemoveFolder Id="INSTALLDIR" On="uninstall" />
+                    </Component>
 <?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?>
                 <Merge Id="msm_VBoxApp" Language="!(loc.LANG)" SourceFile="$(var.Property_VBoxMergeApp)" DiskId="1">
@@ -364 +375 @@
     <?endif ?>
                     </Directory>
+                    <!-- Component for removing empty folder after cleaning traces -->
+                    <Component Id="cp_SDK" Guid="ACA59290-B2D6-4E96-B164-C45F70A90219">
+                        <RemoveFolder Id="dir_SDK" On="uninstall" />
+                    </Component>
                 </Directory>
 <?endif ?>
@@ -434 +449 @@
         <ComponentRef Id="cp_QuickLaunchVBox" />
 <?endif ?>
+        <!-- Components for removing empty folders after cleaning traces -->
+        <ComponentRef Id="cp_INSTALLDIR" />
+        <ComponentRef Id="cp_SDK" />
+
         <!-- Components handled either by the installer itself or
              the merge module -->
@@ -444 +463 @@
     <!-- Make sure to reference the permissions component, which takes care of setting
          the required ACLs for our files / folders. -->
-    <ComponentRef Id="cp_Permissions" />
+        <ComponentRef Id="cp_Permissions" />
     <?if $(env.VBOX_WITH_QTGUI) = "yes" ?>
         <ComponentRef Id="cp_RegisterExtensions" />
@@ -472 +491 @@
         <ComponentRef Id="cp_VBoxPyInst" />
         <ComponentRef Id="cp_VBoxPyMod" />
+        <ComponentRef Id="cp_VBoxPyDel" />
     <?endif ?>
     <?if $(env.VBOX_WITH_VBOXSDL) = "yes" ?>