From ae13a2e7f373f697cdfb6acb7ae042d6e27d8967 Mon Sep 17 00:00:00 2001 From: Johannes Ranke Date: Fri, 24 Mar 2017 15:22:07 +0100 Subject: Add pkgdown docu, change package build directory --- GNUmakefile | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'GNUmakefile') diff --git a/GNUmakefile b/GNUmakefile index 64aa9d4..6b5e68c 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -1,7 +1,7 @@ PKGNAME := $(shell sed -n "s/Package: *\([^ ]*\)/\1/p" DESCRIPTION) PKGVERS := $(shell sed -n "s/Version: *\([^ ]*\)/\1/p" DESCRIPTION) PKGSRC := $(shell basename $(PWD)) -TGZ := ../$(PKGNAME)_$(PKGVERS).tar.gz +TGZ := $(PKGNAME)_$(PKGVERS).tar.gz # Specify the directory holding R binaries. To use an alternate R build (say a # pre-prelease version) use `make RBIN=/path/to/other/R/` or `export RBIN=...` @@ -10,16 +10,18 @@ TGZ := ../$(PKGNAME)_$(PKGVERS).tar.gz RBIN ?= $(shell dirname "`which R`") build: - cd ..;\ - "$(RBIN)/R" CMD build $(PKGSRC) + "$(RBIN)/R" CMD build . install: build - cd ..;\ - "$(RBIN)/R" CMD INSTALL $(PKGNAME)_$(PKGVERS).tar.gz + "$(RBIN)/R" CMD INSTALL $(TGZ) check: build - cd ..;\ - "$(RBIN)/R" CMD check --as-cran $(PKGNAME)_$(PKGVERS).tar.gz + "$(RBIN)/R" CMD check --as-cran $(TGZ) + +pd: + "$(RBIN)/Rscript" -e "pkgdown::build_site()" + git add -A + git commit -m 'Static documentation rebuilt by pkgdown::build_site()' -e winbuilder: build @echo "Uploading to R-release on win-builder" -- cgit v1.2.1