diff options
| author | Steve Dower <steve.dower@microsoft.com> | 2015-05-03 21:54:32 (GMT) |
|---|---|---|
| committer | Steve Dower <steve.dower@microsoft.com> | 2015-05-03 21:54:32 (GMT) |
| commit | 1d4880db3d48bbb52226a7ea1bfeb6f6c8c81f64 (patch) | |
| tree | 44179b714c767c59c9408b1b6808649c8cba7ec2 /Tools/msi/exe | |
| parent | 2d0a69a456831f483a612fa97c7ed1b178b1bdd2 (diff) | |
| download | cpython-1d4880db3d48bbb52226a7ea1bfeb6f6c8c81f64.zip cpython-1d4880db3d48bbb52226a7ea1bfeb6f6c8c81f64.tar.gz cpython-1d4880db3d48bbb52226a7ea1bfeb6f6c8c81f64.tar.bz2 | |
Enables shortcuts to be deselected when installing on Windows.
Diffstat (limited to 'Tools/msi/exe')
| -rw-r--r-- | Tools/msi/exe/exe.wxs | 8 | ||||
| -rw-r--r-- | Tools/msi/exe/exe_files.wxs | 4 |
2 files changed, 9 insertions, 3 deletions
diff --git a/Tools/msi/exe/exe.wxs b/Tools/msi/exe/exe.wxs index 9696c89..d8b05e0 100644 --- a/Tools/msi/exe/exe.wxs +++ b/Tools/msi/exe/exe.wxs @@ -8,10 +8,13 @@ <PropertyRef Id="REGISTRYKEY" /> <Feature Id="DefaultFeature" AllowAdvertise="no" Title="!(loc.Title)" Description="!(loc.Description)"> - <ComponentGroupRef Id="exe_python" /> + <ComponentGroupRef Id="exe_python" Primary="yes" /> <ComponentGroupRef Id="exe_txt" /> <ComponentGroupRef Id="exe_icons" /> + </Feature> + <Feature Id="Shortcuts" AllowAdvertise="no" Title="!(loc.Title)" Description="!(loc.Description)"> + <ComponentGroupRef Id="exe_python" /> <Component Id="exe_shortcut" Directory="MenuDir" Guid="*"> <Shortcut Id="python.exe" Target="[#python.exe]" @@ -19,8 +22,7 @@ Description="!(loc.ShortcutDescription)" /> <RemoveFolder Id="Remove_MenuDir" Directory="MenuDir" On="uninstall" /> <RegistryKey Root="HKMU" Key="[REGISTRYKEY]"> - <RegistryValue Key="InstallPath" Type="string" Value="[InstallDirectory]" KeyPath="yes" /> - <RegistryValue Key="InstallPath\InstallGroup" Type="string" Value="Python $(var.ShortVersion)" /> + <RegistryValue Key="InstallPath\InstallGroup" Type="string" Value="!(loc.ProductName)" KeyPath="yes" /> </RegistryKey> </Component> </Feature> diff --git a/Tools/msi/exe/exe_files.wxs b/Tools/msi/exe/exe_files.wxs index 4091398..6422372 100644 --- a/Tools/msi/exe/exe_files.wxs +++ b/Tools/msi/exe/exe_files.wxs @@ -20,6 +20,10 @@ <ComponentGroup Id="exe_python"> <Component Id="python.exe" Directory="InstallDirectory" Guid="$(var.PythonExeComponentGuid)"> <File Name="python.exe" KeyPath="yes" /> + + <RegistryKey Root="HKMU" Key="[REGISTRYKEY]"> + <RegistryValue Key="InstallPath" Type="string" Value="[InstallDirectory]" KeyPath="no" /> + </RegistryKey> </Component> <Component Id="pythonw.exe" Directory="InstallDirectory" Guid="$(var.PythonwExeComponentGuid)"> <File Name="pythonw.exe" KeyPath="yes" /> |