From 04a4316acc1bc4cfeb131517ddeac34f50c6c5c9 Mon Sep 17 00:00:00 2001
From: Steve Dower <steve.dower@microsoft.com>
Date: Sat, 31 Oct 2015 12:41:46 -0700
Subject: Issue #25450: Updates shortcuts to start Python in installation
 directory.

---
 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
index 47c129b..5b02c78 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -348,6 +348,8 @@ Build
 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
index bbe30a1..8dd0e21 100644
--- 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
index dcbf646..154cee5 100644
--- 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
index 0b83c5c..eeae8e8 100644
--- 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>
-- 
cgit v0.12