diff --git a/R/DESCRIPTION.in b/R/DESCRIPTION.in index 1d201347..e7bdbe51 100644 --- a/R/DESCRIPTION.in +++ b/R/DESCRIPTION.in @@ -4,7 +4,7 @@ Title: R Interface to Geochemical Modeling Software License: GPL-3 NeedsCompilation: yes Depends: - R (>= 2.10) + R (>= 3.5) 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 @@ -15,3 +15,4 @@ Description: A geochemical modeling program developed by the US Geological reactive-transport, and inverse geochemical calculations. Maintainer: S.R. Charlton LazyData: yes +Encoding: UTF-8 diff --git a/jenkins-R-dist.sh b/jenkins-R-dist.sh index 8cf84035..ee7ba252 100755 --- a/jenkins-R-dist.sh +++ b/jenkins-R-dist.sh @@ -34,7 +34,7 @@ export VER # set REL # 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 REL="$HEAD" fi @@ -46,5 +46,6 @@ mkdir -p phreeqc/man mkdir -p phreeqc/src/phreeqcpp mkdir -p phreeqc/R 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} check diff --git a/jenkins-dist.sh b/jenkins-dist.sh index 853810bb..e2fc7fe8 100755 --- a/jenkins-dist.sh +++ b/jenkins-dist.sh @@ -125,6 +125,10 @@ else REPOS_PATH="`echo $REPOS_PATH | sed 's/^\/*//'`" fi +if [ -z "$NAME" ]; then + NAME="IPhreeqc" +fi + REPOS_TAG='' if [ "$REPOS_PATH" != 'trunk' ]; then REPOS_TAG="$REPOS_PATH"