diff options
| author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2022-08-01 16:07:24 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-01 16:07:24 (GMT) |
| commit | 3192fd7683ad979d7f5ba996801da474c1606786 (patch) | |
| tree | 24871adf996aa652b0944b626544e3513bcfaed3 | |
| parent | e62a0dfab2bbc29324ca1879e287fff7fa8f21e0 (diff) | |
| download | cpython-3192fd7683ad979d7f5ba996801da474c1606786.zip cpython-3192fd7683ad979d7f5ba996801da474c1606786.tar.gz cpython-3192fd7683ad979d7f5ba996801da474c1606786.tar.bz2 | |
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>
| -rw-r--r-- | Misc/NEWS.d/next/Windows/2022-07-30-14-18-33.gh-issue-95445.mjrTaq.rst | 1 | ||||
| -rw-r--r-- | Tools/msi/doc/doc.wxs | 5 |
2 files changed, 6 insertions, 0 deletions
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 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 e80fff4..49798c7 100644 --- 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" /> |