[Rcpp-commits] r2916 - in pkg: Rcpp Rcpp/inst Rcpp/inst/doc RcppArmadillo RcppArmadillo/inst RcppArmadillo/inst/doc RcppClassic RcppClassic/inst/doc
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Mon Feb 28 23:20:49 CET 2011
Author: edd
Date: 2011-02-28 23:20:49 +0100 (Mon, 28 Feb 2011)
New Revision: 2916
Modified:
pkg/Rcpp/ChangeLog
pkg/Rcpp/inst/NEWS
pkg/Rcpp/inst/doc/Makefile
pkg/RcppArmadillo/ChangeLog
pkg/RcppArmadillo/inst/NEWS
pkg/RcppArmadillo/inst/doc/Makefile
pkg/RcppClassic/ChangeLog
pkg/RcppClassic/inst/doc/Makefile
Log:
inst/doc/Makefile now respect $R_HOME
Modified: pkg/Rcpp/ChangeLog
===================================================================
--- pkg/Rcpp/ChangeLog 2011-02-23 22:15:15 UTC (rev 2915)
+++ pkg/Rcpp/ChangeLog 2011-02-28 22:20:49 UTC (rev 2916)
@@ -1,3 +1,7 @@
+2011-02-28 Dirk Eddelbuettel <edd at debian.org>
+
+ * inst/doc/Makefile: Call R and Rscript relative to R_HOME/bin
+
2011-02-23 Dirk Eddelbuettel <edd at debian.org>
* DESCRIPTION: Release 0.9.2
Modified: pkg/Rcpp/inst/NEWS
===================================================================
--- pkg/Rcpp/inst/NEWS 2011-02-23 22:15:15 UTC (rev 2915)
+++ pkg/Rcpp/inst/NEWS 2011-02-28 22:20:49 UTC (rev 2916)
@@ -1,3 +1,7 @@
+0.9.3 2011-xx-yy
+
+ o inst/doc/Makefile now respects $R_HOME environment variable
+
0.9.2 2011-02-23
o The unitTest runit.Module.client.package.R is now skipped on older OS
@@ -3,5 +7,5 @@
X releases as it triggers a bug with g++ 4.2.1 or older; OS X 10.6 is
fine but as it no longer support ppc we try to accomodate 10.5 too
- Thanks to Simon Urbankek for pinning this down and Baptiste Auguie
+ Thanks to Simon Urbanek for pinning this down and Baptiste Auguie
and Ken Williams for additonal testing
Modified: pkg/Rcpp/inst/doc/Makefile
===================================================================
--- pkg/Rcpp/inst/doc/Makefile 2011-02-23 22:15:15 UTC (rev 2915)
+++ pkg/Rcpp/inst/doc/Makefile 2011-02-28 22:20:49 UTC (rev 2916)
@@ -22,103 +22,110 @@
cp -f Rcpp-quickref/Rcpp-quickref-fake.Rnw Rcpp-quickref.Rnw
cp -f Rcpp-sugar/Rcpp-sugar-fake.Rnw Rcpp-sugar.Rnw
+setvars:
+ifeq (${R_HOME},)
+R_HOME= $(shell R RHOME)
+endif
+RPROG= $(R_HOME)/bin/R
+RSCRIPT=$(R_HOME)/bin/Rscript
+
index.html: rcpp.index.html
cp rcpp.index.html index.html
Rcpp-unitTests.pdf:
rm -fr unitTests-results/*
- Rscript --vanilla unitTests/Rcpp-unitTests.R
- R CMD Sweave Rcpp-unitTests.Rnw
- Rscript --vanilla -e "tools::texi2dvi( 'Rcpp-unitTests.tex', pdf = TRUE, clean = TRUE )"
+ $(RSCRIPT) --vanilla unitTests/Rcpp-unitTests.R
+ $(RPROG) CMD Sweave Rcpp-unitTests.Rnw
+ $(RSCRIPT) --vanilla -e "tools::texi2dvi( 'Rcpp-unitTests.tex', pdf = TRUE, clean = TRUE )"
rm -fr Rcpp-unitTests.tex
Rcpp-api.pdf: Rcpp-api.Rnw
- R CMD Sweave Rcpp-api.Rnw
- Rscript --vanilla -e "tools::texi2dvi( 'Rcpp-api.tex', pdf = TRUE, clean = TRUE ) "
+ $(RPROG) CMD Sweave Rcpp-api.Rnw
+ $(RSCRIPT) --vanilla -e "tools::texi2dvi( 'Rcpp-api.tex', pdf = TRUE, clean = TRUE ) "
rm -fr Rcpp-api.tex
Rcpp-introduction.pdf: Rcpp-introduction.Rnw
- R CMD Sweave Rcpp-introduction.Rnw
+ $(RPROG) CMD Sweave Rcpp-introduction.Rnw
ifneq (,$(findstring edd,$(whoami)))
pdflatex Rcpp-introduction.tex
bibtex Rcpp-introduction
pdflatex Rcpp-introduction.tex
pdflatex Rcpp-introduction.tex
else
- Rscript -e "tools::texi2dvi( 'Rcpp-introduction.tex', pdf = TRUE, clean = TRUE )"
+ $(RSCRIPT) -e "tools::texi2dvi( 'Rcpp-introduction.tex', pdf = TRUE, clean = TRUE )"
endif
rm -fr Rcpp-introduction.tex
Rcpp-modules.pdf: Rcpp-modules/Rcpp-modules.Rnw
cp -f Rcpp-modules/Rcpp-modules.Rnw .
- Rscript --vanilla -e "require(highlight); driver <- HighlightWeaveLatex(boxes = TRUE, bg = 'white' ); Sweave( 'Rcpp-modules.Rnw', driver = driver ); "
- Rscript --vanilla -e "tools::texi2dvi( 'Rcpp-modules.tex', pdf = TRUE, clean = FALSE )"
+ $(RSCRIPT) --vanilla -e "require(highlight); driver <- HighlightWeaveLatex(boxes = TRUE, bg = 'white' ); Sweave( 'Rcpp-modules.Rnw', driver = driver ); "
+ $(RSCRIPT) --vanilla -e "tools::texi2dvi( 'Rcpp-modules.tex', pdf = TRUE, clean = FALSE )"
bibtex Rcpp-modules
ifneq (,$(findstring edd,$(whoami)))
pdflatex Rcpp-modules.tex
pdflatex Rcpp-modules.tex
else
- Rscript -e "tools::texi2dvi( 'Rcpp-modules.tex', pdf = TRUE, clean = TRUE )"
+ $(RSCRIPT) -e "tools::texi2dvi( 'Rcpp-modules.tex', pdf = TRUE, clean = TRUE )"
endif
rm -fr Rcpp-modules.tex Rcpp-modules.bbl Rcpp-modules.blg Rcpp-modules.aux Rcpp-modules.out Rcpp-modules.log
cp -f Rcpp-modules/Rcpp-modules-fake.Rnw Rcpp-modules.Rnw
Rcpp-package.pdf : Rcpp-package/Rcpp-package.Rnw
cp -f Rcpp-package/Rcpp-package.Rnw .
- Rscript --vanilla -e "require(highlight); driver <- HighlightWeaveLatex(boxes = TRUE, bg = 'white' ); Sweave( 'Rcpp-package.Rnw', driver = driver ); "
+ $(RSCRIPT) --vanilla -e "require(highlight); driver <- HighlightWeaveLatex(boxes = TRUE, bg = 'white' ); Sweave( 'Rcpp-package.Rnw', driver = driver ); "
ifneq (,$(findstring edd,$(whoami)))
pdflatex Rcpp-package
else
- Rscript --vanilla -e "tools::texi2dvi( 'Rcpp-package.tex', pdf = TRUE, clean = FALSE )"
+ $(RSCRIPT) --vanilla -e "tools::texi2dvi( 'Rcpp-package.tex', pdf = TRUE, clean = FALSE )"
endif
bibtex Rcpp-package
ifneq (,$(findstring edd,$(whoami)))
pdflatex Rcpp-package
pdflatex Rcpp-package
else
- Rscript --vanilla -e "tools::texi2dvi( 'Rcpp-package.tex', pdf = TRUE, clean = TRUE )"
+ $(RSCRIPT) --vanilla -e "tools::texi2dvi( 'Rcpp-package.tex', pdf = TRUE, clean = TRUE )"
endif
rm -fr Rcpp-package.tex Rcpp-package.bbl Rcpp-package.blg Rcpp-package.aux Rcpp-package.out Rcpp-package.log
cp -f Rcpp-package/Rcpp-package-fake.Rnw Rcpp-package.Rnw
Rcpp-FAQ.pdf : Rcpp-FAQ/Rcpp-FAQ.Rnw
cp -f Rcpp-FAQ/Rcpp-FAQ.Rnw .
- Rscript --vanilla -e "require(highlight); driver <- HighlightWeaveLatex(boxes = TRUE, bg = 'white' ); Sweave( 'Rcpp-FAQ.Rnw', driver = driver ); "
- Rscript --vanilla -e "tools::texi2dvi( 'Rcpp-FAQ.tex', pdf = TRUE, clean = FALSE )"
+ $(RSCRIPT) --vanilla -e "require(highlight); driver <- HighlightWeaveLatex(boxes = TRUE, bg = 'white' ); Sweave( 'Rcpp-FAQ.Rnw', driver = driver ); "
+ $(RSCRIPT) --vanilla -e "tools::texi2dvi( 'Rcpp-FAQ.tex', pdf = TRUE, clean = FALSE )"
bibtex Rcpp-FAQ
ifneq (,$(findstring edd,$(whoami)))
pdflatex Rcpp-FAQ
pdflatex Rcpp-FAQ
else
- Rscript -e "tools::texi2dvi( 'Rcpp-FAQ.tex', pdf = TRUE, clean = TRUE )"
+ $(RSCRIPT) -e "tools::texi2dvi( 'Rcpp-FAQ.tex', pdf = TRUE, clean = TRUE )"
endif
rm -fr Rcpp-FAQ.tex Rcpp-FAQ.bbl Rcpp-FAQ.blg Rcpp-FAQ.aux Rcpp-FAQ.out Rcpp-FAQ.log
cp -f Rcpp-FAQ/Rcpp-FAQ-fake.Rnw Rcpp-FAQ.Rnw
Rcpp-extending.pdf : Rcpp-extending/Rcpp-extending.Rnw
cp -f Rcpp-extending/Rcpp-extending.Rnw .
- Rscript --vanilla -e "require(highlight); driver <- HighlightWeaveLatex(boxes = TRUE, bg = 'white' ); Sweave( 'Rcpp-extending.Rnw', driver = driver ); "
- Rscript --vanilla -e "tools::texi2dvi( 'Rcpp-extending.tex', pdf = TRUE, clean = FALSE )"
+ $(RSCRIPT) --vanilla -e "require(highlight); driver <- HighlightWeaveLatex(boxes = TRUE, bg = 'white' ); Sweave( 'Rcpp-extending.Rnw', driver = driver ); "
+ $(RSCRIPT) --vanilla -e "tools::texi2dvi( 'Rcpp-extending.tex', pdf = TRUE, clean = FALSE )"
bibtex Rcpp-extending
ifneq (,$(findstring edd,$(whoami)))
pdflatex Rcpp-extending
pdflatex Rcpp-extending
else
- Rscript -e "tools::texi2dvi( 'Rcpp-extending.tex', pdf = TRUE, clean = TRUE )"
+ $(RSCRIPT) -e "tools::texi2dvi( 'Rcpp-extending.tex', pdf = TRUE, clean = TRUE )"
endif
rm -fr Rcpp-extending.tex Rcpp-extending.bbl Rcpp-extending.blg Rcpp-extending.aux Rcpp-extending.out Rcpp-extending.log
cp -f Rcpp-extending/Rcpp-extending-fake.Rnw Rcpp-extending.Rnw
Rcpp-sugar.pdf : Rcpp-sugar/Rcpp-sugar.Rnw
cp -f Rcpp-sugar/Rcpp-sugar.Rnw .
- Rscript --vanilla -e "require(highlight); driver <- HighlightWeaveLatex(boxes = TRUE, bg = 'white' ); Sweave( 'Rcpp-sugar.Rnw', driver = driver ); "
- Rscript --vanilla -e "tools::texi2dvi( 'Rcpp-sugar.tex', pdf = TRUE, clean = FALSE )"
+ $(RSCRIPT) --vanilla -e "require(highlight); driver <- HighlightWeaveLatex(boxes = TRUE, bg = 'white' ); Sweave( 'Rcpp-sugar.Rnw', driver = driver ); "
+ $(RSCRIPT) --vanilla -e "tools::texi2dvi( 'Rcpp-sugar.tex', pdf = TRUE, clean = FALSE )"
bibtex Rcpp-sugar
ifneq (,$(findstring edd,$(whoami)))
pdflatex Rcpp-sugar
pdflatex Rcpp-sugar
else
- Rscript -e "tools::texi2dvi( 'Rcpp-sugar.tex', pdf = TRUE, clean = TRUE )"
+ $(RSCRIPT) -e "tools::texi2dvi( 'Rcpp-sugar.tex', pdf = TRUE, clean = TRUE )"
endif
rm -fr Rcpp-sugar.tex Rcpp-sugar.bbl Rcpp-sugar.blg Rcpp-sugar.aux Rcpp-sugar.out Rcpp-sugar.log
rm Rcpp-sugar.Rnw
@@ -126,13 +133,13 @@
Rcpp-quickref.pdf : Rcpp-quickref/Rcpp-quickref.Rnw
cp -f Rcpp-quickref/Rcpp-quickref.Rnw .
- Rscript --vanilla -e "require(highlight); driver <- HighlightWeaveLatex(boxes = TRUE, bg = 'white' ); Sweave( 'Rcpp-quickref.Rnw', driver = driver ); "
- Rscript --vanilla -e "tools::texi2dvi( 'Rcpp-quickref.tex', pdf = TRUE, clean = FALSE )"
+ $(RSCRIPT) --vanilla -e "require(highlight); driver <- HighlightWeaveLatex(boxes = TRUE, bg = 'white' ); Sweave( 'Rcpp-quickref.Rnw', driver = driver ); "
+ $(RSCRIPT) --vanilla -e "tools::texi2dvi( 'Rcpp-quickref.tex', pdf = TRUE, clean = FALSE )"
ifneq (,$(findstring edd,$(whoami)))
pdflatex Rcpp-quickref
pdflatex Rcpp-quickref
else
- Rscript -e "tools::texi2dvi( 'Rcpp-quickref.tex', pdf = TRUE, clean = TRUE )"
+ $(RSCRIPT) -e "tools::texi2dvi( 'Rcpp-quickref.tex', pdf = TRUE, clean = TRUE )"
endif
rm -fr Rcpp-quickref.tex Rcpp-quickref.bbl Rcpp-quickref.blg Rcpp-quickref.aux Rcpp-quickref.out Rcpp-quickref.log Rcpp-quickref.Rnw
cp -f Rcpp-quickref/Rcpp-quickref-fake.Rnw Rcpp-quickref.Rnw
Modified: pkg/RcppArmadillo/ChangeLog
===================================================================
--- pkg/RcppArmadillo/ChangeLog 2011-02-23 22:15:15 UTC (rev 2915)
+++ pkg/RcppArmadillo/ChangeLog 2011-02-28 22:20:49 UTC (rev 2916)
@@ -1,3 +1,7 @@
+2011-02-28 Dirk Eddelbuettel <edd at debian.org>
+
+ * inst/doc/Makefile: Call R and Rscript relative to R_HOME/bin
+
2011-02-20 Dirk Eddelbuettel <edd at debian.org>
* src/fastLm.cpp (fastLm): Further simplified and shortened by using
Modified: pkg/RcppArmadillo/inst/NEWS
===================================================================
--- pkg/RcppArmadillo/inst/NEWS 2011-02-23 22:15:15 UTC (rev 2915)
+++ pkg/RcppArmadillo/inst/NEWS 2011-02-28 22:20:49 UTC (rev 2916)
@@ -3,6 +3,8 @@
o fastLm code simplified further by instantiating the Armadillo matrix
and vector directly from the SEXP coming from R
+ o inst/doc/Makefile now respects $R_HOME environment variable
+
0.2.13 2011-02-18
o Upgraded to Armadillo Version 1.1.4 “Manta Lodge”
Modified: pkg/RcppArmadillo/inst/doc/Makefile
===================================================================
--- pkg/RcppArmadillo/inst/doc/Makefile 2011-02-23 22:15:15 UTC (rev 2915)
+++ pkg/RcppArmadillo/inst/doc/Makefile 2011-02-28 22:20:49 UTC (rev 2916)
@@ -1,13 +1,20 @@
-all: clean RcppArmadillo-unitTests.pdf
+all: clean RcppArmadillo-unitTests.pdf
clean:
rm -f RcppArmadillo-unitTests.pdf
+setvars:
+ifeq (${R_HOME},)
+R_HOME= $(shell R RHOME)
+endif
+RPROG= $(R_HOME)/bin/R
+RSCRIPT=$(R_HOME)/bin/Rscript
+
RcppArmadillo-unitTests.pdf:
rm -fr unitTests-results/*
- Rscript unitTests/RcppArmadillo-unitTests.R
- R CMD Sweave RcppArmadillo-unitTests.Rnw
- Rscript -e "tools::texi2dvi( 'RcppArmadillo-unitTests.tex', pdf = TRUE, clean = TRUE )"
+ $(RSCRIPT) unitTests/RcppArmadillo-unitTests.R
+ $(RPROG) CMD Sweave RcppArmadillo-unitTests.Rnw
+ $(RSCRIPT) -e "tools::texi2dvi( 'RcppArmadillo-unitTests.tex', pdf = TRUE, clean = TRUE )"
rm -fr RcppArmadillo-unitTests.tex
Modified: pkg/RcppClassic/ChangeLog
===================================================================
--- pkg/RcppClassic/ChangeLog 2011-02-23 22:15:15 UTC (rev 2915)
+++ pkg/RcppClassic/ChangeLog 2011-02-28 22:20:49 UTC (rev 2916)
@@ -1,3 +1,7 @@
+2011-02-28 Dirk Eddelbuettel <edd at debian.org>
+
+ * inst/doc/Makefile: Call R and Rscript relative to R_HOME/bin
+
2010-12-19 Dirk Eddelbuettel <edd at debian.org>
* DESCRIPTION: Initial release 0.9.0
Modified: pkg/RcppClassic/inst/doc/Makefile
===================================================================
--- pkg/RcppClassic/inst/doc/Makefile 2011-02-23 22:15:15 UTC (rev 2915)
+++ pkg/RcppClassic/inst/doc/Makefile 2011-02-28 22:20:49 UTC (rev 2916)
@@ -15,22 +15,29 @@
clean:
@rm -f *.tex *.bbl *.blg *.aux *.out *.log
+setvars:
+ifeq (${R_HOME},)
+R_HOME= $(shell R RHOME)
+endif
+RPROG= $(R_HOME)/bin/R
+RSCRIPT=$(R_HOME)/bin/Rscript
+
RcppClassic-unitTests.pdf:
rm -fr unitTests-results/*
- Rscript --vanilla unitTests/RcppClassic-unitTests.R
- R CMD Sweave RcppClassic-unitTests.Rnw
- Rscript --vanilla -e "tools::texi2dvi( 'RcppClassic-unitTests.tex', pdf = TRUE, clean = TRUE )"
+ $(RSCRIPT) --vanilla unitTests/RcppClassic-unitTests.R
+ $(RPROG) CMD Sweave RcppClassic-unitTests.Rnw
+ $(RSCRIPT) --vanilla -e "tools::texi2dvi( 'RcppClassic-unitTests.tex', pdf = TRUE, clean = TRUE )"
rm -fr RcppClassic-unitTests.tex
RcppClassic.pdf: RcppClassic.Rnw
- R CMD Sweave RcppClassic.Rnw
+ $(RPROG) CMD Sweave RcppClassic.Rnw
ifneq (,$(findstring edd,$(whoami)))
pdflatex RcppClassic.tex
bibtex RcppClassic
pdflatex RcppClassic.tex
pdflatex RcppClassic.tex
else
- Rscript --vanilla -e "tools::texi2dvi( 'RcppClassic.tex', pdf = TRUE, clean = FALSE )"
+ $(RSCRIPT) --vanilla -e "tools::texi2dvi( 'RcppClassic.tex', pdf = TRUE, clean = FALSE )"
endif
rm -fr RcppClassic.tex
More information about the Rcpp-commits
mailing list