From 97c6a4c93280b9e654e25e93546f3cac5ae63adf Mon Sep 17 00:00:00 2001 From: Josh Friend Date: Mon, 30 Mar 2015 15:31:03 -0400 Subject: [PATCH 1/2] add pypy-2.5.1 portable version --- plugins/python-build/share/python-build/pypy-2.5.1 | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/plugins/python-build/share/python-build/pypy-2.5.1 b/plugins/python-build/share/python-build/pypy-2.5.1 index fe77fe3d..f35c5eb9 100644 --- a/plugins/python-build/share/python-build/pypy-2.5.1 +++ b/plugins/python-build/share/python-build/pypy-2.5.1 @@ -3,12 +3,7 @@ case "$(pypy_architecture 2>/dev/null || true)" in if require_distro "Ubuntu 12.04" "Ubuntu 12.10" "Ubuntu 13.04" "Ubuntu 13.10" "Ubuntu 14.04" 1>/dev/null 2>&1; then install_package "pypy-2.5.1-linux" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.5.1-linux.tar.bz2#c0035a2650cafcb384050a8c476ddc41c9fd40b0c3677fab68026f57c715907a" "pypy" verify_py27 ensurepip else - # FIXME: portable distribution not yet available - echo - colorize 1 "ERROR" - echo ": The binary distribution of PyPy is not available for $(pypy_architecture 2>/dev/null || true)." - echo "try 'pypy-2.5.1-src' to build from soruce." - echo + install_package "pypy-2.5.0-linux_i686-portable" "https://bitbucket.org/squeaky/portable-pypy/downloads/pypy-2.5.1-linux_i686-portable.tar.bz2#ed532ddde3332d10faa59af49854cacbca458c597889352e619a87ab22363063" "pypy" verify_py27 ensurepip fi ;; "linux-armel" ) @@ -27,12 +22,7 @@ case "$(pypy_architecture 2>/dev/null || true)" in if require_distro "Ubuntu 12.04" 1>/dev/null 2>&1; then install_package "pypy-2.5.1-linux64" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.5.1-linux64.tar.bz2#68e0955dbc80a0d51dfa9a8a76d8623f34920ece1bcbc6d910c2be019a653ba8" "pypy" verify_py27 ensurepip else - # FIXME: portable distribution not yet available - echo - colorize 1 "ERROR" - echo ": The binary distribution of PyPy is not available for $(pypy_architecture 2>/dev/null || true)." - echo "try 'pypy-2.5.1-src' to build from soruce." - echo + install_package "pypy-2.5.1-linux_x86_64-portable" "https://bitbucket.org/squeaky/portable-pypy/downloads/pypy-2.5.1-linux_x86_64-portable.tar.bz2#157bee6349878cf0ef575b0d7bfd6cbb837c00e83b2872c924580ef7bc32c0d7" "pypy" verify_py27 ensurepip fi ;; "osx64" ) From 1aea75055af692ae50ff98c1d2622064c772c637 Mon Sep 17 00:00:00 2001 From: Josh Friend Date: Mon, 30 Mar 2015 22:07:33 -0400 Subject: [PATCH 2/2] fix pypy2.5.1 build folder for i686 --- plugins/python-build/share/python-build/pypy-2.5.1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/python-build/share/python-build/pypy-2.5.1 b/plugins/python-build/share/python-build/pypy-2.5.1 index f35c5eb9..02cc8824 100644 --- a/plugins/python-build/share/python-build/pypy-2.5.1 +++ b/plugins/python-build/share/python-build/pypy-2.5.1 @@ -3,7 +3,7 @@ case "$(pypy_architecture 2>/dev/null || true)" in if require_distro "Ubuntu 12.04" "Ubuntu 12.10" "Ubuntu 13.04" "Ubuntu 13.10" "Ubuntu 14.04" 1>/dev/null 2>&1; then install_package "pypy-2.5.1-linux" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.5.1-linux.tar.bz2#c0035a2650cafcb384050a8c476ddc41c9fd40b0c3677fab68026f57c715907a" "pypy" verify_py27 ensurepip else - install_package "pypy-2.5.0-linux_i686-portable" "https://bitbucket.org/squeaky/portable-pypy/downloads/pypy-2.5.1-linux_i686-portable.tar.bz2#ed532ddde3332d10faa59af49854cacbca458c597889352e619a87ab22363063" "pypy" verify_py27 ensurepip + install_package "pypy-2.5.1-linux_i686-portable" "https://bitbucket.org/squeaky/portable-pypy/downloads/pypy-2.5.1-linux_i686-portable.tar.bz2#ed532ddde3332d10faa59af49854cacbca458c597889352e619a87ab22363063" "pypy" verify_py27 ensurepip fi ;; "linux-armel" )