aboutsummaryrefslogtreecommitdiff
path: root/GNUmakefile
diff options
context:
space:
mode:
authorJohannes Ranke <jranke@uni-bremen.de>2016-12-08 08:45:55 +0100
committerJohannes Ranke <jranke@uni-bremen.de>2016-12-08 08:55:12 +0100
commitf88c47bf9c94c24d90e089423f5bfaebde38c62b (patch)
tree50e6b423819f16b0ab7941698368ea5ede67e0e8 /GNUmakefile
parent5195a43b5710d03f2f727b8f184de35eba413a01 (diff)
Documentation and Makefile improvements
- Fix the remaining links to static docs on r-forge in README - Build mkin_*.tar.gz packages in current directory - check and test (test.log unchanged)
Diffstat (limited to 'GNUmakefile')
-rw-r--r--GNUmakefile15
1 files changed, 6 insertions, 9 deletions
diff --git a/GNUmakefile b/GNUmakefile
index 1d986246..f41c2d3f 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -1,8 +1,8 @@
PKGNAME := $(shell sed -n "s/Package: *\([^ ]*\)/\1/p" DESCRIPTION)
PKGVERS := $(shell sed -n "s/Version: *\([^ ]*\)/\1/p" DESCRIPTION)
PKGSRC := $(shell basename $(PWD))
-TGZ := ../$(PKGSRC)_$(PKGVERS).tar.gz
-TGZVNR := ../$(PKGSRC)_$(PKGVERS)-vignettes-not-rebuilt.tar.gz
+TGZ := $(PKGSRC)_$(PKGVERS).tar.gz
+TGZVNR := $(PKGSRC)_$(PKGVERS)-vignettes-not-rebuilt.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=...`
@@ -32,13 +32,10 @@ pkgfiles = \
all: build
$(TGZ): $(pkgfiles) vignettes
- cd ..;\
- "$(RBIN)/R" CMD build $(PKGSRC) 2>&1 | tee $(PKGNAME)/build.log
+ "$(RBIN)/R" CMD build . 2>&1 | tee build.log
$(TGZVNR): $(pkgfiles)
- cd ..;\
- "$(RBIN)/R" CMD build $(PKGSRC) --no-build-vignettes;\
- cd $(PKGSRC);\
+ "$(RBIN)/R" CMD build . --no-build-vignettes;\
mv $(TGZ) $(TGZVNR)
build: $(TGZ)
@@ -52,7 +49,7 @@ quickinstall: build-no-vignettes
"$(RBIN)/R" CMD INSTALL $(TGZVNR)
check: build
- "$(RBIN)/R" CMD check --as-cran --no-tests $(TGZ)
+ "$(RBIN)/R" CMD check --as-cran --no-tests $(TGZ) 2>&1 | tee check.log
quickcheck: build-no-vignettes
mv $(TGZVNR) $(TGZ)
@@ -117,7 +114,7 @@ drat: build
"$(RBIN)/Rscript" -e "drat::insertPackage('$(TGZ)', commit = TRUE)"
submit:
- @echo "\nHow about make test, make check, make winbuilder"
+ @echo "\nHow about make test, make check, make pd, make winbuilder"
@echo "\nIs the DESCRIPTION file up to date?"
@echo "\nIs the NEWS.md file up to date?"
@echo "\nAre you sure you want to release to CRAN?"

Contact - Imprint