From 1832a0c1ba1bbd409980fdbe4ed02a7dfc84160e Mon Sep 17 00:00:00 2001 From: edoapra Date: Wed, 5 Feb 2020 12:56:36 -0800 Subject: [PATCH] switch to ga 5.7.1 --- src/tools/GNUmakefile | 6 +++--- src/tools/get-tools-github | 16 ++++++++-------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/tools/GNUmakefile b/src/tools/GNUmakefile index c3efdcc7a0..a906a239a4 100644 --- a/src/tools/GNUmakefile +++ b/src/tools/GNUmakefile @@ -597,15 +597,15 @@ ifdef USE_GAGITHUB GET_TOOLS=./get-tools-github ifdef USE_GA_RELEASE ifndef GA_RELEASE_NO - GA_RELEASE_NO=5.7 + GA_RELEASE_NO=5.7.1 endif GA_DIR=ga-$(GA_RELEASE_NO) else #DEV_GA=1 gives the current "best" dev branch, not develop #to get develop, set GA_BRANCH-develop ifdef DEV_GA - GA_DIR = ga-5.7 - GA_BRANCH = release/5.7 + GA_DIR = ga-5.7.1 + GA_BRANCH = hotfix/5.7.1 else GA_DIR0=ga-$(GA_BRANCH) GA_DIR=$(shell echo $(GA_DIR0) | sed -e 's/\//_/g') diff --git a/src/tools/get-tools-github b/src/tools/get-tools-github index df712b75e4..36b40563a9 100755 --- a/src/tools/get-tools-github +++ b/src/tools/get-tools-github @@ -27,8 +27,8 @@ TOOLGIT=`which git` CONFIG=$NWCHEM_TOP/src/config/makefile.h if test "x$DEV_GA" != x then - GA_DIR=ga-5.7 - GA_BRANCH=release/5.7 + GA_DIR=ga-5.7.1 + GA_BRANCH=hotfix/5.7.1 fi if test "x$GA_BRANCH" = x then @@ -38,7 +38,7 @@ if test "x$USE_GA_RELEASE" != x then if test "x$GA_RELEASE_NO" = x then - GA_RELEASE_NO=5.7 + GA_RELEASE_NO=5.7.1 fi GA_DIR=ga-"$GA_RELEASE_NO" if [ ! -f ga-"$GA_RELEASE_NO".tar.gz ]; then @@ -46,7 +46,7 @@ then then #TAR_URL=https://github.com/GlobalArrays/ga/releases/download/v"$GA_RELEASE_NO"/ga-"$GA_RELEASE_NO".tar.gz TAR_URL=https://github.com/edoapra/ga/releases/download/v"$GA_RELEASE_NO"/ga-"$GA_RELEASE_NO".tar.gz - # https://github.com/edoapra/ga/releases/download/v5.7/ga-5.7.tar.gz + # https://github.com/edoapra/ga/releases/download/v5.7.1/ga-5.7.1.tar.gz fi echo "downloading" ga-"$GA_RELEASE_NO".tar.gz "from" "$TAR_URL" CURL_YES=`curl -O 2>&1 | head -1 | awk ' /URL/ {print "Y";exit};{print "N"}'` @@ -111,8 +111,8 @@ if test "x$DEV_GA" != x then #DEV_GA=1 gives the current "best" dev branch, not develop #to get develop, set GA_BRANCH-develop - GA_DIR=ga-5.6.5 - GA_BRANCH=hotfix/5.6.5 + GA_DIR=ga-5.7.1 + GA_BRANCH=hotfix/5.7.1 else if test "x$GA_BRANCH" != x then @@ -122,8 +122,8 @@ else GA_DIR=`echo $GA_DIR0 | sed -e 's/\//_/g'` fi else - GA_DIR=ga-5.6.5 - GA_BRANCH=hotfix/5.6.5 + GA_DIR=ga-5.7.1 + GA_BRANCH=hotfix/5.7.1 fi fi if test "x$GA_URL" != x