From 871ec77795fac421989a086c62cf895c2131a0e4 Mon Sep 17 00:00:00 2001 From: Ollie Walsh Date: Wed, 19 Nov 2014 20:50:34 +0000 Subject: [PATCH 1/2] Add Portable PyPy binaries from https://github.com/squeaky-pl/portable-pypy --- .../share/python-build/pypy-portable-2.3.1 | 16 ++++++++++++++++ .../share/python-build/pypy-portable-2.4.0 | 16 ++++++++++++++++ .../share/python-build/pypy3-portable-2.3.1 | 16 ++++++++++++++++ .../share/python-build/pypy3-portable-2.4.0 | 16 ++++++++++++++++ 4 files changed, 64 insertions(+) create mode 100644 plugins/python-build/share/python-build/pypy-portable-2.3.1 create mode 100644 plugins/python-build/share/python-build/pypy-portable-2.4.0 create mode 100644 plugins/python-build/share/python-build/pypy3-portable-2.3.1 create mode 100644 plugins/python-build/share/python-build/pypy3-portable-2.4.0 diff --git a/plugins/python-build/share/python-build/pypy-portable-2.3.1 b/plugins/python-build/share/python-build/pypy-portable-2.3.1 new file mode 100644 index 00000000..7faf1345 --- /dev/null +++ b/plugins/python-build/share/python-build/pypy-portable-2.3.1 @@ -0,0 +1,16 @@ +case "$(pypy_architecture 2>/dev/null || true)" in +"linux" ) + install_package "pypy-2.3.1-linux_i686-portable" "https://bitbucket.org/squeaky/portable-pypy/downloads/pypy-2.3.1-linux_i686-portable.tar.bz2" "pypy" verify_py27 ensurepip + ;; +"linux64" ) + install_package "pypy-2.3.1-linux_x86_64-portable" "https://bitbucket.org/squeaky/portable-pypy/downloads/pypy-2.3.1-linux_x86_64-portable.tar.bz2" "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 diff --git a/plugins/python-build/share/python-build/pypy-portable-2.4.0 b/plugins/python-build/share/python-build/pypy-portable-2.4.0 new file mode 100644 index 00000000..b3868c54 --- /dev/null +++ b/plugins/python-build/share/python-build/pypy-portable-2.4.0 @@ -0,0 +1,16 @@ +case "$(pypy_architecture 2>/dev/null || true)" in +"linux" ) + install_package "pypy-2.4.0-linux_i686-portable" "https://bitbucket.org/squeaky/portable-pypy/downloads/pypy-2.4.0-linux_i686-portable.tar.bz2" "pypy" verify_py27 ensurepip + ;; +"linux64" ) + install_package "pypy-2.4.0-linux_x86_64-portable" "https://bitbucket.org/squeaky/portable-pypy/downloads/pypy-2.4.0-linux_x86_64-portable.tar.bz2" "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 diff --git a/plugins/python-build/share/python-build/pypy3-portable-2.3.1 b/plugins/python-build/share/python-build/pypy3-portable-2.3.1 new file mode 100644 index 00000000..906dce7f --- /dev/null +++ b/plugins/python-build/share/python-build/pypy3-portable-2.3.1 @@ -0,0 +1,16 @@ +case "$(pypy_architecture 2>/dev/null || true)" in +"linux" ) + install_package "pypy3-2.3.1-linux_i686-portable" "https://bitbucket.org/squeaky/portable-pypy/downloads/pypy3-2.3.1-linux_i686-portable.tar.bz2" "pypy" verify_py32 ensurepip + ;; +"linux64" ) + install_package "pypy3-2.3.1-linux_x86_64-portable" "https://bitbucket.org/squeaky/portable-pypy/downloads/pypy3-2.3.1-linux_x86_64-portable.tar.bz2" "pypy" verify_py32 ensurepip + ;; +* ) + { echo + colorize 1 "ERROR" + echo ": Portable PyPy3 is not available for $(pypy_architecture 2>/dev/null || true)." + echo + } >&2 + exit 1 + ;; +esac diff --git a/plugins/python-build/share/python-build/pypy3-portable-2.4.0 b/plugins/python-build/share/python-build/pypy3-portable-2.4.0 new file mode 100644 index 00000000..c7521cfb --- /dev/null +++ b/plugins/python-build/share/python-build/pypy3-portable-2.4.0 @@ -0,0 +1,16 @@ +case "$(pypy_architecture 2>/dev/null || true)" in +"linux" ) + install_package "pypy3-2.4.0-linux_i686-portable" "https://bitbucket.org/squeaky/portable-pypy/downloads/pypy3-2.4.0-linux_i686-portable.tar.bz2" "pypy" verify_py32 ensurepip + ;; +"linux64" ) + install_package "pypy3-2.4.0-linux_x86_64-portable" "https://bitbucket.org/squeaky/portable-pypy/downloads/pypy3-2.4.0-linux_x86_64-portable.tar.bz2" "pypy" verify_py32 ensurepip + ;; +* ) + { echo + colorize 1 "ERROR" + echo ": Portable PyPy3 is not available for $(pypy_architecture 2>/dev/null || true)." + echo + } >&2 + exit 1 + ;; +esac From 3a5c2cabb1b8abded69133f43185345020bdc6c8 Mon Sep 17 00:00:00 2001 From: Ollie Walsh Date: Wed, 19 Nov 2014 21:01:56 +0000 Subject: [PATCH 2/2] Fix portable python url for 2.4.0 --- plugins/python-build/share/python-build/pypy-portable-2.4.0 | 4 ++-- plugins/python-build/share/python-build/pypy3-portable-2.4.0 | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/plugins/python-build/share/python-build/pypy-portable-2.4.0 b/plugins/python-build/share/python-build/pypy-portable-2.4.0 index b3868c54..7900c624 100644 --- a/plugins/python-build/share/python-build/pypy-portable-2.4.0 +++ b/plugins/python-build/share/python-build/pypy-portable-2.4.0 @@ -1,9 +1,9 @@ case "$(pypy_architecture 2>/dev/null || true)" in "linux" ) - install_package "pypy-2.4.0-linux_i686-portable" "https://bitbucket.org/squeaky/portable-pypy/downloads/pypy-2.4.0-linux_i686-portable.tar.bz2" "pypy" verify_py27 ensurepip + install_package "pypy-2.4-linux_i686-portable" "https://bitbucket.org/squeaky/portable-pypy/downloads/pypy-2.4-linux_i686-portable.tar.bz2" "pypy" verify_py27 ensurepip ;; "linux64" ) - install_package "pypy-2.4.0-linux_x86_64-portable" "https://bitbucket.org/squeaky/portable-pypy/downloads/pypy-2.4.0-linux_x86_64-portable.tar.bz2" "pypy" verify_py27 ensurepip + install_package "pypy-2.4-linux_x86_64-portable" "https://bitbucket.org/squeaky/portable-pypy/downloads/pypy-2.4-linux_x86_64-portable.tar.bz2" "pypy" verify_py27 ensurepip ;; * ) { echo diff --git a/plugins/python-build/share/python-build/pypy3-portable-2.4.0 b/plugins/python-build/share/python-build/pypy3-portable-2.4.0 index c7521cfb..3d0c569c 100644 --- a/plugins/python-build/share/python-build/pypy3-portable-2.4.0 +++ b/plugins/python-build/share/python-build/pypy3-portable-2.4.0 @@ -1,9 +1,9 @@ case "$(pypy_architecture 2>/dev/null || true)" in "linux" ) - install_package "pypy3-2.4.0-linux_i686-portable" "https://bitbucket.org/squeaky/portable-pypy/downloads/pypy3-2.4.0-linux_i686-portable.tar.bz2" "pypy" verify_py32 ensurepip + install_package "pypy3-2.4-linux_i686-portable" "https://bitbucket.org/squeaky/portable-pypy/downloads/pypy3-2.4-linux_i686-portable.tar.bz2" "pypy" verify_py32 ensurepip ;; "linux64" ) - install_package "pypy3-2.4.0-linux_x86_64-portable" "https://bitbucket.org/squeaky/portable-pypy/downloads/pypy3-2.4.0-linux_x86_64-portable.tar.bz2" "pypy" verify_py32 ensurepip + install_package "pypy3-2.4-linux_x86_64-portable" "https://bitbucket.org/squeaky/portable-pypy/downloads/pypy3-2.4-linux_x86_64-portable.tar.bz2" "pypy" verify_py32 ensurepip ;; * ) { echo