diff options
author | = <=> | 2013-12-04 10:25:14 +0100 |
---|---|---|
committer | = <=> | 2013-12-04 10:25:14 +0100 |
commit | 8b94131388071980e62c17190eb4229e89975a0c (patch) | |
tree | 48f90fae958d466076f9f3b0aa8ec733c9c7bbee /GNUmakefile | |
parent | f7be9d1c545b6385f53603d2861e0a16e3044165 (diff) |
Make it possible to use different ode solvers
Diffstat (limited to 'GNUmakefile')
-rw-r--r-- | GNUmakefile | 22 |
1 files changed, 19 insertions, 3 deletions
diff --git a/GNUmakefile b/GNUmakefile index 255b97f3..cf5c845e 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -19,9 +19,13 @@ help: @echo " build Create the package" @echo " build-no-vignettes Create the package without rebuilding vignettes" @echo " check Invoke build and then check the package" + @echo " check-no-vignettes Invoke build without rebuilding vignettes, and then check" @echo " install Invoke build and then install the result" + @echo " install Invoke build without rebuilding vignettes and then install the result" @echo " test Install a new copy of the package and run it " @echo " through the testsuite" + @echo " test-no-vignettes Invoke build without rebuilding vignettes, and then run it" + @echo " through the testsuite" @echo "" @echo "Packaging Tasks" @echo "---------------" @@ -44,15 +48,27 @@ build-no-vignettes: cd ..;\ "$(RBIN)/R" CMD build $(PKGSRC) --no-build-vignettes -install%: build% +install: build cd ..;\ "$(RBIN)/R" CMD INSTALL $(PKGNAME)_$(PKGVERS).tar.gz -check%: build% +install-no-vignettes: build-no-vignettes + cd ..;\ + "$(RBIN)/R" CMD INSTALL $(PKGNAME)_$(PKGVERS).tar.gz + +check: build + cd ..;\ + "$(RBIN)/R" CMD check --as-cran --no-tests $(PKGNAME)_$(PKGVERS).tar.gz + +check-no-vignettes: build-no-vignettes cd ..;\ "$(RBIN)/R" CMD check --as-cran --no-tests $(PKGNAME)_$(PKGVERS).tar.gz -test%: install% +test: install + cd tests;\ + "$(RBIN)/Rscript" doRUnit.R + +test-no-vignettes: install-no-vignettes cd tests;\ "$(RBIN)/Rscript" doRUnit.R |