aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Ranke <jranke@uni-bremen.de>2015-06-11 12:12:40 +0200
committerJohannes Ranke <jranke@uni-bremen.de>2015-06-11 12:12:40 +0200
commitcbba81d73faa83c63a33afc61be5efc1964925bb (patch)
tree9fdd60f256f4f69a7616ce1b4cb31d87c55f84d5
parent6e4a152925011528c21937f12bc53042a53f72de (diff)
Use devtools for roxygenizing, improve logging
-rw-r--r--GNUmakefile7
1 files changed, 4 insertions, 3 deletions
diff --git a/GNUmakefile b/GNUmakefile
index 2b371ef..493299f 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -29,13 +29,14 @@ clean:
roxygen:
@echo "Roxygenizing package..."
- "$(R_HOME)/bin/Rscript" -e 'library(roxygen2); roxygenize("pkg")' 2>&1
+ "$(R_HOME)/bin/Rscript" -e 'library(devtools); document("pkg")' 2>&1 | tee roxygen.log
@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
+ @echo "Roxygenizing package..."
+ "$(R_HOME)/bin/Rscript" -e 'library(devtools); document("pkg")' 2>&1 | tee roxygen.log
+ @echo "Building package..."
git log --no-merges -M --date=iso pkg/ > pkg/ChangeLog
"$(R_HOME)/bin/R" CMD build pkg > build.log 2>&1
@echo "DONE."

Contact - Imprint