updated urls; fixed jenkins-R-dist.sh

This commit is contained in:
Scott R Charlton 2020-01-30 10:44:35 -07:00
parent bcccd4a362
commit 108fe635ec
3 changed files with 11 additions and 7 deletions

View File

@ -8,7 +8,7 @@ Depends:
Author: S.R. Charlton, D.L. Parkhurst, and C.A.J. Appelo, with contributions
from D. Gillespie for Chipmunk BASIC and S.D. Cohen, A.C. Hindmarsh,
R. Serban, D. Shumaker, and A.G. Taylor for CVODE/SUNDIALS
URL: http://wwwbrr.cr.usgs.gov/projects/GWC_coupled/phreeqc
URL: https://www.usgs.gov/software/phreeqc-version-3
Description: A geochemical modeling program developed by the US Geological
Survey that is designed to perform a wide variety of aqueous geochemical
calculations, including speciation, batch-reaction, one-dimensional

View File

@ -11,7 +11,7 @@ citEntry(entry="Manual",
volume = "book 6",
chapter = "A43",
pages = "497",
url = "http://pubs.usgs.gov/tm/06/a43",
url = "https://pubs.usgs.gov/tm/06/a43",
textVersion =
paste("Parkhurst, D.L., and Appelo, C.A.J., 2013, Description of",
@ -20,7 +20,7 @@ citEntry(entry="Manual",
"transport, and inverse geochemical calculations: U.S.",
"Geological Survey Techniques and Methods, book 6, chap.",
"A43, 497 p., available only at",
"http://pubs.usgs.gov/tm/06/a43.")
"https://pubs.usgs.gov/tm/06/a43.")
)

12
jenkins-R-dist.sh Normal file → Executable file
View File

@ -15,15 +15,19 @@ if [ -z "$VER" ]; then
VER="${ver_major}.${ver_minor}.${ver_patch}"
fi
if [ "$REL" = 'HEAD' ]; then
HEAD=`svn st -v configure.ac | awk '{print $1}')`
HEAD=13021
REL="$HEAD"
fi
if [ -z "$REL" ]; then
REL=13021
fi
export VER
# sed files
/bin/sh jenkins-dist.sh -v ${VER} -r ${REL} -d ${DATE} -pr ${TAG}
cd R
mkdir -p phreeqc/man
mkdir -p phreeqc/src/phreeqcpp
mkdir -p phreeqc/R
mkdir -p phreeqc/data
make VERSION=${VER} RELEASE_DATE=${DATE} build
make VERSION=${VER} RELEASE_DATE=${DATE} check