From bd312d652e2b51bd01cba8cf13d0ab418d734e17 Mon Sep 17 00:00:00 2001 From: Josh Friend Date: Sat, 19 Mar 2016 09:01:22 -0400 Subject: [PATCH] Add PyPy 5.0 Portable --- CHANGELOG.md | 4 ++++ .../python-build/share/python-build/pypy-5.0.0 | 14 ++++++++++---- .../share/python-build/pypy-portable-5.0 | 16 ++++++++++++++++ 3 files changed, 30 insertions(+), 4 deletions(-) create mode 100644 plugins/python-build/share/python-build/pypy-portable-5.0 diff --git a/CHANGELOG.md b/CHANGELOG.md index 3e0a0161..568fbed6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ ## Version History +## Unreleased + +* python-build: Added PyPy 5.0 Portable + ## 20160310 * python-build: Add PyPy-5.0.0 (#555) diff --git a/plugins/python-build/share/python-build/pypy-5.0.0 b/plugins/python-build/share/python-build/pypy-5.0.0 index cc16bf8c..4d17cfbb 100644 --- a/plugins/python-build/share/python-build/pypy-5.0.0 +++ b/plugins/python-build/share/python-build/pypy-5.0.0 @@ -1,7 +1,10 @@ case "$(pypy_architecture 2>/dev/null || true)" in "linux" ) - require_distro "Ubuntu 10.04" || true - install_package "pypy-5.0.0-linux" "https://bitbucket.org/pypy/pypy/downloads/pypy-5.0.0-linux.tar.bz2#a9cc9afa94ff1cde811626a70081c477c9840e7816c0562d1903fd823d222ceb" "pypy" verify_py27 ensurepip + if require_distro "Ubuntu 10.04" 1>/dev/null 2>&1; then + install_package "pypy-5.0.0-linux" "https://bitbucket.org/pypy/pypy/downloads/pypy-5.0.0-linux.tar.bz2#a9cc9afa94ff1cde811626a70081c477c9840e7816c0562d1903fd823d222ceb" "pypy" verify_py27 ensurepip + else + install_package "pypy-5.0-linux_i686-portable" "https://bitbucket.org/squeaky/portable-pypy/downloads/pypy-5.0-linux_i686-portable.tar.bz2#316e03afdd2f6212857789933c01f0d41a1665c80d28526c0fb4082b6d3f4f60" "pypy" verify_py27 ensurepip + fi ;; "linux-armel" ) require_distro "Ubuntu 12.04" || true @@ -24,8 +27,11 @@ case "$(pypy_architecture 2>/dev/null || true)" in install_package "pypy-5.0.0-ppc64le" "https://bitbucket.org/pypy/pypy/downloads/pypy-5.0.0-ppc64le.tar.bz2#e72fe5c094186f79c997000ddbaa01616def652a8d1338b75a27dfa3755eb86c" "pypy" verify_py27 ensurepip ;; "linux64" ) - require_distro "Ubuntu 12.04" "Ubuntu 12.10" "Ubuntu 13.04" "Ubuntu 13.10" "Ubuntu 14.04" || true - install_package "pypy-5.0.0-linux64" "https://bitbucket.org/pypy/pypy/downloads/pypy-5.0.0-linux64.tar.bz2#b9c73be8e3c3b0835df83bdb86335712005240071cdd4dc245ac30b457063ae0" "pypy" verify_py27 ensurepip + 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-5.0.0-linux64" "https://bitbucket.org/pypy/pypy/downloads/pypy-5.0.0-linux64.tar.bz2#b9c73be8e3c3b0835df83bdb86335712005240071cdd4dc245ac30b457063ae0" "pypy" verify_py27 ensurepip + else + install_package "pypy-5.0-linux_x86_64-portable" "https://bitbucket.org/squeaky/portable-pypy/downloads/pypy-5.0-linux_x86_64-portable.tar.bz2#57c9ea251bf1e7074e14aeecdd1ac8bb2fc53dbf3f90a9613d03e33076a7fa08" "pypy" verify_py27 ensurepip + fi ;; "osx64" ) install_package "pypy-5.0.0-osx64" "https://bitbucket.org/pypy/pypy/downloads/pypy-5.0.0-osx64.tar.bz2#45ed8bf799d0fd8eb051cbcc427173fba74dc9c2f6c309d7a3cc90f4917e6a10" "pypy" verify_py27 ensurepip diff --git a/plugins/python-build/share/python-build/pypy-portable-5.0 b/plugins/python-build/share/python-build/pypy-portable-5.0 new file mode 100644 index 00000000..57ae9772 --- /dev/null +++ b/plugins/python-build/share/python-build/pypy-portable-5.0 @@ -0,0 +1,16 @@ +case "$(pypy_architecture 2>/dev/null || true)" in +"linux" ) + install_package "pypy-5.0-linux_i686-portable" "https://bitbucket.org/squeaky/portable-pypy/downloads/pypy-5.0-linux_i686-portable.tar.bz2#316e03afdd2f6212857789933c01f0d41a1665c80d28526c0fb4082b6d3f4f60" "pypy" verify_py27 ensurepip + ;; +"linux64" ) + install_package "pypy-5.0-linux_x86_64-portable" "https://bitbucket.org/squeaky/portable-pypy/downloads/pypy-5.0-linux_x86_64-portable.tar.bz2#57c9ea251bf1e7074e14aeecdd1ac8bb2fc53dbf3f90a9613d03e33076a7fa08" "pypy" verify_py27 ensurepip + ;; +* ) + { echo + colorize 1 "ERROR" + echo ": Portable PyPy is not available for $(pypy_architecture 2>/dev/null || true)." + echo + } >&2 + exit 1 + ;; +esac