From 871ec77795fac421989a086c62cf895c2131a0e4 Mon Sep 17 00:00:00 2001 From: Ollie Walsh Date: Wed, 19 Nov 2014 20:50:34 +0000 Subject: [PATCH 1/6] 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/6] 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 From 292813eca39d3dd18fde2e6c3040071607b25e51 Mon Sep 17 00:00:00 2001 From: Yamashita Yuu Date: Wed, 11 Mar 2015 21:01:32 +0900 Subject: [PATCH 3/6] Install pypy-portable binaries on unsupported platforms (#329) --- plugins/python-build/share/python-build/pypy-2.3.1 | 14 ++++++++++---- plugins/python-build/share/python-build/pypy-2.4.0 | 14 ++++++++++---- 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/plugins/python-build/share/python-build/pypy-2.3.1 b/plugins/python-build/share/python-build/pypy-2.3.1 index e48089b2..c8ec802e 100644 --- a/plugins/python-build/share/python-build/pypy-2.3.1 +++ b/plugins/python-build/share/python-build/pypy-2.3.1 @@ -1,7 +1,10 @@ case "$(pypy_architecture 2>/dev/null || true)" in "linux" ) - require_distro "Ubuntu 10.04" || true - install_package "pypy-2.3.1-linux" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.3.1-linux.tar.bz2#3eed698e8533cca7cbd2c2c87fce39dc14baa7dec03f4b082d870131d2a470e4" "pypy" verify_py27 ensurepip + if require_distro "Ubuntu 10.04" 1>/dev/null 2>&1; then + install_package "pypy-2.3.1-linux" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.3.1-linux.tar.bz2#3eed698e8533cca7cbd2c2c87fce39dc14baa7dec03f4b082d870131d2a470e4" "pypy" verify_py27 ensurepip + else + 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 + fi ;; "linux-armel" ) require_distro "Ubuntu 12.04" || true @@ -16,8 +19,11 @@ case "$(pypy_architecture 2>/dev/null || true)" in fi ;; "linux64" ) - require_distro "Ubuntu 12.04" || true - install_package "pypy-2.3.1-linux64" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.3.1-linux64.tar.bz2#dab7940496d96f1f255a8ef402fa96b94444775e373484e057d2fcabc3928b42" "pypy" verify_py27 ensurepip + if require_distro "Ubuntu 12.04" 1>/dev/null 2>&1; then + install_package "pypy-2.3.1-linux64" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.3.1-linux64.tar.bz2#dab7940496d96f1f255a8ef402fa96b94444775e373484e057d2fcabc3928b42" "pypy" verify_py27 ensurepip + else + 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 + fi ;; "osx64" ) install_package "pypy-2.3.1-osx64" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.3.1-osx64.tar.bz2#12e363bf5ea3a508600e043b68c47d4148359ca3d999ee207665bb139f8fbf37" "pypy" verify_py27 ensurepip diff --git a/plugins/python-build/share/python-build/pypy-2.4.0 b/plugins/python-build/share/python-build/pypy-2.4.0 index d05cc231..6b1971fe 100644 --- a/plugins/python-build/share/python-build/pypy-2.4.0 +++ b/plugins/python-build/share/python-build/pypy-2.4.0 @@ -1,7 +1,10 @@ case "$(pypy_architecture 2>/dev/null || true)" in "linux" ) - require_distro "Ubuntu 12.04" "Ubuntu 12.10" "Ubuntu 13.04" "Ubuntu 13.10" "Ubuntu 14.04" || true - install_package "pypy-2.4.0-linux" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.4.0-linux.tar.bz2#a24adb366f87ac0eba829d7188a156a7d897e71893689fab06502c3f4152ac0e" "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-2.4.0-linux" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.4.0-linux.tar.bz2#a24adb366f87ac0eba829d7188a156a7d897e71893689fab06502c3f4152ac0e" "pypy" verify_py27 ensurepip + else + 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 + fi ;; "linux-armel" ) require_distro "Ubuntu 12.04" "Ubuntu 12.10" "Ubuntu 13.04" "Ubuntu 13.10" "Ubuntu 14.04" || true @@ -16,8 +19,11 @@ case "$(pypy_architecture 2>/dev/null || true)" in fi ;; "linux64" ) - require_distro "Ubuntu 12.04" || true - install_package "pypy-2.4.0-linux64" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.4.0-linux64.tar.bz2#27cdc0d6e8bce2637678f6d076fc780877dffe1bf9aec9e253f95219af9ed099" "pypy" verify_py27 ensurepip + if require_distro "Ubuntu 12.04" 1>/dev/null 2>&1; then + install_package "pypy-2.4.0-linux64" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.4.0-linux64.tar.bz2#27cdc0d6e8bce2637678f6d076fc780877dffe1bf9aec9e253f95219af9ed099" "pypy" verify_py27 ensurepip + else + 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 + fi ;; "osx64" ) install_package "pypy-2.4.0-osx64" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.4.0-osx64.tar.bz2#3eb8afdfa42bc9b08b4d3058e21d4ce978a52722fdcfdc67d6c3ee5013a51aaa" "pypy" verify_py27 ensurepip From 527334b401c09849fddf42fa42bc260b2eb2f074 Mon Sep 17 00:00:00 2001 From: Yamashita Yuu Date: Thu, 12 Mar 2015 01:12:47 +0900 Subject: [PATCH 4/6] Add pypy-portable-2.5 (#329) --- .../{pypy-portable-2.4.0 => pypy-portable-2.4} | 0 .../share/python-build/pypy-portable-2.5 | 16 ++++++++++++++++ .../{pypy3-portable-2.4.0 => pypy3-portable-2.4} | 0 3 files changed, 16 insertions(+) rename plugins/python-build/share/python-build/{pypy-portable-2.4.0 => pypy-portable-2.4} (100%) create mode 100644 plugins/python-build/share/python-build/pypy-portable-2.5 rename plugins/python-build/share/python-build/{pypy3-portable-2.4.0 => pypy3-portable-2.4} (100%) 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 similarity index 100% rename from plugins/python-build/share/python-build/pypy-portable-2.4.0 rename to plugins/python-build/share/python-build/pypy-portable-2.4 diff --git a/plugins/python-build/share/python-build/pypy-portable-2.5 b/plugins/python-build/share/python-build/pypy-portable-2.5 new file mode 100644 index 00000000..f0f11968 --- /dev/null +++ b/plugins/python-build/share/python-build/pypy-portable-2.5 @@ -0,0 +1,16 @@ +case "$(pypy_architecture 2>/dev/null || true)" in +"linux" ) + install_package "pypy-2.5-linux_i686-portable" "https://bitbucket.org/squeaky/portable-pypy/downloads/pypy-2.5-linux_i686-portable.tar.bz2" "pypy" verify_py27 ensurepip + ;; +"linux64" ) + install_package "pypy-2.5-linux_x86_64-portable" "https://bitbucket.org/squeaky/portable-pypy/downloads/pypy-2.5-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.4.0 b/plugins/python-build/share/python-build/pypy3-portable-2.4 similarity index 100% rename from plugins/python-build/share/python-build/pypy3-portable-2.4.0 rename to plugins/python-build/share/python-build/pypy3-portable-2.4 From 797975b742adf333d35884aeec5fec506e4ef4aa Mon Sep 17 00:00:00 2001 From: Yamashita Yuu Date: Thu, 12 Mar 2015 01:21:58 +0900 Subject: [PATCH 5/6] Add sha256sum to pypy-portable archives (#329) --- plugins/python-build/share/python-build/pypy-portable-2.3.1 | 4 ++-- plugins/python-build/share/python-build/pypy-portable-2.4 | 4 ++-- plugins/python-build/share/python-build/pypy-portable-2.5 | 4 ++-- plugins/python-build/share/python-build/pypy3-portable-2.3.1 | 4 ++-- plugins/python-build/share/python-build/pypy3-portable-2.4 | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) 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 index 7faf1345..a4347dab 100644 --- a/plugins/python-build/share/python-build/pypy-portable-2.3.1 +++ b/plugins/python-build/share/python-build/pypy-portable-2.3.1 @@ -1,9 +1,9 @@ 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 + 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#d8784020f6b8a5812fd8b3f5e1df8afb176fd56c2a929d4408d28d4a925525fa" "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 + 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#453bd1291f0372e25ceab6b37b7a8d1756bebd3e708fcce1379ef931ccf9f75a" "pypy" verify_py27 ensurepip ;; * ) { echo diff --git a/plugins/python-build/share/python-build/pypy-portable-2.4 b/plugins/python-build/share/python-build/pypy-portable-2.4 index 7900c624..dbc86267 100644 --- a/plugins/python-build/share/python-build/pypy-portable-2.4 +++ b/plugins/python-build/share/python-build/pypy-portable-2.4 @@ -1,9 +1,9 @@ case "$(pypy_architecture 2>/dev/null || true)" in "linux" ) - 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 + install_package "pypy-2.4-linux_i686-portable" "https://bitbucket.org/squeaky/portable-pypy/downloads/pypy-2.4-linux_i686-portable.tar.bz2#2a330bbeae038c143366982f2104bf4096752f1ec7520fc5608f0527c124b0c2" "pypy" verify_py27 ensurepip ;; "linux64" ) - 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 + 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#b6ed31aff0ebcc9b40554576b1ce789fe4e8c93f7a34cd3983515e1a9a8a45b6" "pypy" verify_py27 ensurepip ;; * ) { echo diff --git a/plugins/python-build/share/python-build/pypy-portable-2.5 b/plugins/python-build/share/python-build/pypy-portable-2.5 index f0f11968..1bc3e6bd 100644 --- a/plugins/python-build/share/python-build/pypy-portable-2.5 +++ b/plugins/python-build/share/python-build/pypy-portable-2.5 @@ -1,9 +1,9 @@ case "$(pypy_architecture 2>/dev/null || true)" in "linux" ) - install_package "pypy-2.5-linux_i686-portable" "https://bitbucket.org/squeaky/portable-pypy/downloads/pypy-2.5-linux_i686-portable.tar.bz2" "pypy" verify_py27 ensurepip + install_package "pypy-2.5-linux_i686-portable" "https://bitbucket.org/squeaky/portable-pypy/downloads/pypy-2.5-linux_i686-portable.tar.bz2#6cbe3e1a48900f22c8e4412f82906fba92dd4a165bac5fe6866a2a26383fe3b8" "pypy" verify_py27 ensurepip ;; "linux64" ) - install_package "pypy-2.5-linux_x86_64-portable" "https://bitbucket.org/squeaky/portable-pypy/downloads/pypy-2.5-linux_x86_64-portable.tar.bz2" "pypy" verify_py27 ensurepip + install_package "pypy-2.5-linux_x86_64-portable" "https://bitbucket.org/squeaky/portable-pypy/downloads/pypy-2.5-linux_x86_64-portable.tar.bz2#26c5a0964b32b09be0282766c27937c843a12b6820ff2d440c6d47a6092837e0" "pypy" verify_py27 ensurepip ;; * ) { echo 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 index 906dce7f..a5ac9639 100644 --- a/plugins/python-build/share/python-build/pypy3-portable-2.3.1 +++ b/plugins/python-build/share/python-build/pypy3-portable-2.3.1 @@ -1,9 +1,9 @@ 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 + 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#32a5b3fd4299b13aedf7bc6262eee0f6be9a27744ccf787718553d973ec38abb" "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 + 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#cb56b5bde8f444d44a0ea9cd475ddeed00aa895f3dcc89fd37577a51439540aa" "pypy" verify_py32 ensurepip ;; * ) { echo diff --git a/plugins/python-build/share/python-build/pypy3-portable-2.4 b/plugins/python-build/share/python-build/pypy3-portable-2.4 index 3d0c569c..897c3152 100644 --- a/plugins/python-build/share/python-build/pypy3-portable-2.4 +++ b/plugins/python-build/share/python-build/pypy3-portable-2.4 @@ -1,9 +1,9 @@ case "$(pypy_architecture 2>/dev/null || true)" in "linux" ) - 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 + install_package "pypy3-2.4-linux_i686-portable" "https://bitbucket.org/squeaky/portable-pypy/downloads/pypy3-2.4-linux_i686-portable.tar.bz2#7ce050b4928dc58f7e9dd01e3e48c443c85616ca83f4bcc9147f1078d0fd126c" "pypy" verify_py32 ensurepip ;; "linux64" ) - 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 + 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#7b3e0f0bc924bd0d68d85c0b566979e74a2b366595db3d81502267367370a5fb" "pypy" verify_py32 ensurepip ;; * ) { echo From 2beef3c45597d2e1f493a51e36ac0d1218fb5a7f Mon Sep 17 00:00:00 2001 From: Yamashita Yuu Date: Thu, 12 Mar 2015 01:28:21 +0900 Subject: [PATCH 6/6] Add pypy-portable binary to some pypy/pypy3 versions --- plugins/python-build/share/python-build/pypy-2.3.1 | 4 ++-- plugins/python-build/share/python-build/pypy-2.4.0 | 4 ++-- plugins/python-build/share/python-build/pypy-2.5.0 | 14 ++++++++++---- .../python-build/share/python-build/pypy3-2.3.1 | 14 ++++++++++---- .../python-build/share/python-build/pypy3-2.4.0 | 14 ++++++++++---- 5 files changed, 34 insertions(+), 16 deletions(-) diff --git a/plugins/python-build/share/python-build/pypy-2.3.1 b/plugins/python-build/share/python-build/pypy-2.3.1 index c8ec802e..e60dede2 100644 --- a/plugins/python-build/share/python-build/pypy-2.3.1 +++ b/plugins/python-build/share/python-build/pypy-2.3.1 @@ -3,7 +3,7 @@ case "$(pypy_architecture 2>/dev/null || true)" in if require_distro "Ubuntu 10.04" 1>/dev/null 2>&1; then install_package "pypy-2.3.1-linux" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.3.1-linux.tar.bz2#3eed698e8533cca7cbd2c2c87fce39dc14baa7dec03f4b082d870131d2a470e4" "pypy" verify_py27 ensurepip else - 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 + 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#d8784020f6b8a5812fd8b3f5e1df8afb176fd56c2a929d4408d28d4a925525fa" "pypy" verify_py27 ensurepip fi ;; "linux-armel" ) @@ -22,7 +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.3.1-linux64" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.3.1-linux64.tar.bz2#dab7940496d96f1f255a8ef402fa96b94444775e373484e057d2fcabc3928b42" "pypy" verify_py27 ensurepip else - 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 + 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#453bd1291f0372e25ceab6b37b7a8d1756bebd3e708fcce1379ef931ccf9f75a" "pypy" verify_py27 ensurepip fi ;; "osx64" ) diff --git a/plugins/python-build/share/python-build/pypy-2.4.0 b/plugins/python-build/share/python-build/pypy-2.4.0 index 6b1971fe..e9696342 100644 --- a/plugins/python-build/share/python-build/pypy-2.4.0 +++ b/plugins/python-build/share/python-build/pypy-2.4.0 @@ -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.4.0-linux" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.4.0-linux.tar.bz2#a24adb366f87ac0eba829d7188a156a7d897e71893689fab06502c3f4152ac0e" "pypy" verify_py27 ensurepip else - 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 + install_package "pypy-2.4-linux_i686-portable" "https://bitbucket.org/squeaky/portable-pypy/downloads/pypy-2.4-linux_i686-portable.tar.bz2#2a330bbeae038c143366982f2104bf4096752f1ec7520fc5608f0527c124b0c2" "pypy" verify_py27 ensurepip fi ;; "linux-armel" ) @@ -22,7 +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.4.0-linux64" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.4.0-linux64.tar.bz2#27cdc0d6e8bce2637678f6d076fc780877dffe1bf9aec9e253f95219af9ed099" "pypy" verify_py27 ensurepip else - 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 + 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#b6ed31aff0ebcc9b40554576b1ce789fe4e8c93f7a34cd3983515e1a9a8a45b6" "pypy" verify_py27 ensurepip fi ;; "osx64" ) diff --git a/plugins/python-build/share/python-build/pypy-2.5.0 b/plugins/python-build/share/python-build/pypy-2.5.0 index 4faed32f..bda6bafe 100644 --- a/plugins/python-build/share/python-build/pypy-2.5.0 +++ b/plugins/python-build/share/python-build/pypy-2.5.0 @@ -1,7 +1,10 @@ case "$(pypy_architecture 2>/dev/null || true)" in "linux" ) - require_distro "Ubuntu 12.04" "Ubuntu 12.10" "Ubuntu 13.04" "Ubuntu 13.10" "Ubuntu 14.04" || true - install_package "pypy-2.5.0-linux" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.5.0-linux.tar.bz2#3dfd56a986d25929b4ed9f40a5484f72f1d513cd816cf8aaa683106c3391247c" "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-2.5.0-linux" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.5.0-linux.tar.bz2#3dfd56a986d25929b4ed9f40a5484f72f1d513cd816cf8aaa683106c3391247c" "pypy" verify_py27 ensurepip + else + install_package "pypy-2.5-linux_i686-portable" "https://bitbucket.org/squeaky/portable-pypy/downloads/pypy-2.5-linux_i686-portable.tar.bz2#6cbe3e1a48900f22c8e4412f82906fba92dd4a165bac5fe6866a2a26383fe3b8" "pypy" verify_py27 ensurepip + fi ;; "linux-armel" ) require_distro "Ubuntu 12.04" "Ubuntu 12.10" "Ubuntu 13.04" "Ubuntu 13.10" "Ubuntu 14.04" || true @@ -16,8 +19,11 @@ case "$(pypy_architecture 2>/dev/null || true)" in fi ;; "linux64" ) - require_distro "Ubuntu 12.04" || true - install_package "pypy-2.5.0-linux64" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.5.0-linux64.tar.bz2#7764fb6b662407f8709eaa334c542aac9cb6bfe3291ac198dad0980ca129f3c2" "pypy" verify_py27 ensurepip + if require_distro "Ubuntu 12.04" 1>/dev/null 2>&1; then + install_package "pypy-2.5.0-linux64" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.5.0-linux64.tar.bz2#7764fb6b662407f8709eaa334c542aac9cb6bfe3291ac198dad0980ca129f3c2" "pypy" verify_py27 ensurepip + else + install_package "pypy-2.5-linux_x86_64-portable" "https://bitbucket.org/squeaky/portable-pypy/downloads/pypy-2.5-linux_x86_64-portable.tar.bz2#26c5a0964b32b09be0282766c27937c843a12b6820ff2d440c6d47a6092837e0" "pypy" verify_py27 ensurepip + fi ;; "osx64" ) install_package "pypy-2.5.0-osx64" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.5.0-osx64.tar.bz2#30b392b969b54cde281b07f5c10865a7f2e11a229c46b8af384ca1d3fe8d4e6e" "pypy" verify_py27 ensurepip diff --git a/plugins/python-build/share/python-build/pypy3-2.3.1 b/plugins/python-build/share/python-build/pypy3-2.3.1 index 273530a3..a0fca227 100644 --- a/plugins/python-build/share/python-build/pypy3-2.3.1 +++ b/plugins/python-build/share/python-build/pypy3-2.3.1 @@ -1,7 +1,10 @@ case "$(pypy_architecture 2>/dev/null || true)" in "linux" ) - require_distro "Ubuntu 10.04" || true - install_package "pypy3-2.3.1-linux" "https://bitbucket.org/pypy/pypy/downloads/pypy3-2.3.1-linux.tar.bz2#7eddc6826e58c9c89e68b59ec8caf1596b76401517ad8d26ad5e18e0ffa45db9" "pypy" verify_py32 ensurepip + if require_distro "Ubuntu 10.04" 1>/dev/null 2>&1; then + install_package "pypy3-2.3.1-linux" "https://bitbucket.org/pypy/pypy/downloads/pypy3-2.3.1-linux.tar.bz2#7eddc6826e58c9c89e68b59ec8caf1596b76401517ad8d26ad5e18e0ffa45db9" "pypy" verify_py32 ensurepip + else + 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#32a5b3fd4299b13aedf7bc6262eee0f6be9a27744ccf787718553d973ec38abb" "pypy" verify_py32 ensurepip + fi ;; "linux-armel" ) require_distro "Ubuntu 12.04" || true @@ -16,8 +19,11 @@ case "$(pypy_architecture 2>/dev/null || true)" in fi ;; "linux64" ) - require_distro "Ubuntu 12.04" || true - install_package "pypy3-2.3.1-linux64" "https://bitbucket.org/pypy/pypy/downloads/pypy3-2.3.1-linux64.tar.bz2#303df2cf4766db20ec77786d9091dce284fdab01d7173c5828a35e86bc931b99" "pypy" verify_py32 ensurepip + if require_distro "Ubuntu 12.04" 1>/dev/null 2>&1; then + install_package "pypy3-2.3.1-linux64" "https://bitbucket.org/pypy/pypy/downloads/pypy3-2.3.1-linux64.tar.bz2#303df2cf4766db20ec77786d9091dce284fdab01d7173c5828a35e86bc931b99" "pypy" verify_py32 ensurepip + else + 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#cb56b5bde8f444d44a0ea9cd475ddeed00aa895f3dcc89fd37577a51439540aa" "pypy" verify_py32 ensurepip + fi ;; "osx64" ) install_package "pypy3-2.3.1-osx64" "https://bitbucket.org/pypy/pypy/downloads/pypy3-2.3.1-osx64.tar.bz2#600d4dad2039b8035582c0e0ce9b71e8236d95db26cff48c84c6d1e0ea6814c1" "pypy" verify_py32 ensurepip diff --git a/plugins/python-build/share/python-build/pypy3-2.4.0 b/plugins/python-build/share/python-build/pypy3-2.4.0 index c2e6cf0f..23ee58a6 100644 --- a/plugins/python-build/share/python-build/pypy3-2.4.0 +++ b/plugins/python-build/share/python-build/pypy3-2.4.0 @@ -1,7 +1,10 @@ case "$(pypy_architecture 2>/dev/null || true)" in "linux" ) - require_distro "Ubuntu 10.04" || true - install_package "pypy3-2.4.0-linux" "https://bitbucket.org/pypy/pypy/downloads/pypy3-2.4.0-linux.tar.bz2#108fdcccfddb9b2cb2fc3cbca5e6f7902ed3ab74a24c8ae29da7fbdadbab4345" "pypy" verify_py32 ensurepip + if require_distro "Ubuntu 10.04" 1>/dev/null 2>&1; then + install_package "pypy3-2.4.0-linux" "https://bitbucket.org/pypy/pypy/downloads/pypy3-2.4.0-linux.tar.bz2#108fdcccfddb9b2cb2fc3cbca5e6f7902ed3ab74a24c8ae29da7fbdadbab4345" "pypy" verify_py32 ensurepip + else + install_package "pypy3-2.4-linux_i686-portable" "https://bitbucket.org/squeaky/portable-pypy/downloads/pypy3-2.4-linux_i686-portable.tar.bz2#7ce050b4928dc58f7e9dd01e3e48c443c85616ca83f4bcc9147f1078d0fd126c" "pypy" verify_py32 ensurepip + fi ;; "linux-armel" ) require_distro "Ubuntu 12.04" "Ubuntu 12.10" "Ubuntu 13.04" "Ubuntu 13.10" "Ubuntu 14.04" || true @@ -16,8 +19,11 @@ case "$(pypy_architecture 2>/dev/null || true)" in fi ;; "linux64" ) - require_distro "Ubuntu 12.04" || true - install_package "pypy3-2.4.0-linux64" "https://bitbucket.org/pypy/pypy/downloads/pypy3-2.4.0-linux64.tar.bz2#24e680b1742af7361107876a421dd793f5ef852dd5f097546f84b1378f7f70cc" "pypy" verify_py32 ensurepip + if require_distro "Ubuntu 12.04" 1>/dev/null 2>&1; then + install_package "pypy3-2.4.0-linux64" "https://bitbucket.org/pypy/pypy/downloads/pypy3-2.4.0-linux64.tar.bz2#24e680b1742af7361107876a421dd793f5ef852dd5f097546f84b1378f7f70cc" "pypy" verify_py32 ensurepip + else + 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#7b3e0f0bc924bd0d68d85c0b566979e74a2b366595db3d81502267367370a5fb" "pypy" verify_py32 ensurepip + fi ;; "osx64" ) install_package "pypy3-2.4.0-osx64" "https://bitbucket.org/pypy/pypy/downloads/pypy3-2.4.0-osx64.tar.bz2#dcd86bdb753e93dbf55e1f3af3ffa97eea328b8b77aa60e92ea2260a6258cedb" "pypy" verify_py32 ensurepip