[Rcpp-commits] r1474 - in pkg/Rcpp/inst/doc: . Rcpp-extending

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

Author: romain
Date: 2010-06-07 16:15:13 +0200 (Mon, 07 Jun 2010)
New Revision: 1474

Removed:
   pkg/Rcpp/inst/doc/Rcpp-extending/Makefile
Modified:
   pkg/Rcpp/inst/doc/Makefile
   pkg/Rcpp/inst/doc/rcpp.index.html
Log:
end of isolation for Rcpp-extending vignette

Modified: pkg/Rcpp/inst/doc/Makefile
===================================================================
--- pkg/Rcpp/inst/doc/Makefile	2010-06-07 14:12:04 UTC (rev 1473)
+++ pkg/Rcpp/inst/doc/Makefile	2010-06-07 14:15:13 UTC (rev 1474)
@@ -8,17 +8,19 @@
 ## on Ubuntu so for Dirk will insist on pdflatex and this variable helps
 whoami=$(shell whoami)
 
-all: clean index.html Rcpp-unitTests.pdf Rcpp-introduction.pdf Rcpp-modules.pdf Rcpp-package.pdf Rcpp-FAQ.pdf
+all: clean index.html Rcpp-unitTests.pdf Rcpp-introduction.pdf Rcpp-modules.pdf Rcpp-package.pdf Rcpp-FAQ.pdf Rcpp-extending.pdf
 
 clean:
 	touch Rcpp-unitTests.pdf
 	touch Rcpp-introduction.pdf
 	touch Rcpp-modules.pdf
 	touch Rcpp-FAQ.pdf
+	touch Rcpp-extending.pdf
 	rm Rcpp-introduction.pdf
 	rm Rcpp-unitTests.pdf
 	rm Rcpp-modules.pdf
 	rm Rcpp-FAQ.pdf
+	rm Rcpp-extending.pdf
 	touch index.html
 	rm index.html
 
@@ -105,24 +107,24 @@
 	rm Rcpp-FAQ.Rnw
 	cp Rcpp-FAQ/Rcpp-FAQ-fake.Rnw Rcpp-FAQ.Rnw
 
-# Rcpp-extending.pdf : Rcpp-extending/Rcpp-extending.Rnw
-# 	rm Rcpp-extending.Rnw
-# 	cp -f Rcpp-extending/Rcpp-extending.Rnw .
-# 	Rscript -e "require(highlight); driver <- HighlightWeaveLatex(boxes = TRUE, bg = 'white' ); Sweave( 'Rcpp-extending.Rnw', driver = driver ); "
-# 	Rscript -e "tools::texi2dvi( 'Rcpp-extending.tex', pdf = TRUE, clean = FALSE )"
-# 	bibtex Rcpp-extending
-# ifeq ($(whoami),edd)
-# 	pdflatex Rcpp-extending
-# 	pdflatex Rcpp-extending
-# else
-# 	Rscript -e "tools::texi2dvi( 'Rcpp-extending.tex', pdf = TRUE, clean = TRUE )"
-# endif
-# 	rm -fr Rcpp-extending.tex
-# 	rm -fr Rcpp-extending.bbl
-# 	rm -fr Rcpp-extending.blg
-# 	rm -fr Rcpp-extending.aux
-# 	rm -fr Rcpp-extending.out
-# 	rm -fr Rcpp-extending.log
-# 	rm Rcpp-extending.Rnw
-# 	cp Rcpp-extending/Rcpp-extending-fake.Rnw Rcpp-extending.Rnw
+Rcpp-extending.pdf : Rcpp-extending/Rcpp-extending.Rnw
+	rm Rcpp-extending.Rnw
+	cp -f Rcpp-extending/Rcpp-extending.Rnw .
+	Rscript -e "require(highlight); driver <- HighlightWeaveLatex(boxes = TRUE, bg = 'white' ); Sweave( 'Rcpp-extending.Rnw', driver = driver ); "
+	Rscript -e "tools::texi2dvi( 'Rcpp-extending.tex', pdf = TRUE, clean = FALSE )"
+	bibtex Rcpp-extending
+ifeq ($(whoami),edd)
+	pdflatex Rcpp-extending
+	pdflatex Rcpp-extending
+else
+	Rscript -e "tools::texi2dvi( 'Rcpp-extending.tex', pdf = TRUE, clean = TRUE )"
+endif
+	rm -fr Rcpp-extending.tex
+	rm -fr Rcpp-extending.bbl
+	rm -fr Rcpp-extending.blg
+	rm -fr Rcpp-extending.aux
+	rm -fr Rcpp-extending.out
+	rm -fr Rcpp-extending.log
+	rm Rcpp-extending.Rnw
+	cp Rcpp-extending/Rcpp-extending-fake.Rnw Rcpp-extending.Rnw
 	

Deleted: pkg/Rcpp/inst/doc/Rcpp-extending/Makefile
===================================================================
--- pkg/Rcpp/inst/doc/Rcpp-extending/Makefile	2010-06-07 14:12:04 UTC (rev 1473)
+++ pkg/Rcpp/inst/doc/Rcpp-extending/Makefile	2010-06-07 14:15:13 UTC (rev 1474)
@@ -1,34 +0,0 @@
-
-## There is an old bug in texidvi that makes it not swallow the ~
-## marker used to denote whitespace. This is actually due to fixing
-## another bug they whereby you could not run texidvi on directory
-## names containing a tilde (as we happen to do for Debian builds of R
-## alpha/beta/rc releases). The 'tilde' bug will go away as it
-## reportedly has been squashed upstream but I am still bitten by it
-## on Ubuntu so for Dirk will insist on pdflatex and this variable helps
-whoami=$(shell whoami)
-
-all: clean Rcpp-extending.pdf
-
-clean:
-	touch Rcpp-extending.pdf
-	rm -fr Rcpp-extending.pdf
-
-Rcpp-extending.pdf: Rcpp-extending.Rnw
-	cp ../Rcpp-modules.bib .
-	Rscript -e "require(highlight); driver <- HighlightWeaveLatex(boxes = TRUE, bg = 'white' ); Sweave( 'Rcpp-extending.Rnw', driver = driver ); "
-	Rscript -e "tools::texi2dvi( 'Rcpp-extending.tex', pdf = TRUE, clean = FALSE )"
-ifeq ($(whoami),edd)
-	pdflatex Rcpp-extending
-	pdflatex Rcpp-extending
-else
-	Rscript -e "tools::texi2dvi( 'Rcpp-extending.tex', pdf = TRUE, clean = TRUE )"
-endif
-	rm -fr Rcpp-extending.tex
-	rm -fr Rcpp-extending.bbl
-	rm -fr Rcpp-extending.blg
-	rm -fr Rcpp-extending.aux
-	rm -fr Rcpp-extending.out
-	rm -fr Rcpp-extending.log
-	rm -fr Rcpp-modules.bib
-

Modified: pkg/Rcpp/inst/doc/rcpp.index.html
===================================================================
--- pkg/Rcpp/inst/doc/rcpp.index.html	2010-06-07 14:12:04 UTC (rev 1473)
+++ pkg/Rcpp/inst/doc/rcpp.index.html	2010-06-07 14:15:13 UTC (rev 1474)
@@ -7,7 +7,9 @@
 <li><a href="Rcpp-introduction.pdf">(pdf) introduction to Rcpp (article submitted to the R journal)</a></li>
 <li><a href="unitTests-results/Rcpp-unitTests.html">unit tests</a>:(html) unit test report</li>
 <li><a href="Rcpp-unitTests.pdf">unit tests</a>: (pdf) unit test report</li>
-<li><a href="Rcpp-modules.pdf">Rcpp modules</a></li>
+<li><a href="Rcpp-modules.pdf">(pdf) Rcpp modules</a></li>
+<li><a href="Rcpp-FAQ.pdf">(pdf) Frequently asked questions</a></li>
+<li><a href="Rcpp-extending.pdf">(pdf) Extending Rcpp/a></li>
 </ul>
 
 <h2>Online documentation</h2>