working on build automation

git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8716 1feff8c3-07ed-0310-ac33-dd36852eb9cd

R/Makefile

@@ -12,6 +12,7 @@ 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 ) )
+RELEASE_DATE ?= $(shell date "+%Y-%m-%d")
 
 DBS = \
 	Amm.ascii \
@@ -234,7 +235,7 @@ DATA = \
 	$(DATADIR)/databases.rda \
 	$(DATADIR)/examples.rda
 
-all: export $(PSRC) $(XSRC) $(DATA) $(MAN)/phreeqc-package.Rd
+all: export_sed $(PSRC) $(XSRC) $(DATA) $(MAN)/phreeqc-package.Rd
 
 $(DATADIR)/databases.rda : $(DBS) build-databases.R
 	R --no-save --no-restore CMD BATCH build-databases.R
@@ -771,10 +772,19 @@ check : all
 install : all
 	R CMD INSTALL --build phreeqc
 
-export :
+
+phreeqc/R/phreeqc.R : export_sed
+
+phreeqc/DESCRIPTION : export_sed
+
+export_sed :
 	sed \
 	 -e 's/@REVISION_SVN@/$(RELEASE)/g' \
 	< DESCRIPTION.in > $(TOPDIR)/DESCRIPTION
+	sed \
+	 -e 's/@REVISION_SVN@/$(RELEASE)/g' \
+	 -e 's/@RELEASE_DATE@/$(RELEASE_DATE)/g' \
+	< phreeqc.R.in > $(TOPDIR)/R/phreeqc.R
 
 build : all
 	R CMD build phreeqc

R/phreeqc.R.in

@@ -4,14 +4,7 @@
 ##' Speciation, Batch-Reaction, One-Dimensional 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 Unlimited\cr
-##' }
+##' \tabular{ll}{Package: \tab phreeqc\cr Type: \tab Package\cr Version: \tab 1.0-@REVISION_SVN@\cr Date: \tab @RELEASE_DATE@\cr License: \tab Unlimited\cr}
 ##' 
 ##' @name phreeqc-package
 ##' @aliases phreeqc-package phreeqc