summaryrefslogtreecommitdiffstats
path: root/Tools
diff options
context:
space:
mode:
authorSteve Dower <steve.dower@microsoft.com>2019-03-27 15:14:53 (GMT)
committerGitHub <noreply@github.com>2019-03-27 15:14:53 (GMT)
commit4a9a505d6f2474a570422dad89f8d1b344d6cd36 (patch)
treebeb530c17126c4b3b2b7355f97cb10b3eee88c99 /Tools
parentf4333d0479d6974d142e858522e95cbf8381f016 (diff)
downloadcpython-4a9a505d6f2474a570422dad89f8d1b344d6cd36.zip
cpython-4a9a505d6f2474a570422dad89f8d1b344d6cd36.tar.gz
cpython-4a9a505d6f2474a570422dad89f8d1b344d6cd36.tar.bz2
bpo-36441: Fixes creating a venv when debug binaries are installed. (#12566)
Diffstat (limited to 'Tools')
-rw-r--r--Tools/msi/lib/lib_files.wxs15
1 files changed, 15 insertions, 0 deletions
diff --git a/Tools/msi/lib/lib_files.wxs b/Tools/msi/lib/lib_files.wxs
index a9952bd..251f9b1 100644
--- a/Tools/msi/lib/lib_files.wxs
+++ b/Tools/msi/lib/lib_files.wxs
@@ -69,6 +69,15 @@
</Fragment>
<Fragment>
+ <!-- The auto-generated directory is not available when building debug binaries -->
+ <DirectoryRef Id="Lib">
+ <Directory Id="Lib_venv__d" Name="venv">
+ <Directory Id="Lib_venv_scripts__d" Name="scripts">
+ <Directory Id="Lib_venv_scripts_nt__d" Name="nt" />
+ </Directory>
+ </Directory>
+ </DirectoryRef>
+
<ComponentGroup Id="lib_extensions_d">
<?foreach ext in $(var.exts)?>
@@ -87,6 +96,12 @@
<Component Id="sqlite3_d.pdb" Directory="DLLs" Guid="*">
<File Name="sqlite3_d.pdb" KeyPath="yes" />
</Component>
+ <Component Id="venvlauncher_d.exe" Directory="Lib_venv_scripts_nt__d" Guid="*">
+ <File Name="python_d.exe" Source="venvlauncher_d.exe" KeyPath="yes" />
+ </Component>
+ <Component Id="venvwlauncher_d.exe" Directory="Lib_venv_scripts_nt__d" Guid="*">
+ <File Name="pythonw_d.exe" Source="venvwlauncher_d.exe" KeyPath="yes" />
+ </Component>
</ComponentGroup>
</Fragment>
<Fragment>