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

A couple of patches to make it work with pypy 1.5 #2

Merged
merged 2 commits into from
Jun 13, 2011
Merged

A couple of patches to make it work with pypy 1.5 #2

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d384071
remove empty premade site-packages dir to replace with symlink
numerodix Jun 13, 2011
d067106
remove nojit message on 64bit
numerodix Jun 13, 2011
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
6 changes: 2 additions & 4 deletions pypyenv.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ def install(download):
pythonsite = os.path.join("..", "lib", "python" + version, "site-packages")
pypysite = os.path.join("pypy", "site-packages")
out("installing ENV/%s symlink" % pypysite)
shutil.rmtree(pypysite)
os.symlink(pythonsite, pypysite)

def uninstall():
Expand Down Expand Up @@ -116,16 +117,13 @@ def main():
if win:
print "Supports only Linux and OS X at this point"
sys.exit(2)
if x86_64 and jit:
print "JIT is not supported on x86_64, rerun with --nojit"
sys.exit(2)

if linux and x86 and jit:
download = "http://pypy.org/download/pypy-1.5-linux.tar.bz2"
if linux and x86 and nojit:
download = "http://pypy.org/download/pypy-1.5-linux-nojit.tar.bz2"
elif linux and x86_64:
download = "http://pypy.org/download/pypy-1.5-linux64-nojit.tar.bz2"
download = "http://pypy.org/download/pypy-1.5-linux64.tar.bz2"
elif osx and jit:
download = "http://pypy.org/download/pypy-1.5-osx.tar.bz2"
elif osx and nojit:
Expand Down