Merged revisions 67449 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r67449 | martin.v.loewis | 2008-11-30 12:08:26 +0100 (So, 30 Nov 2008) | 3 lines
Issue #4389: Add icon to the uninstall entry in
"add-and-remove-programs".
........
diff --git a/Misc/NEWS b/Misc/NEWS
index 0ec79ff..615812f 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -79,6 +79,8 @@
Build
-----
+- Issue #4389: Add icon to the uninstall entry in "add-and-remove-programs".
+
- Issue #4289: Remove Cancel button from AdvancedDlg.
- Issue #1656675: Register a drop handler for .py* files on Windows.
diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py
index aa0202f..a942792 100644
--- a/Tools/msi/msi.py
+++ b/Tools/msi/msi.py
@@ -1247,7 +1247,10 @@
"[TARGETDIR]Doc\\"+docfile , "REGISTRY.doc"),
("Modules", -1, prefix+r"\Modules", "+", None, "REGISTRY"),
("AppPaths", -1, r"Software\Microsoft\Windows\CurrentVersion\App Paths\Python.exe",
- "", r"[TARGETDIR]Python.exe", "REGISTRY.def")
+ "", r"[TARGETDIR]Python.exe", "REGISTRY.def"),
+ ("DisplayIcon", -1,
+ r"Software\Microsoft\Windows\CurrentVersion\Uninstall\%s" % product_code,
+ "DisplayIcon", "[TARGETDIR]python.exe", "REGISTRY.def")
])
# Shortcuts, see "Shortcut Table"
add_data(db, "Directory",