diff options
| author | Steve Dower <steve.dower@microsoft.com> | 2018-12-10 08:11:34 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-10 08:11:34 -0800 |
| commit | b264c609853eae9dbb45c6dbee11e84ae3927e88 (patch) | |
| tree | 607edf9521e3243856ee9e5804a9cf45cfef6b82 /Tools | |
| parent | ef1fc0d031c925416d49b407518932ccbf57a0d2 (diff) | |
| download | cpython-git-b264c609853eae9dbb45c6dbee11e84ae3927e88.tar.gz | |
[3.7] bpo-34977: Use venv redirector instead of original python.exe on Windows (GH-11029)
Diffstat (limited to 'Tools')
| -rw-r--r-- | Tools/msi/lib/lib_files.wxs | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/Tools/msi/lib/lib_files.wxs b/Tools/msi/lib/lib_files.wxs index da9d1c9f34..4bd0c57e32 100644 --- a/Tools/msi/lib/lib_files.wxs +++ b/Tools/msi/lib/lib_files.wxs @@ -2,6 +2,8 @@ <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> <?define exts=pyexpat;select;unicodedata;winsound;_bz2;_elementtree;_socket;_ssl;_msi;_ctypes;_hashlib;_multiprocessing;_lzma;_decimal;_overlapped;_sqlite3;_asyncio;_queue;_contextvars ?> <Fragment> + <DirectoryRef Id="Lib_venv_scripts_nt" /> + <ComponentGroup Id="lib_extensions"> <?foreach ext in $(var.exts)?> @@ -20,10 +22,25 @@ <Component Id="libssl.dll" Directory="DLLs" Guid="*"> <File Name="libssl$(var.ssltag).dll" KeyPath="yes" /> </Component> + <Component Id="venvlauncher.exe" Directory="Lib_venv_scripts_nt" Guid="*"> + <File Name="python.exe" Source="venvlauncher.exe" KeyPath="yes" /> + </Component> + <Component Id="venvwlauncher.exe" Directory="Lib_venv_scripts_nt" Guid="*"> + <File Name="pythonw.exe" Source="venvwlauncher.exe" KeyPath="yes" /> + </Component> </ComponentGroup> </Fragment> <Fragment> + <!-- The auto-generated directory is not available when building symbols --> + <DirectoryRef Id="Lib"> + <Directory Id="Lib_venv__pdbs" Name="venv"> + <Directory Id="Lib_venv_scripts__pdbs" Name="scripts"> + <Directory Id="Lib_venv_scripts_nt__pdbs" Name="nt" /> + </Directory> + </Directory> + </DirectoryRef> + <ComponentGroup Id="lib_extensions_symbols"> <?foreach ext in $(var.exts)?> @@ -42,6 +59,12 @@ <Component Id="libssl.pdb" Directory="DLLs" Guid="*"> <File Name="libssl$(var.ssltag).pdb" KeyPath="yes" /> </Component> + <Component Id="venvlauncher.pdb" Directory="Lib_venv_scripts_nt__pdbs" Guid="*"> + <File Name="python.pdb" Source="venvlauncher.pdb" KeyPath="yes" /> + </Component> + <Component Id="venvwlauncher.pdb" Directory="Lib_venv_scripts_nt__pdbs" Guid="*"> + <File Name="pythonw.pdb" Source="venvwlauncher.pdb" KeyPath="yes" /> + </Component> </ComponentGroup> </Fragment> |