Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
4a9a505d
Commit
4a9a505d
authored
Mar 27, 2019
by
Steve Dower
Committed by
GitHub
Mar 27, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bpo-36441: Fixes creating a venv when debug binaries are installed. (#12566)
parent
f4333d04
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
19 additions
and
0 deletions
+19
-0
Lib/venv/__init__.py
Lib/venv/__init__.py
+3
-0
Misc/NEWS.d/next/Windows/2019-03-26-11-46-15.bpo-36441.lYjGF1.rst
...S.d/next/Windows/2019-03-26-11-46-15.bpo-36441.lYjGF1.rst
+1
-0
Tools/msi/lib/lib_files.wxs
Tools/msi/lib/lib_files.wxs
+15
-0
No files found.
Lib/venv/__init__.py
View file @
4a9a505d
...
...
@@ -195,6 +195,9 @@ class EnvBuilder:
src
=
os
.
path
.
join
(
os
.
path
.
dirname
(
src
),
basename
+
ext
)
else
:
src
=
srcfn
if
not
os
.
path
.
exists
(
src
):
logger
.
warning
(
'Unable to copy %r'
,
src
)
return
shutil
.
copyfile
(
src
,
dst
)
...
...
Misc/NEWS.d/next/Windows/2019-03-26-11-46-15.bpo-36441.lYjGF1.rst
0 → 100644
View file @
4a9a505d
Fixes creating a venv when debug binaries are installed.
Tools/msi/lib/lib_files.wxs
View file @
4a9a505d
...
...
@@ -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>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment