diff options
| author | Johannes Ranke <jranke@uni-bremen.de> | 2024-11-17 17:10:11 +0100 |
|---|---|---|
| committer | Johannes Ranke <jranke@uni-bremen.de> | 2024-11-17 17:10:11 +0100 |
| commit | 14195b510234fa4e350df6558fa1830aa9d226e6 (patch) | |
| tree | 6f9a1792527f7a5316f9f8ae0d65ba9e997ed7c8 | |
| parent | b1342627d7234b4133465355870462640cf23fea (diff) | |
| parent | 74077191e562b9b2692e8342f8d190ec0be4431f (diff) | |
Merge branch 'main' into pull_request
| -rw-r--r-- | DESCRIPTION | 2 | ||||
| -rw-r--r-- | GNUmakefile | 12 |
2 files changed, 10 insertions, 4 deletions
diff --git a/DESCRIPTION b/DESCRIPTION index ebb9a83..2b680b9 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -21,4 +21,4 @@ Encoding: UTF-8 BugReports: https://github.com/jranke/chemCal/issues URL: https://pkgdown.jrwb.de/chemCal/, https://cgit.jrwb.de/chemCal/about Roxygen: list(markdown = TRUE) -RoxygenNote: 7.1.2 +RoxygenNote: 7.3.2 diff --git a/GNUmakefile b/GNUmakefile index b7404b6..0c5a155 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -28,16 +28,19 @@ all: build $(TGZ): $(pkgfiles) vignettes "$(RBIN)/R" CMD build . 2>&1 | tee build.log -build: $(TGZ) +roxy: + Rscript -e "roxygen2::roxygenize(roclets = c('rd', 'collate', 'namespace'))" + +build: roxy $(TGZ) README.html: README.rmd "$(RBIN)/Rscript" -e "rmarkdown::render('README.rmd', clean = FALSE)" mv README.knit.md README.md -install: build +install: roxy build "$(RBIN)/R" CMD INSTALL $(TGZ) -check: build +check: roxy build "$(RBIN)/R" CMD check --as-cran $(TGZ) 2>&1 | tee check.log vignettes/%.html: vignettes/%.Rmd vignettes/refs.bib @@ -65,3 +68,6 @@ clean: $(RM) -r vignettes/*_files $(RM) -r vignettes/*.R $(RM) Rplots.pdf + + +.PHONY: roxy build install check pd winbuilder test clean |