From 35947be6ffec43fb2d46da641a9540ed39842910 Mon Sep 17 00:00:00 2001 From: Boris-Chengbiao Zhou Date: Mon, 4 Sep 2017 22:03:20 +0200 Subject: [PATCH 1/4] Update gdc download path --- script/install.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/script/install.sh b/script/install.sh index 7d84c524..4e483f1f 100755 --- a/script/install.sh +++ b/script/install.sh @@ -450,8 +450,9 @@ install_compiler() { download_and_unpack "$url" "$path/$1" # gdc-4.8.2, gdc-4.9.0-alpha1, gdc-5.2, or gdc-5.2-alpha1 - elif [[ $1 =~ ^gdc-([0-9]+\.[0-9]+(\.[0-9]+)?(-.*)?)$ ]]; then + elif [[ $1 =~ ^gdc-(([0-9]+\.[0-9]+(\.[0-9]+)?)([-+].*)?)$ ]]; then local name=${BASH_REMATCH[0]} + local ver=${BASH_REMATCH[2]} if [ $os != linux ]; then fatal "no gdc binaries available for $os" fi @@ -459,7 +460,7 @@ install_compiler() { x86_64) local triplet=x86_64-linux-gnu;; x86) local triplet=i686-linux-gnu;; esac - local url="http://gdcproject.org/downloads/binaries/$triplet/$name.tar.xz" + local url="http://gdcproject.org/downloads/binaries/$ver/$triplet/$name.tar.xz" download_and_unpack "$url" "$path/$1" From 834394e5b32632563c758ea01ee8afcee83b5195 Mon Sep 17 00:00:00 2001 From: Boris-Chengbiao Zhou Date: Mon, 4 Sep 2017 22:21:28 +0200 Subject: [PATCH 2/4] Only use updated url for recent gdc releases --- script/install.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/script/install.sh b/script/install.sh index 4e483f1f..ddd825e5 100755 --- a/script/install.sh +++ b/script/install.sh @@ -460,7 +460,11 @@ install_compiler() { x86_64) local triplet=x86_64-linux-gnu;; x86) local triplet=i686-linux-gnu;; esac - local url="http://gdcproject.org/downloads/binaries/$ver/$triplet/$name.tar.xz" + if [[ $ver > "4.8.2" ]]; then + local url="http://gdcproject.org/downloads/binaries/$ver/$triplet/$name.tar.xz" + else + local url="http://gdcproject.org/downloads/binaries/$triplet/$name.tar.xz" + fi download_and_unpack "$url" "$path/$1" From dda8078839362b754a8dfabc8fd3644afaab3cc6 Mon Sep 17 00:00:00 2001 From: Boris-Chengbiao Zhou Date: Mon, 4 Sep 2017 22:24:35 +0200 Subject: [PATCH 3/4] Add travis test for new gdc releas --- travis.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/travis.sh b/travis.sh index 727a4ba5..42c7c8a5 100755 --- a/travis.sh +++ b/travis.sh @@ -9,6 +9,7 @@ declare -A compilers=( ["dmd-master-2016-10-24"]="DMD64 D Compiler v2.073.0-master-ab9d712" ["ldc-1.0.0"]="LDC - the LLVM D compiler (1.0.0):" ["gdc-4.9.3"]="gdc (crosstool-NG crosstool-ng-1.20.0-232-gc746732 - 20150825-2.066.1-58ec4c13ec) 4.9.3" + ["gdc-6.3.0+2.068.2"]="gdc (gdcproject.org 20161225-v2.068.2_gcc6) 6.3.0" ) for compiler in "${!compilers[@]}" From 3ff67087e6eaea18665e4a95de52d1d07ab0b5ea Mon Sep 17 00:00:00 2001 From: Boris-Chengbiao Zhou Date: Mon, 4 Sep 2017 22:38:26 +0200 Subject: [PATCH 4/4] Raise version limit for new url --- script/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/install.sh b/script/install.sh index ddd825e5..b44acb6e 100755 --- a/script/install.sh +++ b/script/install.sh @@ -460,7 +460,7 @@ install_compiler() { x86_64) local triplet=x86_64-linux-gnu;; x86) local triplet=i686-linux-gnu;; esac - if [[ $ver > "4.8.2" ]]; then + if [[ $ver > "5.2.0" ]]; then local url="http://gdcproject.org/downloads/binaries/$ver/$triplet/$name.tar.xz" else local url="http://gdcproject.org/downloads/binaries/$triplet/$name.tar.xz"