From ab8cd4dd9aa6e9a06f6058693acb244b99370f52 Mon Sep 17 00:00:00 2001 From: Johannes Ranke Date: Wed, 24 Jun 2015 16:27:38 +0200 Subject: Staticdocs site_path argument in build_site() now works This long-standing issue finally got fixed in 2f56137fc9ba60bfea54e575d233f4e696bb8a5a --- GNUmakefile | 13 ++++++------- inst/staticdocs/README | 2 -- 2 files changed, 6 insertions(+), 9 deletions(-) delete mode 100644 inst/staticdocs/README diff --git a/GNUmakefile b/GNUmakefile index 57a6ca15..b04d22af 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -89,14 +89,13 @@ vignettes/%.html: vignettes/mkin_vignettes.css vignettes/%.Rmd vignettes: install-no-vignettes vignettes/mkin.pdf vignettes/FOCUS_D.html vignettes/FOCUS_L.html vignettes/FOCUS_Z.pdf vignettes/compiled_models.html sd: - "$(RBIN)/Rscript" -e "library(staticdocs); build_site()" - $(RM) Rplots.pdf - -move-sd: - rm -rf $(SDDIR)/*;\ - cp -r inst/web/* $(SDDIR); cp -r figure $(SDDIR); cd $(SDDIR) && svn add --force . + rm -rf $(SDDIR)/* + "$(RBIN)/Rscript" -e "library(staticdocs); build_site(site_path = '$(SDDIR)')" + $(RM) $(SDDIR)/Rplots.pdf + cp -r figure $(SDDIR) -r-forge: sd move-sd +r-forge: sd + cd $(SDDIR) && svn add --force . git archive master > $(HOME)/mkin.tar;\ cd $(RFDIR) && rm -r `ls` && tar -xf $(HOME)/mkin.tar;\ svn add --force .; svn rm --force `svn status | grep "\!" | cut -d " " -f 8`; cd $(RFSVN) && svn commit -m 'sync with git' diff --git a/inst/staticdocs/README b/inst/staticdocs/README deleted file mode 100644 index e114e3ec..00000000 --- a/inst/staticdocs/README +++ /dev/null @@ -1,2 +0,0 @@ -This directory is simply here because building with current -staticdocs versions does not work without it. -- cgit v1.2.1