diff options
| author | Johannes Ranke <jranke@uni-bremen.de> | 2016-10-13 20:13:27 +0200 |
|---|---|---|
| committer | Johannes Ranke <jranke@uni-bremen.de> | 2016-10-13 20:13:27 +0200 |
| commit | 70e16d8ca726ed9d894bd219018838ce4b0f22a0 (patch) | |
| tree | ee5c9b79a55a2e9ce63f756ddf01ad20edbdec93 | |
| parent | 6cfe5fbd827ca37f24134e8356e8144520ee1265 (diff) | |
chents for windows!
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | GNUmakefile | 19 |
2 files changed, 26 insertions, 5 deletions
@@ -1,3 +1,15 @@ +commit 6cfe5fbd827ca37f24134e8356e8144520ee1265 +Author: Johannes Ranke <jranke@uni-bremen.de> +Date: 2016-10-13 17:28:14 +0200 + + Remove unmaintained usage + +commit 5a9a777987fd7ac0d5724e4cfdb2178fa1567281 +Author: Johannes Ranke <jranke@uni-bremen.de> +Date: 2016-10-13 17:23:12 +0200 + + Commit changelog as test for mirroring on github + commit 291337e920cc95510fce3c0cdcc62b4443cd3bc4 Author: Johannes Ranke <jranke@uni-bremen.de> Date: 2016-10-13 14:03:19 +0200 diff --git a/GNUmakefile b/GNUmakefile index 3051dfb..dfea847 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -2,13 +2,12 @@ PKGSRC := $(shell basename $(CURDIR)) PKGNAME := $(shell sed -n "s/Package: *\([^ ]*\)/\1/p" DESCRIPTION) PKGVERS := $(shell sed -n "s/Version: *\([^ ]*\)/\1/p" DESCRIPTION) TGZ := $(PKGNAME)_$(PKGVERS).tar.gz +WINBIN := $(PKGNAME)_$(PKGVERS).zip R_HOME ?= $(shell R RHOME) DATE := $(shell date +%Y-%m-%d) all: install -.PHONEY: usage check clean roxygen sd - pkgfiles = DESCRIPTION \ README.html \ R/* \ @@ -19,7 +18,7 @@ pkgfiles = DESCRIPTION \ roxygen: @echo "Roxygenizing package..." - "$(R_HOME)/bin/Rscript" -e 'library(devtools); document(".")' + "$(R_HOME)/bin/Rscript" -e 'library(devtools); document()' @echo "DONE." sd: roxygen @@ -30,7 +29,7 @@ sd: roxygen $(TGZ): $(pkgfiles) sed -i -e "s/Date:.*/Date: $(DATE)/" DESCRIPTION @echo "Roxygenizing package..." - "$(R_HOME)/bin/Rscript" -e 'library(devtools); document(".")' + "$(R_HOME)/bin/Rscript" -e 'library(devtools); document()' @echo "Building package..." git log --no-merges -M --date=iso > ChangeLog "$(R_HOME)/bin/R" CMD build . @@ -41,9 +40,16 @@ README.html: README.md build: $(TGZ) +$(WINBIN): build + @echo "Building windows binary package..." + "$(R_HOME)/bin/R" CMD INSTALL $(TGZ) --build + @echo "DONE." + +winbin: $(WINBIN) + test: build @echo "Running testthat tests..." - "$(R_HOME)/bin/Rscript" -e 'library(devtools); devtools::test(".")' 2>&1 | tee test.log + "$(R_HOME)/bin/Rscript" -e 'library(devtools); devtools::test()' 2>&1 | tee test.log @echo "DONE." quickcheck: build @@ -64,6 +70,9 @@ install: build drat: build "$(R_HOME)/bin/Rscript" -e "drat::insertPackage('$(TGZ)', commit = TRUE)" +dratwin: winbin + "$(R_HOME)/bin/Rscript" -e "drat::insertPackage('$(WINBIN)', 'e:/git/drat/', commit = TRUE)" + winbuilder: build date @echo "Uploading to R-release on win-builder" |