Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

BUG: pypy dlls are named differently #1103

Merged
merged 1 commit into from
Dec 14, 2017
Merged

BUG: pypy dlls are named differently #1103

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 19 additions & 11 deletions virtualenv.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1248,16 +1248,24 @@ def install_python(home_dir, lib_dir, inc_dir, bin_dir, site_packages, clear, sy

# we need to copy the DLL to enforce that windows will load the correct one.
# may not exist if we are cygwin.
py_executable_dlls = [
(
'python%s.dll' % (sys.version_info[0]),
'python%s_d.dll' % (sys.version_info[0])
),
(
'python%s%s.dll' % (sys.version_info[0], sys.version_info[1]),
'python%s%s_d.dll' % (sys.version_info[0], sys.version_info[1])
)
]
if is_pypy:
py_executable_dlls = [
(
'libpypy-c.dll',
'libpypy_d-c.dll',
),
]
else:
py_executable_dlls = [
(
'python%s.dll' % (sys.version_info[0]),
'python%s_d.dll' % (sys.version_info[0])
),
(
'python%s%s.dll' % (sys.version_info[0], sys.version_info[1]),
'python%s%s_d.dll' % (sys.version_info[0], sys.version_info[1])
)
]

for py_executable_dll, py_executable_dll_d in py_executable_dlls:
pythondll = os.path.join(os.path.dirname(sys.executable), py_executable_dll)
Expand All @@ -1281,7 +1289,7 @@ def install_python(home_dir, lib_dir, inc_dir, bin_dir, site_packages, clear, sy
copyfile(py_executable, python_executable, symlink)

if is_win:
for name in ['libexpat.dll', 'libpypy.dll', 'libpypy-c.dll',
for name in ['libexpat.dll',
'libeay32.dll', 'ssleay32.dll', 'sqlite3.dll',
'tcl85.dll', 'tk85.dll']:
src = join(prefix, name)
Expand Down