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

updated for cran submittal

Browse Source 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@10322 1feff8c3-07ed-0310-ac33-dd36852eb9cd
This commit is contained in:
Scott R Charlton 2015-09-30 21:04:49 +00:00
parent efc0591a59
commit 6cb0d3fd08
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
R/DESCRIPTION.in
View File

@ -1,6 +1,6 @@
Package: phreeqc Package: phreeqc
Version: 1.0-@REVISION_SVN@ Version: @VERSION@
Title: R interface to Geochemical Modeling Software Title: R Interface to Geochemical Modeling Software
License: GPL-3 + file LICENSE License: GPL-3 + file LICENSE
NeedsCompilation: yes NeedsCompilation: yes
Depends: Depends:

5
R/Makefile
View File

@ -13,6 +13,7 @@ MAN=phreeqc/man
SVN_URL := http://internalbrr.cr.usgs.gov/svn_GW SVN_URL := http://internalbrr.cr.usgs.gov/svn_GW
RELEASE ?= $(shell svn info $(SVN_URL) | egrep "Revision:" | cut -b 10- | ( read one two ; echo $$one ) ) RELEASE ?= $(shell svn info $(SVN_URL) | egrep "Revision:" | cut -b 10- | ( read one two ; echo $$one ) )
RELEASE_DATE ?= $(shell date "+%Y-%m-%d") RELEASE_DATE ?= $(shell date "+%Y-%m-%d")
VERSION ?= 1.0
DBS = \ DBS = \
Amm.ascii \ Amm.ascii \
@ -785,10 +786,10 @@ phreeqc/DESCRIPTION : export_sed
export_sed : export_sed :
sed \ sed \
-e 's/@REVISION_SVN@/$(RELEASE)/g' \ -e 's/@VERSION@/$(VERSION)/g' \
< DESCRIPTION.in > $(TOPDIR)/DESCRIPTION < DESCRIPTION.in > $(TOPDIR)/DESCRIPTION
sed \ sed \
-e 's/@REVISION_SVN@/$(RELEASE)/g' \ -e 's/@VERSION@/$(VERSION)/g' \
-e 's/@RELEASE_DATE@/$(RELEASE_DATE)/g' \ -e 's/@RELEASE_DATE@/$(RELEASE_DATE)/g' \
< phreeqc.R.in > $(TOPDIR)/R/phreeqc.R < phreeqc.R.in > $(TOPDIR)/R/phreeqc.R

2
R/phreeqc.R.in
View File

@ -6,7 +6,7 @@
##' including speciation, batch-reaction, one-dimensional ##' including speciation, batch-reaction, one-dimensional
##' reactive-transport, and inverse geochemical calculations. ##' reactive-transport, and inverse geochemical calculations.
##' ##'
##' \tabular{ll}{Package: \tab phreeqc\cr Type: \tab Package\cr Version: \tab 1.0-@REVISION_SVN@\cr Date: \tab @RELEASE_DATE@\cr License: \tab BSD_3_clause + file LICENSE\cr} ##' \tabular{ll}{Package: \tab phreeqc\cr Type: \tab Package\cr Version: \tab @VERSION@\cr Date: \tab @RELEASE_DATE@\cr License: \tab BSD_3_clause + file LICENSE\cr}
##' ##'
##' @name phreeqc-package ##' @name phreeqc-package
##' @aliases phreeqc-package phreeqc ##' @aliases phreeqc-package phreeqc