max/iphreeqc
1
0
Fork 0
mirror of https://git.gfz-potsdam.de/naaice/iphreeqc.git synced 2025-12-16 08:38:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cran-update' into 'master'

Browse Source 
cran update

See merge request coupled/iphreeqc!21
This commit is contained in:
Charlton, Scott R 2021-09-21 20:01:44 +00:00
commit 0408914a6f
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
R/DESCRIPTION.in
View File

@ -4,7 +4,7 @@ Title: R Interface to Geochemical Modeling Software
License: GPL-3 License: GPL-3
NeedsCompilation: yes NeedsCompilation: yes
Depends: Depends:
R (>= 2.10) R (>= 3.5)
Author: S.R. Charlton, D.L. Parkhurst, and C.A.J. Appelo, with contributions 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, from D. Gillespie for Chipmunk BASIC and S.D. Cohen, A.C. Hindmarsh,
R. Serban, D. Shumaker, and A.G. Taylor for CVODE/SUNDIALS R. Serban, D. Shumaker, and A.G. Taylor for CVODE/SUNDIALS
@ -15,3 +15,4 @@ Description: A geochemical modeling program developed by the US Geological
reactive-transport, and inverse geochemical calculations. reactive-transport, and inverse geochemical calculations.
Maintainer: S.R. Charlton <charlton@usgs.gov> Maintainer: S.R. Charlton <charlton@usgs.gov>
LazyData: yes LazyData: yes
Encoding: UTF-8

3
jenkins-R-dist.sh
View File

@ -34,7 +34,7 @@ export VER
# set REL # set REL
# #
curl https://raw.githubusercontent.com/usgs-coupled/phreeqc-version/main/ver.py -o ver.py curl https://raw.githubusercontent.com/usgs-coupled/phreeqc-version/main/ver.py -o ver.py
HEAD=$(python ver.py) HEAD=$(python3 ver.py)
if [ -z "$REL" ]; then if [ -z "$REL" ]; then
REL="$HEAD" REL="$HEAD"
fi fi
@ -46,5 +46,6 @@ mkdir -p phreeqc/man
mkdir -p phreeqc/src/phreeqcpp mkdir -p phreeqc/src/phreeqcpp
mkdir -p phreeqc/R mkdir -p phreeqc/R
mkdir -p phreeqc/data mkdir -p phreeqc/data
echo "# Generated by roxygen2: do not edit by hand" > phreeqc/NAMESPACE
make VERSION=${VER} RELEASE_DATE=${DATE} build make VERSION=${VER} RELEASE_DATE=${DATE} build
##make VERSION=${VER} RELEASE_DATE=${DATE} check ##make VERSION=${VER} RELEASE_DATE=${DATE} check

4
jenkins-dist.sh
View File

@ -125,6 +125,10 @@ else
REPOS_PATH="`echo $REPOS_PATH | sed 's/^\/*//'`" REPOS_PATH="`echo $REPOS_PATH | sed 's/^\/*//'`"
fi fi
if [ -z "$NAME" ]; then
NAME="IPhreeqc"
fi
REPOS_TAG='' REPOS_TAG=''
if [ "$REPOS_PATH" != 'trunk' ]; then if [ "$REPOS_PATH" != 'trunk' ]; then
REPOS_TAG="$REPOS_PATH" REPOS_TAG="$REPOS_PATH"