working on automation of R version

git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8712 1feff8c3-07ed-0310-ac33-dd36852eb9cd
This commit is contained in:
Scott R Charlton 2014-05-07 02:42:11 +00:00
parent a3724e79a3
commit 238e32dced
2 changed files with 11 additions and 2 deletions

View File

@ -1,5 +1,5 @@
Package: phreeqc
Version: 1.0.0
Version: 1.0-@REVISION_SVN@
Title: R interface to the phreeqc geochemical modeling program
License: BSD_3_clause + file LICENSE
NeedsCompilation: yes

View File

@ -1,4 +1,5 @@
CP=cp -f
TOPDIR=phreeqc
IDEST=phreeqc/src
DEST=phreeqc/src/phreeqcpp
ISRC=../src
@ -9,6 +10,9 @@ DATADIR=phreeqc/data
EXDIR=../phreeqc3-examples
MAN=phreeqc/man
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 ) )
DBS = \
Amm.ascii \
ex15.ascii \
@ -230,7 +234,7 @@ DATA = \
$(DATADIR)/databases.rda \
$(DATADIR)/examples.rda
all: $(PSRC) $(XSRC) $(DATA) $(MAN)/phreeqc-package.Rd
all: export $(PSRC) $(XSRC) $(DATA) $(MAN)/phreeqc-package.Rd
$(DATADIR)/databases.rda : $(DBS) build-databases.R
R --no-save --no-restore CMD BATCH build-databases.R
@ -766,6 +770,11 @@ check : all
install : all
R CMD INSTALL --build phreeqc
export :
sed \
-e 's/@REVISION_SVN@/$(RELEASE)/g' \
< DESCRIPTION.in > $(TOPDIR)/DESCRIPTION
build : all
R CMD build phreeqc