diff options
| author | Johannes Ranke <jranke@uni-bremen.de> | 2015-04-24 02:20:21 +0200 |
|---|---|---|
| committer | Johannes Ranke <jranke@uni-bremen.de> | 2015-04-24 02:20:21 +0200 |
| commit | bcfe0af7970efe36c3aa661e89953fbe3689c310 (patch) | |
| tree | 2c858cdf875adccbddd0f1186cce8e0606f6889e /GNUmakefile | |
| parent | 768a043848dd84b9e699916657d0a23b2f3b9e83 (diff) | |
Clean the Makefile a bit
Diffstat (limited to 'GNUmakefile')
| -rw-r--r-- | GNUmakefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/GNUmakefile b/GNUmakefile index 93708a6..2b371ef 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -29,13 +29,13 @@ clean: roxygen: @echo "Roxygenizing package..." - "$(R_HOME)/bin/Rscript" -e 'library(roxygen2); roxygenize("pkg")' > roxygen.log 2>&1 || cat roxygen.log + "$(R_HOME)/bin/Rscript" -e 'library(roxygen2); roxygenize("pkg")' 2>&1 @echo "DONE." $(TGZ): $(pkgfiles) @echo "Building package..." sed -i -e "s/Date:.*/Date: $(DATE)/" pkg/DESCRIPTION - "$(R_HOME)/bin/Rscript" -e 'library(roxygen2); roxygenize("pkg")' 2>&1 | tee roxygen.log + "$(R_HOME)/bin/Rscript" -e 'library(roxygen2); roxygenize("pkg")' 2>&1 git log --no-merges -M --date=iso pkg/ > pkg/ChangeLog "$(R_HOME)/bin/R" CMD build pkg > build.log 2>&1 @echo "DONE." @@ -44,7 +44,7 @@ build: $(TGZ) test: build @echo "Running testthat tests..." - "$(R_HOME)/bin/Rscript" -e 'library(devtools); devtools::test("pkg")' 2>&1 | tee roxygen.log + "$(R_HOME)/bin/Rscript" -e 'library(devtools); devtools::test("pkg")' 2>&1 | tee test.log @echo "DONE." check: build |