diff options
| author | Johannes Ranke <jranke@uni-bremen.de> | 2018-07-05 18:44:22 +0200 |
|---|---|---|
| committer | Johannes Ranke <jranke@uni-bremen.de> | 2018-07-05 18:44:22 +0200 |
| commit | 9411139beee167c5339e96db448e5dbed19e06bc (patch) | |
| tree | 1bba625b3a2288c1ede4eefe1c23d3bcfa0f9fcc /GNUmakefile | |
| parent | 801e95f1cc7bfcc8480f6f49b9da2331be71d1a9 (diff) | |
Maintenance in preparation of improvements
- Switch vignette to html
- Switch tests to testthat
- NEWS.md instead of ChangeLog
- Remove names of y in lists returned by lod and loq
Diffstat (limited to 'GNUmakefile')
| -rw-r--r-- | GNUmakefile | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/GNUmakefile b/GNUmakefile index 730c460..3f16fbc 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -15,25 +15,16 @@ README.html: README.md build: "$(RBIN)/R" CMD build . -build-no-vignettes: - "$(RBIN)/R" CMD build --no-build-vignettes . - install: build "$(RBIN)/R" CMD INSTALL $(TGZ) -install-no-vignettes: build-no-vignettes - "$(RBIN)/R" CMD INSTALL $(TGZ) - check: build "$(RBIN)/R" CMD check --as-cran $(TGZ) -check-no-vignettes: build-no-vignettes - "$(RBIN)/R" CMD check --as-cran $(TGZ) - -vignettes/%.pdf: vignettes/%.Rnw +vignettes/%.html: vignettes/%.Rmd "$(RBIN)/Rscript" -e "tools::buildVignette(file = 'vignettes/$*.Rnw', dir = 'vignettes')" -vignettes: vignettes/chemCal.pdf +vignettes: vignettes/chemCal.html pd: "$(RBIN)/Rscript" -e "pkgdown::build_site()" @@ -46,3 +37,6 @@ winbuilder: build curl -T $(TGZ) ftp://anonymous@win-builder.r-project.org/R-release/ @echo "Uploading to R-devel on win-builder" curl -T $(TGZ) ftp://anonymous@win-builder.r-project.org/R-devel/ + +test: install + NOT_CRAN=true "$(RBIN)/Rscript" -e 'devtools::test()' |