[Python-checkins] cpython (3.5): Issue #25450: Updates shortcuts to start Python in installation directory.

Sat Oct 31 16:08:06 EDT 2015

https://hg.python.org/cpython/rev/df12c29882b1
changeset: 98918:df12c29882b1
branch: 3.5
user: Steve Dower <steve.dower at microsoft.com>
date: Sat Oct 31 12:41:46 2015 -0700
summary:
 Issue #25450: Updates shortcuts to start Python in installation directory.
files:
 Misc/NEWS | 2 ++
 Tools/msi/doc/doc.wxs | 3 ++-
 Tools/msi/exe/exe.wxs | 3 ++-
 Tools/msi/tcltk/tcltk.wxs | 6 ++++--
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -348,6 +348,8 @@
 Windows
 -------
 
+- Issue #25450: Updates shortcuts to start Python in installation directory.
+
 - Issue #25164: Changes default all-users install directory to match per-user
 directory.
 
diff --git a/Tools/msi/doc/doc.wxs b/Tools/msi/doc/doc.wxs
--- a/Tools/msi/doc/doc.wxs
+++ b/Tools/msi/doc/doc.wxs
@@ -22,7 +22,8 @@
 <Shortcut Id="python.chm"
 Target="[#python.chm]"
 Name="!(loc.ShortcutName)"
- Description="!(loc.ShortcutDescription)" />
+ Description="!(loc.ShortcutDescription)"
+ WorkingDirectory="InstallDirectory" />
 <RemoveFolder Id="Remove_MenuDir" On="uninstall" />
 </Component>
 <?endif ?>
diff --git a/Tools/msi/exe/exe.wxs b/Tools/msi/exe/exe.wxs
--- a/Tools/msi/exe/exe.wxs
+++ b/Tools/msi/exe/exe.wxs
@@ -20,7 +20,8 @@
 <Shortcut Id="python.exe"
 Target="[#python.exe]"
 Name="!(loc.ShortcutName)"
- Description="!(loc.ShortcutDescription)" />
+ Description="!(loc.ShortcutDescription)"
+ WorkingDirectory="InstallDirectory" />
 <RemoveFolder Id="Remove_MenuDir" Directory="MenuDir" On="uninstall" />
 <RegistryKey Root="HKMU" Key="[REGISTRYKEY]">
 <RegistryValue Key="InstallPath\InstallGroup" Type="string" Value="!(loc.ProductName)" KeyPath="yes" />
diff --git a/Tools/msi/tcltk/tcltk.wxs b/Tools/msi/tcltk/tcltk.wxs
--- a/Tools/msi/tcltk/tcltk.wxs
+++ b/Tools/msi/tcltk/tcltk.wxs
@@ -49,7 +49,8 @@
 Description="!(loc.ShortcutDescription)"
 Target="[PYTHONW_EXE]"
 Arguments='"[#Lib_idlelib_idle.pyw]"'
- Icon="idle.exe">
+ Icon="idle.exe"
+ WorkingDirectory="InstallDirectory">
 <Icon Id="idle.exe" SourceFile="!(bindpath.src)Lib\idlelib\Icons\idle.ico" />
 </Shortcut>
 <Shortcut Id="pydoc.py"
@@ -57,7 +58,8 @@
 Arguments='-m pydoc -b'
 Name="!(loc.PyDocShortcutName)"
 Description="!(loc.PyDocShortcutDescription)"
- Icon="idle.exe" />
+ Icon="idle.exe"
+ WorkingDirectory="InstallDirectory" />
 </Component>
 </Feature>
 </Product>
-- 
Repository URL: https://hg.python.org/cpython
