[Rcpp-commits] r2384 - pkg/Rcpp/inst/doc scripts

[noreply at r-forge.r-project.org]

Author: edd
Date: 2010-11-02 02:56:47 +0100 (Tue, 02 Nov 2010)
New Revision: 2384

Modified:
   pkg/Rcpp/inst/doc/Makefile
   scripts/runBuild.sh
Log:
force clean and rebuild of vignettes on standard build
add new clean target 'pdfclean' to Makefile


Modified: pkg/Rcpp/inst/doc/Makefile
===================================================================
--- pkg/Rcpp/inst/doc/Makefile	2010-11-02 01:26:41 UTC (rev 2383)
+++ pkg/Rcpp/inst/doc/Makefile	2010-11-02 01:56:47 UTC (rev 2384)
@@ -10,6 +10,8 @@
 
 all: clean index.html Rcpp-unitTests.pdf Rcpp-introduction.pdf Rcpp-modules.pdf Rcpp-package.pdf Rcpp-FAQ.pdf Rcpp-extending.pdf Rcpp-sugar.pdf Rcpp-quickref.pdf
 
+pdfclean:
+	rm -f Rcpp-extending.pdf  Rcpp-FAQ.pdf  Rcpp-introduction.pdf  Rcpp-modules.pdf  Rcpp-package.pdf  Rcpp-quickref.pdf  Rcpp-sugar.pdf  Rcpp-unitTests.pdf
 clean:
 	rm -f index.html
 	rm -f *.tex *.bbl *.blg *.aux *.out *.log
@@ -64,7 +66,11 @@
 Rcpp-package.pdf : Rcpp-package/Rcpp-package.Rnw
 	cp -f Rcpp-package/Rcpp-package.Rnw .
 	Rscript -e "require(highlight); driver <- HighlightWeaveLatex(boxes = TRUE, bg = 'white' ); Sweave( 'Rcpp-package.Rnw', driver = driver ); "
+ifneq (,$(findstring edd,$(whoami)))
+	pdflatex Rcpp-package
+else
 	Rscript -e "tools::texi2dvi( 'Rcpp-package.tex', pdf = TRUE, clean = FALSE )"
+endif
 	bibtex Rcpp-package
 ifneq (,$(findstring edd,$(whoami)))
 	pdflatex Rcpp-package

Modified: scripts/runBuild.sh
===================================================================
--- scripts/runBuild.sh	2010-11-02 01:26:41 UTC (rev 2383)
+++ scripts/runBuild.sh	2010-11-02 01:56:47 UTC (rev 2384)
@@ -12,6 +12,10 @@
 
 #export RCPP_CXX0X="yes"
 export RCPP_CXX0X="no"
+
+## remove old pdf vignettes and make fresh ones
+cd Rcpp/inst/doc && make pdfclean && make && cd - 
+
 R CMD build --force Rcpp
 
 test -d tarballs   && cp -vax Rcpp_${version}.tar.gz tarballs/rcpp_${version}.orig.tar.gz