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

PyPy 1.3 -> 1.5 #1

Merged
merged 2 commits into from May 17, 2011
Merged

PyPy 1.3 -> 1.5 #1

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1e2783c
PyPy 1.3 -> 1.5
jonashaag May 17, 2011
8e491eb
fix this
jonashaag May 17, 2011
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 7 additions & 7 deletions pypyenv.py 100755 → 100644
View file
Open in desktop
Expand Up @@ -86,8 +86,8 @@ def confirm_deletion(tree):
--nojit - Install non-JIT version."""

def main():
if version != "2.5":
if not raw_input("PyPy implements Python 2.5, you are using a " \
if version != "2.7":
if not raw_input("PyPy implements Python 2.7, you are using a " \
"different version, continue? [y/N] ") in yes:
sys.exit(1)
try:
Expand Down Expand Up @@ -121,15 +121,15 @@ def main():
sys.exit(2)

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

if args[0] == "install":
install(download)
Expand Down