Skip to content

Commit

Permalink
switch to ga 5.7.1
Browse files Browse the repository at this point in the history
  • Loading branch information
edoapra committed Feb 5, 2020
1 parent b3a50f1 commit 1832a0c
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 11 deletions.
6 changes: 3 additions & 3 deletions src/tools/GNUmakefile
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
16 changes: 8 additions & 8 deletions src/tools/get-tools-github
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -38,15 +38,15 @@ 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
if test "x$TAR_URL" = x
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"}'`
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down

0 comments on commit 1832a0c

Please sign in to comment.