From: Steve Dower <steve.dower@microsoft.com> Date: Sat, 31 Oct 2015 19:41:46 +0000 (-0700) Subject: Issue #25450: Updates shortcuts to start Python in installation directory. X-Git-Tag: v3.5.1rc1~107 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=04a4316acc1bc4cfeb131517ddeac34f50c6c5c9;p=python Issue #25450: Updates shortcuts to start Python in installation directory. --- diff --git a/Misc/NEWS b/Misc/NEWS index 47c129b4f1..5b02c7802f 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 bbe30a13e3..8dd0e21ae3 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 dcbf646da0..154cee5c47 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 0b83c5cb5c..eeae8e8b0d 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>