diff options
| author | Philip Jenvey <pjenvey@underboss.org> | 2017-12-14 07:41:55 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-14 07:41:55 -0800 |
| commit | e8163e83a92c9098f51d390289323232ece15e3b (patch) | |
| tree | a96e0ced7978bbb349141bf7b9ecc0bb1a6cf8b6 | |
| parent | e9165093529371f7d3eaedf26e7bbcdc18445380 (diff) | |
| parent | 4e6711d9e21bd6fd44efc7d0415a6df976987c84 (diff) | |
| download | virtualenv-e8163e83a92c9098f51d390289323232ece15e3b.tar.gz | |
Merge pull request #1103 from mattip/pypy-dlls
BUG: pypy dlls are named differently
| -rwxr-xr-x | virtualenv.py | 30 |
1 files changed, 19 insertions, 11 deletions
diff --git a/virtualenv.py b/virtualenv.py index fc54f48..deec814 100755 --- a/virtualenv.py +++ b/virtualenv.py @@ -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) @@ -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) |