From dff7a4109f1d64fb409c11db3e6160330e8941e7 Mon Sep 17 00:00:00 2001 From: Le Philousophe Date: Wed, 30 Dec 2020 22:12:44 +0100 Subject: [PATCH] RISCOS: Parametrize packages versions Switch tokenize to Git repository because development migrated here --- check-versions/config.py | 31 ++++++++++++++++--- toolchains/riscos/packages/bindhelp/build.sh | 4 ++- toolchains/riscos/packages/iconv/build.sh | 8 ++++- toolchains/riscos/packages/libsdl1.2/build.sh | 4 ++- toolchains/riscos/packages/tokenize/build.sh | 4 ++- toolchains/riscos/packages/toolchain/build.sh | 4 ++- 6 files changed, 45 insertions(+), 10 deletions(-) diff --git a/check-versions/config.py b/check-versions/config.py index 977dfd8..ef90959 100644 --- a/check-versions/config.py +++ b/check-versions/config.py @@ -59,6 +59,11 @@ discord_rpc_check = { 'repository': 'https://github.com/discord/discord-rpc.git', 'prefix': 'v', } +libiconv_check = { + 'check': 'git tag', + 'repository': 'https://git.savannah.gnu.org/git/libiconv.git', + 'prefix': 'v', +} # The checks parameter for each version tag # Every entry in the dictionary is keyed by a tuple made of path (relative to ROOT) and package name @@ -147,11 +152,7 @@ VERSIONS = { 'prefix': 'v', 'exclude pattern': r'.*\.(beta|rc)\d+$' }, - ('./toolchains/common/packages/libiconv/build.sh', 'LIBICONV'): { - 'check': 'git tag', - 'repository': 'https://git.savannah.gnu.org/git/libiconv.git', - 'prefix': 'v', - }, + ('./toolchains/common/packages/libiconv/build.sh', 'LIBICONV'): libiconv_check, ('./toolchains/devkit3ds/packages/Project_CTR/build.sh', 'PROJECT_CTR'): { 'check': 'git tag', @@ -342,6 +343,26 @@ VERSIONS = { 'branch': 'master', }, + ('./toolchains/riscos/packages/bindhelp/build.sh', 'BINDHELP'): { + 'check': 'svn commit', + 'repository': 'https://svn.code.sf.net/p/ro-oslib/code/trunk', + }, + ('./toolchains/riscos/packages/iconv/build.sh', 'LIBICONV'): libiconv_check, + ('./toolchains/riscos/packages/libsdl1.2/build.sh', 'SDL'): { + 'check': 'hg commit', + 'repository': 'http://hg.libsdl.org/SDL/', + 'branch': 'SDL-1.2', + }, + ('./toolchains/riscos/packages/tokenize/build.sh', 'TOKENIZE'): { + 'check': 'git commit', + 'repository': 'https://github.com/steve-fryatt/tokenize.git', + 'branch': 'master', + }, + ('./toolchains/riscos/packages/toolchain/build.sh', 'GCCSDK'): { + 'check': 'svn commit', + 'repository': 'svn://svn.riscos.info/gccsdk/trunk/gcc4/', + }, + ('./toolchains/vita/packages/vita-shader-collection/build.sh', 'VITA_SHDR_COLL') : { 'check': 'git tag', 'repository': 'https://github.com/frangarcj/vita-shader-collection.git', diff --git a/toolchains/riscos/packages/bindhelp/build.sh b/toolchains/riscos/packages/bindhelp/build.sh index 2e8ad94..e3b97b0 100755 --- a/toolchains/riscos/packages/bindhelp/build.sh +++ b/toolchains/riscos/packages/bindhelp/build.sh @@ -1,12 +1,14 @@ #! /bin/sh +BINDHELP_VERSION=458 + PACKAGE_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd) HELPERS_DIR=$PACKAGE_DIR/../.. . $HELPERS_DIR/functions.sh do_make_bdir -do_svn_fetch !OSLib https://svn.code.sf.net/p/ro-oslib/code/trunk/!OSLib -r458 +do_svn_fetch !OSLib https://svn.code.sf.net/p/ro-oslib/code/trunk/!OSLib -r"$BINDHELP_VERSION" do_make -C Tools/BindHelp install bindir="/usr/local/bin" diff --git a/toolchains/riscos/packages/iconv/build.sh b/toolchains/riscos/packages/iconv/build.sh index e40379b..afb4b4f 100755 --- a/toolchains/riscos/packages/iconv/build.sh +++ b/toolchains/riscos/packages/iconv/build.sh @@ -1,12 +1,18 @@ #! /bin/sh +LIBICONV_VERSION=1.16 + PACKAGE_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd) HELPERS_DIR=$PACKAGE_DIR/../.. . $HELPERS_DIR/functions.sh do_make_bdir -do_http_fetch libiconv 'https://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.16.tar.gz' 'tar xzf' +# GPG key of Bruno Haible (Open Source Development) +gpg --keyserver hkps://keyserver.ubuntu.com --recv-keys 0x4F494A942E4616C2 +do_http_fetch libiconv "http://ftp.gnu.org/pub/gnu/libiconv/libiconv-${LIBICONV_VERSION}.tar.gz" 'tar xzf' \ + "gpgurl:http://ftp.gnu.org/pub/gnu/libiconv/libiconv-${LIBICONV_VERSION}.tar.gz.sig" +rm -Rf $HOME/.gnupg ./configure --prefix=/usr/local --disable-shared --enable-extra-encodings "$@" do_make diff --git a/toolchains/riscos/packages/libsdl1.2/build.sh b/toolchains/riscos/packages/libsdl1.2/build.sh index 11a341f..466b3be 100755 --- a/toolchains/riscos/packages/libsdl1.2/build.sh +++ b/toolchains/riscos/packages/libsdl1.2/build.sh @@ -1,12 +1,14 @@ #! /bin/sh +SDL_VERSION=6eaf4aee7940 + PACKAGE_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd) HELPERS_DIR=$PACKAGE_DIR/../.. . $HELPERS_DIR/functions.sh do_make_bdir -do_http_fetch SDL-6eaf4aee7940 'https://hg.libsdl.org/SDL/archive/6eaf4aee7940.tar.bz2' 'tar xjf' +do_http_fetch SDL- "https://hg.libsdl.org/SDL/archive/$SDL_VERSION.tar.bz2" 'tar xjf' do_configure do_make diff --git a/toolchains/riscos/packages/tokenize/build.sh b/toolchains/riscos/packages/tokenize/build.sh index 59fcaf8..d183ee1 100755 --- a/toolchains/riscos/packages/tokenize/build.sh +++ b/toolchains/riscos/packages/tokenize/build.sh @@ -1,12 +1,14 @@ #! /bin/sh +TOKENIZE_VERSION=596792257a9f2964c014b60c15c4ce012f4cf203 + PACKAGE_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd) HELPERS_DIR=$PACKAGE_DIR/../.. . $HELPERS_DIR/functions.sh do_make_bdir -do_svn_fetch tokenize svn://svn.riscos.info/tokenize/trunk/ -r32 +do_git_fetch tokenize 'https://github.com/steve-fryatt/tokenize.git' "$TOKENIZE_VERSION" do_make obj buildlinux/tokenize cp buildlinux/tokenize /usr/local/bin/ diff --git a/toolchains/riscos/packages/toolchain/build.sh b/toolchains/riscos/packages/toolchain/build.sh index 213d676..e08abfc 100755 --- a/toolchains/riscos/packages/toolchain/build.sh +++ b/toolchains/riscos/packages/toolchain/build.sh @@ -1,12 +1,14 @@ #! /bin/sh +GCCSDK_VERSION=7419 + PACKAGE_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd) HELPERS_DIR=$PACKAGE_DIR/../.. . $HELPERS_DIR/functions.sh do_make_bdir -do_svn_fetch gcc4 svn://svn.riscos.info/gccsdk/trunk/gcc4/ -r7419 +do_svn_fetch gcc4 svn://svn.riscos.info/gccsdk/trunk/gcc4/ -r"$GCCSDK_VERSION" echo "export GCCSDK_INSTALL_CROSSBIN=$GCCSDK_INSTALL_CROSSBIN" > gccsdk-params echo "export GCCSDK_INSTALL_ENV=$GCCSDK_INSTALL_ENV" >> gccsdk-params