summaryrefslogtreecommitdiffstats
path: root/Tools/msi
diff options
context:
space:
mode:
authorSteve Dower <steve.dower@microsoft.com>2015-10-31 19:41:46 (GMT)
committerSteve Dower <steve.dower@microsoft.com>2015-10-31 19:41:46 (GMT)
commit04a4316acc1bc4cfeb131517ddeac34f50c6c5c9 (patch)
treefd7b45293e194d1793af0fb9c688ba0c08c0d93b /Tools/msi
parent940f6a8f11b5ef0f9fa85b0be4b95608efebb2e8 (diff)
downloadcpython-04a4316acc1bc4cfeb131517ddeac34f50c6c5c9.zip
cpython-04a4316acc1bc4cfeb131517ddeac34f50c6c5c9.tar.gz
cpython-04a4316acc1bc4cfeb131517ddeac34f50c6c5c9.tar.bz2
Issue #25450: Updates shortcuts to start Python in installation directory.
Diffstat (limited to 'Tools/msi')
-rw-r--r--Tools/msi/doc/doc.wxs3
-rw-r--r--Tools/msi/exe/exe.wxs3
-rw-r--r--Tools/msi/tcltk/tcltk.wxs6
3 files changed, 8 insertions, 4 deletions
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>