diff options
| author | Johannes Ranke <jranke@uni-bremen.de> | 2019-07-09 12:34:04 +0200 |
|---|---|---|
| committer | Johannes Ranke <jranke@uni-bremen.de> | 2019-07-09 12:34:04 +0200 |
| commit | 9a1e685a636f7632fc77c7375f9d42735be2decc (patch) | |
| tree | 5118e45d42e0eab215a9a75bc4aa9b3ff97d00f9 /GNUmakefile | |
| parent | d1f514a4e09eaf5bdccf086baab3e5e727302d5d (diff) | |
More adaptations to mkin 0.9.49.6, update manualv0.6.10
Static documentation rebuilt by pkgdown
Diffstat (limited to 'GNUmakefile')
| -rw-r--r-- | GNUmakefile | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/GNUmakefile b/GNUmakefile index 5078d82..b2399d7 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -2,7 +2,6 @@ PKGNAME := $(shell sed -n "s/Package: *\([^ ]*\)/\1/p" DESCRIPTION) PKGVERS := $(shell sed -n "s/Version: *\([^ ]*\)/\1/p" DESCRIPTION) PKGDIR := $(PWD) TGZ := $(PKGNAME)_$(PKGVERS).tar.gz -TGZVNR := $(PKGNAME)_$(PKGVERS)-vignettes-not-rebuilt.tar.gz WINBIN := $(PKGNAME)_$(PKGVERS).zip # Specify the directory holding R binaries. To use an alternate R build (say a @@ -17,6 +16,7 @@ RFDIR ?= $(RFSVN)/pkg/gmkin SDDIR ?= $(RFSVN)/www/gmkin_static pkgfiles = NEWS.md \ + .Rbuildignore \ data/* \ DESCRIPTION \ inst/GUI/* \ @@ -34,17 +34,11 @@ all: check clean $(TGZ): $(pkgfiles) "$(RBIN)/R" CMD build . -$(TGZVNR): $(pkgfiles) - "$(RBIN)/R" CMD build --no-build-vignettes . ;\ - mv $(TGZ) $(TGZVNR) - roxygen: "$(RBIN)/Rscript" -e 'devtools::document()' build: roxygen $(TGZ) -build-no-vignettes: $(TGZVNR) - $(WINBIN): build @echo "Building windows binary package..." "$(RBIN)/R" CMD INSTALL $(TGZ) --build @@ -55,17 +49,8 @@ winbin: $(WINBIN) install: build "$(RBIN)/R" CMD INSTALL $(TGZ) -install-no-vignettes: build-no-vignettes - "$(RBIN)/R" CMD INSTALL $(TGZVNR) - check: build - # Vignettes have been rebuilt by the build target - "$(RBIN)/R" CMD check --no-tests --no-build-vignettes $(TGZ) - -check-no-vignettes: build-no-vignettes - mv $(TGZVNR) $(TGZ) "$(RBIN)/R" CMD check --no-tests $(TGZ) - mv $(TGZ) $(TGZVNR) README.html: README.md "$(RBIN)/Rscript" -e "rmarkdown::render('README.md', output_format = 'html_document', output_options = list(self_contained = TRUE))" |