gh-95445: Ensure Windows msi uninstalls document folder successfully (GH-95465)

(cherry picked from commit 7d8973870bb079bf71d094cd966d6b6336f1e25f)

Co-authored-by: neonene <53406459+neonene@users.noreply.github.com>

diff --git a/Misc/NEWS.d/next/Windows/2022-07-30-14-18-33.gh-issue-95445.mjrTaq.rst b/Misc/NEWS.d/next/Windows/2022-07-30-14-18-33.gh-issue-95445.mjrTaq.rst
new file mode 100644 (file)
index 0000000..565489e
--- /dev/null
+++ b/Misc/NEWS.d/next/Windows/2022-07-30-14-18-33.gh-issue-95445.mjrTaq.rst
@@ -0,0 +1 @@
+Fixes the unsuccessful removal of the HTML document directory when uninstalling with Windows msi.

diff --git a/Tools/msi/doc/doc.wxs b/Tools/msi/doc/doc.wxs
index e80fff43418bb96862b245be3f1d4b943e9aa6c6..49798c752633fb2621f454a3cff7aae159beecac 100644 (file)
--- a/Tools/msi/doc/doc.wxs
+++ b/Tools/msi/doc/doc.wxs
@@ -17,6 +17,11 @@
                     <RegistryValue Key="Help\Main Python Documentation" Type="string" Value="[#Doc_html_index.html]" KeyPath="yes" />
                 </RegistryKey>                                                                                
             </Component>
+
+            <Component Id="doc_folder" Directory="Doc" Guid="{22FD42DB-EC66-4B1C-B1FC-44E0CF7B2462}">
+                <CreateFolder />
+                <RemoveFolder Id="Remove_doc_folder" On="uninstall" />
+            </Component>
         </Feature>
         <Feature Id="Shortcuts" AllowAdvertise="no" Title="!(loc.Title)" Description="!(loc.Description)">
             <ComponentGroupRef Id="doc_html" />