diff options
| author | Johannes Ranke <jranke@uni-bremen.de> | 2014-01-22 10:46:44 +0100 |
|---|---|---|
| committer | Johannes Ranke <jranke@uni-bremen.de> | 2014-01-22 10:46:44 +0100 |
| commit | 9ef8537149a37ebef8a2a18232644202872bbe55 (patch) | |
| tree | 066de4b62d6fa8078637fe23ae466fe0f525629e /GNUmakefile | |
| parent | af4a101d2cca91598ec5d1dc297c31a75517b139 (diff) | |
| parent | 8b94131388071980e62c17190eb4229e89975a0c (diff) | |
Merge branch 'master' of https://github.com/jranke/mkin
Conflicts:
DESCRIPTION
R/mkinfit.R
Diffstat (limited to 'GNUmakefile')
| -rw-r--r-- | GNUmakefile | 27 |
1 files changed, 22 insertions, 5 deletions
diff --git a/GNUmakefile b/GNUmakefile index 1c124b19..cf5c845e 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -16,11 +16,16 @@ help: @echo "" @echo "Development Tasks" @echo "-----------------" - @echo " build Create the package" - @echo " check Invoke build and then check the package" - @echo " install Invoke build and then install the result" - @echo " test Install a new copy of the package and run it " - @echo " through the testsuite" + @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 "---------------" @@ -47,14 +52,26 @@ install: build cd ..;\ "$(RBIN)/R" CMD INSTALL $(PKGNAME)_$(PKGVERS).tar.gz +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 cd tests;\ "$(RBIN)/Rscript" doRUnit.R +test-no-vignettes: install-no-vignettes + cd tests;\ + "$(RBIN)/Rscript" doRUnit.R + #------------------------------------------------------------------------------ # Packaging Tasks #------------------------------------------------------------------------------ |