aboutsummaryrefslogtreecommitdiff
path: root/GNUmakefile
diff options
context:
space:
mode:
authorJohannes Ranke <jranke@uni-bremen.de>2015-05-15 13:55:19 +0200
committerJohannes Ranke <jranke@uni-bremen.de>2015-05-15 13:55:19 +0200
commit6c65cba39dbca98caf3f8e69552b3454ec1721fc (patch)
tree00252649aeccfdd13e723054c22203006cab10c6 /GNUmakefile
parenta26b44d15c11ebb41083fc2efab0cc91a027b55b (diff)
parent89cd81cf47c9f05831e854d5185b5cc599745db4 (diff)
Merge branch 'master' into compile_odes
Conflicts (resolved manually, deleting code that I had integrated into the RUnit tests for testing the compiled version): .gitignore DESCRIPTION inst/unitTests/runit.mkinerrmin.R inst/unitTests/runit.mkinfit.R tests/testthat/test_mkinpredict_SFO_SFO.R vignettes/FOCUS_L.html
Diffstat (limited to 'GNUmakefile')
-rw-r--r--GNUmakefile9
1 files changed, 5 insertions, 4 deletions
diff --git a/GNUmakefile b/GNUmakefile
index a84c9e8e..3fe25aad 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -18,13 +18,13 @@ SDDIR ?= $(RFSVN)/www/mkin_static
pkgfiles = NEWS \
data/* \
DESCRIPTION \
- inst/unitTests* \
inst/staticdocs/README \
man/* \
NAMESPACE \
R/* \
README.md \
tests/* \
+ tests/testthat* \
TODO \
vignettes/*
@@ -69,7 +69,7 @@ clean:
test: install-no-vignettes
cd tests;\
- "$(RBIN)/Rscript" doRUnit.R
+ "$(RBIN)/Rscript" testthat.R
vignettes/mkin.pdf: vignettes/mkin.Rnw
"$(RBIN)/Rscript" -e "tools::buildVignette(file = 'vignettes/mkin.Rnw', dir = 'vignettes')"
@@ -105,7 +105,8 @@ winbuilder: build
curl -T $(TGZ) ftp://anonymous@win-builder.r-project.org/R-devel/
submit:
- @echo "\nHow about make test, make check, make winbuilder and make r-forge?"
+ @echo "\nHow about make test, make check, make winbuilder"
@echo "\nIs the DESCRIPTION file up to date?"
+ @echo "\nIs the NEWS.md file up to date?"
@echo "\nAre you sure you want to release to CRAN?"
- @echo "\nThen use the form at http://cran.r-project.org/submit.html"
+ @echo "\nThen make r-forge, commit leftover changes if any, tag the release and use the form at http://cran.r-project.org/submit.html"

Contact - Imprint