diff options
| author | Steve Dower <steve.dower@microsoft.com> | 2017-02-04 15:39:38 -0800 |
|---|---|---|
| committer | Steve Dower <steve.dower@microsoft.com> | 2017-02-04 15:39:38 -0800 |
| commit | 1a5780aabb550cae175ad8711e2f33ba644d0ddb (patch) | |
| tree | 68e47eaafb4ccc17bbdb7668c6058984945b332d /Tools/msi/exe/exe_files.wxs | |
| parent | 956c7cfa7111ab5458e2f69868a05b7b84fc6843 (diff) | |
| parent | d1d8706cdb77e2adbbb4110338dcda0e1811f892 (diff) | |
| download | cpython-1a5780aabb550cae175ad8711e2f33ba644d0ddb.tar.gz | |
Issue #29319: Prevent RunMainFromImporter overwriting sys.path[0].
Diffstat (limited to 'Tools/msi/exe/exe_files.wxs')
| -rw-r--r-- | Tools/msi/exe/exe_files.wxs | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/Tools/msi/exe/exe_files.wxs b/Tools/msi/exe/exe_files.wxs index 9e47b5d980..01385874fa 100644 --- a/Tools/msi/exe/exe_files.wxs +++ b/Tools/msi/exe/exe_files.wxs @@ -28,6 +28,9 @@ </Component> <Component Id="pythonw.exe" Directory="InstallDirectory" Guid="$(var.PythonwExeComponentGuid)"> <File Name="pythonw.exe" KeyPath="yes" /> + <RegistryKey Root="HKMU" Key="[REGISTRYKEY]"> + <RegistryValue Key="InstallPath" Name="WindowedExecutablePath" Type="string" Value="[#pythonw.exe]" KeyPath="no" /> + </RegistryKey> </Component> <Component Id="vcruntime140.dll" Directory="InstallDirectory" Guid="*"> <File Name="vcruntime140.dll" Source="!(bindpath.redist)vcruntime140.dll" KeyPath="yes" /> @@ -66,10 +69,13 @@ <Fragment> <ComponentGroup Id="exe_icons"> <Component Id="py.ico" Directory="DLLs" Guid="*"> - <File Name="py.ico" Source="!(bindpath.src)PC\py.ico" KeyPath="yes" /> + <File Name="py.ico" Source="!(bindpath.src)PC\icons\py.ico" KeyPath="yes" /> </Component> <Component Id="pyc.ico" Directory="DLLs" Guid="*"> - <File Name="pyc.ico" Source="!(bindpath.src)PC\pyc.ico" KeyPath="yes" /> + <File Name="pyc.ico" Source="!(bindpath.src)PC\icons\pyc.ico" KeyPath="yes" /> + </Component> + <Component Id="pyd.ico" Directory="DLLs" Guid="*"> + <File Name="pyd.ico" Source="!(bindpath.src)PC\icons\pyd.ico" KeyPath="yes" /> </Component> </ComponentGroup> </Fragment> |