From eae91e7682b8178867bc9e74c88c066a505e03b8 Mon Sep 17 00:00:00 2001
From: Scott R Charlton <charlton@usgs.gov>
Date: Thu, 11 Dec 2014 06:59:30 +0000
Subject: [PATCH] delete .RData before and after running CMD; added
 --resave-data to build command

git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@9102 1feff8c3-07ed-0310-ac33-dd36852eb9cd
---
 R/Makefile          | 5 ++++-
 R/build-databases.R | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/R/Makefile b/R/Makefile
index d75550ae..7c549ea7 100644
--- a/R/Makefile
+++ b/R/Makefile
@@ -238,6 +238,7 @@ DATA = \
 all: export_sed $(PSRC) $(XSRC) $(DATA) $(MAN)/phreeqc-package.Rd
 
 $(DATADIR)/databases.rda : $(DBS) build-databases.R
+	rm -f .RData
 	R --no-save --no-restore CMD BATCH build-databases.R
 	rm -f .RData
 
@@ -248,11 +249,13 @@ ex15.ascii : $(EXDIR)/ex15.dat
 	perl -pe 's/[^[:ascii:]]/?/g' $< > $@
 
 $(DATADIR)/examples.rda : $(EXS) build-examples.R
+	rm -f .RData
 	R --no-save --no-restore CMD BATCH build-examples.R
 	rm -f .RData
 
 roxygenize $(MAN)/phreeqc-package.Rd : phreeqc/R/phreeqc.R
 	rm -f $(RDFILES)
+	rm -f .RData
 	R --no-save --no-restore CMD BATCH roxygenize.R
 	touch $(MAN)/phreeqc-package.Rd
 
@@ -790,7 +793,7 @@ export_sed :
 	< phreeqc.R.in > $(TOPDIR)/R/phreeqc.R
 
 build : all
-	R CMD build phreeqc
+	R CMD build --resave-data phreeqc
 
 uninstall :
 	R CMD REMOVE phreeqc
diff --git a/R/build-databases.R b/R/build-databases.R
index 61e90428..f580937e 100644
--- a/R/build-databases.R
+++ b/R/build-databases.R
@@ -19,5 +19,5 @@ pitzer.dat      <- scan("pitzer.ascii",    what="", sep="\n")
 sit.dat         <- scan("sit.ascii",       what="", sep="\n")
 phreeqc.dat     <- scan("phreeqc.ascii",   what="", sep="\n")
 wateq4f.dat     <- scan("wateq4f.ascii",   what="", sep="\n")
-save(list = ls(all = TRUE), compress = "xz", file = "phreeqc/data/databases.rda")
+save(list = ls(all = TRUE), file = "phreeqc/data/databases.rda")
 rm(list = ls(all = TRUE))