traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Issue #10747: Merge with 3.4

This commit is contained in:
Martin v. Löwis 2014-06-22 22:28:04 +02:00
parent bc8197a287 cd95e18bf7
commit 77143dbaee
2 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Misc/NEWS
View File

@ -1,4 +1,4 @@
+++++++++++ +++++++++++
Python News Python News
+++++++++++ +++++++++++
@ -685,6 +685,8 @@ Windows
- Issue #21671, CVE-2014-0224: The bundled version of OpenSSL has been - Issue #21671, CVE-2014-0224: The bundled version of OpenSSL has been
updated to 1.0.1h. updated to 1.0.1h.
- Issue #10747: Use versioned labels in the Windows start menu.
Patch by Olive Kilburn.
What's New in Python 3.4.0? What's New in Python 3.4.0?
=========================== ===========================

31
Tools/msi/msi.py
View File

@ -1320,27 +1320,38 @@ def add_registry(db):
add_data(db, "RemoveFile", add_data(db, "RemoveFile",
[("MenuDir", "TARGETDIR", None, "MenuDir", 2)]) [("MenuDir", "TARGETDIR", None, "MenuDir", 2)])
tcltkshortcuts = [] tcltkshortcuts = []
if msilib.Win64:
bitted = "64 bit"
else:
bitted = "32 bit"
if have_tcl: if have_tcl:
tcltkshortcuts = [ tcltkshortcuts = [
("IDLE", "MenuDir", "IDLE|IDLE (Python GUI)", "pythonw.exe", ("IDLE", "MenuDir",
tcltk.id, r'"[TARGETDIR]Lib\idlelib\idle.pyw"', None, None, "python_icon.exe", 0, None, "TARGETDIR"), "IDLE|IDLE (Python "+short_version+" GUI - "+bitted+")",
"pythonw.exe", tcltk.id, r'"[TARGETDIR]Lib\idlelib\idle.pyw"',
None, None, "python_icon.exe", 0, None, "TARGETDIR"),
] ]
add_data(db, "Shortcut", add_data(db, "Shortcut",
tcltkshortcuts + tcltkshortcuts +
[# Advertised shortcuts: targets are features, not files [# Advertised shortcuts: targets are features, not files
("Python", "MenuDir", "PYTHON|Python (command line)", "python.exe", ("Python", "MenuDir",
default_feature.id, None, None, None, "python_icon.exe", 2, None, "TARGETDIR"), "PYTHON|Python "+short_version+" (command line - "+bitted+")",
"python.exe", default_feature.id, None, None, None,
"python_icon.exe", 2, None, "TARGETDIR"),
# Advertising the Manual breaks on (some?) Win98, and the shortcut lacks an # Advertising the Manual breaks on (some?) Win98, and the shortcut lacks an
# icon first. # icon first.
#("Manual", "MenuDir", "MANUAL|Python Manuals", "documentation", #("Manual", "MenuDir", "MANUAL|Python Manuals", "documentation",
# htmlfiles.id, None, None, None, None, None, None, None), # htmlfiles.id, None, None, None, None, None, None, None),
## Non-advertised shortcuts: must be associated with a registry component ## Non-advertised shortcuts: must be associated with a registry component
("Manual", "MenuDir", "MANUAL|Python Manuals", "REGISTRY.doc", ("Manual", "MenuDir", "MANUAL|Python "+short_version+" Manuals",
"[#%s]" % docfile, None, "REGISTRY.doc", "[#%s]" % docfile,
None, None, None, None, None, None), None, None, None, None, None, None, None),
("PyDoc", "MenuDir", "MODDOCS|Module Docs", "python.exe", ("PyDoc", "MenuDir",
default_feature.id, r'-m pydoc -b', None, None, "python_icon.exe", 0, None, "TARGETDIR"), "MODDOCS|Python "+short_version+" Docs Server (pydoc - "+
("Uninstall", "MenuDir", "UNINST|Uninstall Python", "REGISTRY", bitted+")", "python.exe", default_feature.id, r'-m pydoc -b',
None, None, "python_icon.exe", 0, None, "TARGETDIR"),
("Uninstall", "MenuDir", "UNINST|Uninstall Python "+
short_version+" ("+bitted+")", "REGISTRY",
SystemFolderName+"msiexec", "/x%s" % product_code, SystemFolderName+"msiexec", "/x%s" % product_code,
None, None, None, None, None, None), None, None, None, None, None, None),
]) ])