From cae0443746faa72b521f1f31d36bbb13b5ddd92f Mon Sep 17 00:00:00 2001 From: Johannes Ranke Date: Mon, 27 Oct 2014 14:26:18 +0100 Subject: gmkin is now in R-Forge - Update installation instructions - Bump version, as this is a remarkable change - Update Makefile and NEWS - Fix building the manual using the Makefile, pandoc was not found by tools::buildVignettes --- GNUmakefile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'GNUmakefile') diff --git a/GNUmakefile b/GNUmakefile index 0c74591..e8e3692 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -12,6 +12,7 @@ RBIN ?= $(shell dirname "`which R`") # # Specify static documentation directories for subversion on r-forge RFSVN ?= $(HOME)/svn/kinfit.r-forge +RFDIR ?= $(RFSVN)/pkg/gmkin SDDIR ?= $(RFSVN)/www/gmkin_static .PHONY: help @@ -63,7 +64,7 @@ check-no-vignettes: build-no-vignettes mv $(TGZ) $(TGZVNR) vignettes/gmkin_manual.html: vignettes/gmkin_manual.Rmd - "$(RBIN)/Rscript" -e "tools::buildVignette(file = 'vignettes/gmkin_manual.Rmd', dir = 'vignettes')" + "$(RBIN)/Rscript" -e "rmarkdown::render(input = 'vignettes/gmkin_manual.Rmd')" vignettes: vignettes/gmkin_manual.html @@ -75,7 +76,9 @@ move-sd: sd cp -r inst/web/* $(SDDIR); cp gmkin_screenshot.png $(SDDIR); cd $(SDDIR) && svn add --force . r-forge: move-sd - cd $(RFSVN) && svn commit -m 'update gmkin static documentation from github repository' + git archive master > $(HOME)/gmkin.tar;\ + cd $(RFDIR) && rm -r `ls` && tar -xf $(HOME)/gmkin.tar;\ + svn add --force .; cd $(RFSVN) && svn commit -m 'update gmkin from github repository' release: r-forge build cp $(TGZ) $(RFSVN)/www/repo/src/contrib; scp $(TGZ) qnap:projects/gmkin -- cgit v1.2.1