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

delete .RData before and after running CMD; added --resave-data to build command

Browse Source 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@9102 1feff8c3-07ed-0310-ac33-dd36852eb9cd
This commit is contained in:
Scott R Charlton 2014-12-11 06:59:30 +00:00
parent 9b1282df50
commit eae91e7682
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
R/Makefile
View File

@ -238,6 +238,7 @@ DATA = \
all: export_sed $(PSRC) $(XSRC) $(DATA) $(MAN)/phreeqc-package.Rd all: export_sed $(PSRC) $(XSRC) $(DATA) $(MAN)/phreeqc-package.Rd
$(DATADIR)/databases.rda : $(DBS) build-databases.R $(DATADIR)/databases.rda : $(DBS) build-databases.R
rm -f .RData
R --no-save --no-restore CMD BATCH build-databases.R R --no-save --no-restore CMD BATCH build-databases.R
rm -f .RData rm -f .RData
@ -248,11 +249,13 @@ ex15.ascii : $(EXDIR)/ex15.dat
perl -pe 's/[^[:ascii:]]/?/g' $< > $@ perl -pe 's/[^[:ascii:]]/?/g' $< > $@
$(DATADIR)/examples.rda : $(EXS) build-examples.R $(DATADIR)/examples.rda : $(EXS) build-examples.R
rm -f .RData
R --no-save --no-restore CMD BATCH build-examples.R R --no-save --no-restore CMD BATCH build-examples.R
rm -f .RData rm -f .RData
roxygenize $(MAN)/phreeqc-package.Rd : phreeqc/R/phreeqc.R roxygenize $(MAN)/phreeqc-package.Rd : phreeqc/R/phreeqc.R
rm -f $(RDFILES) rm -f $(RDFILES)
rm -f .RData
R --no-save --no-restore CMD BATCH roxygenize.R R --no-save --no-restore CMD BATCH roxygenize.R
touch $(MAN)/phreeqc-package.Rd touch $(MAN)/phreeqc-package.Rd
@ -790,7 +793,7 @@ export_sed :
< phreeqc.R.in > $(TOPDIR)/R/phreeqc.R < phreeqc.R.in > $(TOPDIR)/R/phreeqc.R
build : all build : all
R CMD build phreeqc R CMD build --resave-data phreeqc
uninstall : uninstall :
R CMD REMOVE phreeqc R CMD REMOVE phreeqc

2
R/build-databases.R
View File

@ -19,5 +19,5 @@ pitzer.dat <- scan("pitzer.ascii", what="", sep="\n")
sit.dat <- scan("sit.ascii", what="", sep="\n") sit.dat <- scan("sit.ascii", what="", sep="\n")
phreeqc.dat <- scan("phreeqc.ascii", what="", sep="\n") phreeqc.dat <- scan("phreeqc.ascii", what="", sep="\n")
wateq4f.dat <- scan("wateq4f.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)) rm(list = ls(all = TRUE))