diff options
| author | Martin v. Löwis <martin@v.loewis.de> | 2014-06-22 20:28:04 (GMT) |
|---|---|---|
| committer | Martin v. Löwis <martin@v.loewis.de> | 2014-06-22 20:28:04 (GMT) |
| commit | 77143dbaee8aa15c2f3556438babd0adfbe0dc0f (patch) | |
| tree | 1d7ede67813b7fb5974c7a126fe2a5e82ca31308 /Tools | |
| parent | bc8197a287b151ac1f3b94a4308f34ba9a1633df (diff) | |
| parent | cd95e18bf7db348060ab9680729927b5ccb11bb1 (diff) | |
| download | cpython-77143dbaee8aa15c2f3556438babd0adfbe0dc0f.zip cpython-77143dbaee8aa15c2f3556438babd0adfbe0dc0f.tar.gz cpython-77143dbaee8aa15c2f3556438babd0adfbe0dc0f.tar.bz2 | |
Issue #10747: Merge with 3.4
Diffstat (limited to 'Tools')
| -rw-r--r-- | Tools/msi/msi.py | 31 |
1 files changed, 21 insertions, 10 deletions
diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py index 1c627a7..4178cb1 100644 --- a/Tools/msi/msi.py +++ b/Tools/msi/msi.py @@ -1320,27 +1320,38 @@ def add_registry(db): add_data(db, "RemoveFile", [("MenuDir", "TARGETDIR", None, "MenuDir", 2)]) tcltkshortcuts = [] + if msilib.Win64: + bitted = "64 bit" + else: + bitted = "32 bit" if have_tcl: tcltkshortcuts = [ - ("IDLE", "MenuDir", "IDLE|IDLE (Python GUI)", "pythonw.exe", - tcltk.id, r'"[TARGETDIR]Lib\idlelib\idle.pyw"', None, None, "python_icon.exe", 0, None, "TARGETDIR"), + ("IDLE", "MenuDir", + "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", tcltkshortcuts + [# Advertised shortcuts: targets are features, not files - ("Python", "MenuDir", "PYTHON|Python (command line)", "python.exe", - default_feature.id, None, None, None, "python_icon.exe", 2, None, "TARGETDIR"), + ("Python", "MenuDir", + "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 # icon first. #("Manual", "MenuDir", "MANUAL|Python Manuals", "documentation", # htmlfiles.id, None, None, None, None, None, None, None), ## Non-advertised shortcuts: must be associated with a registry component - ("Manual", "MenuDir", "MANUAL|Python Manuals", "REGISTRY.doc", - "[#%s]" % docfile, None, - None, None, None, None, None, None), - ("PyDoc", "MenuDir", "MODDOCS|Module Docs", "python.exe", - default_feature.id, r'-m pydoc -b', None, None, "python_icon.exe", 0, None, "TARGETDIR"), - ("Uninstall", "MenuDir", "UNINST|Uninstall Python", "REGISTRY", + ("Manual", "MenuDir", "MANUAL|Python "+short_version+" Manuals", + "REGISTRY.doc", "[#%s]" % docfile, + None, None, None, None, None, None, None), + ("PyDoc", "MenuDir", + "MODDOCS|Python "+short_version+" Docs Server (pydoc - "+ + 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, None, None, None, None, None, None), ]) |