Commit 4a9a505d authored by Steve Dower's avatar Steve Dower Committed by GitHub

bpo-36441: Fixes creating a venv when debug binaries are installed. (#12566)

parent f4333d04
...@@ -195,6 +195,9 @@ class EnvBuilder: ...@@ -195,6 +195,9 @@ class EnvBuilder:
src = os.path.join(os.path.dirname(src), basename + ext) src = os.path.join(os.path.dirname(src), basename + ext)
else: else:
src = srcfn src = srcfn
if not os.path.exists(src):
logger.warning('Unable to copy %r', src)
return
shutil.copyfile(src, dst) shutil.copyfile(src, dst)
......
Fixes creating a venv when debug binaries are installed.
...@@ -69,6 +69,15 @@ ...@@ -69,6 +69,15 @@
</Fragment> </Fragment>
<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"> <ComponentGroup Id="lib_extensions_d">
<?foreach ext in $(var.exts)?> <?foreach ext in $(var.exts)?>
...@@ -87,6 +96,12 @@ ...@@ -87,6 +96,12 @@
<Component Id="sqlite3_d.pdb" Directory="DLLs" Guid="*"> <Component Id="sqlite3_d.pdb" Directory="DLLs" Guid="*">
<File Name="sqlite3_d.pdb" KeyPath="yes" /> <File Name="sqlite3_d.pdb" KeyPath="yes" />
</Component> </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> </ComponentGroup>
</Fragment> </Fragment>
<Fragment> <Fragment>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment