diff options
| author | Johannes Ranke <jranke@uni-bremen.de> | 2015-06-18 08:29:38 +0200 |
|---|---|---|
| committer | Johannes Ranke <jranke@uni-bremen.de> | 2015-06-18 08:29:38 +0200 |
| commit | 7faffad1907995f1b623ede8fc2e386693428e22 (patch) | |
| tree | 6c68057b690daabf566a1d4825e177af1d8b9355 /GNUmakefile | |
| parent | 53099978c971ee8e5c94e67bf972f51629d67fd3 (diff) | |
| parent | fef0bb7fe916f91dcff089c17aa3290c0ea1ab1f (diff) | |
Merge branch 'master' into pfm_chent
Conflicts:
pkg/DESCRIPTION
pkg/NAMESPACE
Diffstat (limited to 'GNUmakefile')
| -rw-r--r-- | GNUmakefile | 7 |
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." |