[Rcpp-commits] r720 - in pkg: Rcpp/inst/skeleton RcppArmadillo/src RcppExamples/src

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

Author: romain
Date: 2010-02-17 12:59:01 +0100 (Wed, 17 Feb 2010)
New Revision: 720

Modified:
   pkg/Rcpp/inst/skeleton/Makevars
   pkg/Rcpp/inst/skeleton/Makevars.win
   pkg/RcppArmadillo/src/Makevars
   pkg/RcppArmadillo/src/Makevars.win
   pkg/RcppExamples/src/Makevars
   pkg/RcppExamples/src/Makevars.win
Log:
added --vanilla when using Rscript

Modified: pkg/Rcpp/inst/skeleton/Makevars
===================================================================
--- pkg/Rcpp/inst/skeleton/Makevars	2010-02-17 11:17:32 UTC (rev 719)
+++ pkg/Rcpp/inst/skeleton/Makevars	2010-02-17 11:59:01 UTC (rev 720)
@@ -1,13 +1,13 @@
 ## Use the R_HOME indirection to support installations of multiple R version
-PKG_CPPFLAGS=$(shell $(R_HOME)/bin/Rscript -e "Rcpp:::CxxFlags()" )
-PKG_LIBS = $(shell $(R_HOME)/bin/Rscript -e "Rcpp:::LdFlags()" )
+PKG_CPPFLAGS=$(shell $(R_HOME)/bin/Rscript --vanilla -e "Rcpp:::CxxFlags()" )
+PKG_LIBS = $(shell $(R_HOME)/bin/Rscript --vanilla -e "Rcpp:::LdFlags()" )
 ## Uncomment this if you want to use C++0x features -- which are not currently portable
 ## CLINK_CPPFLAGS=$(shell Rscript -e "Rcpp:::Cxx0xFlags()" )
 
 ## As an alternative, one can also add this code in a file 'configure'
 ##
-##    PKG_CPPFLAGS=`${R_HOME}/bin/Rscript -e "Rcpp:::CxxFlags()"`
-##    PKG_LIBS=`${R_HOME}/bin/Rscript -e "Rcpp:::LdFlags()"`
+##    PKG_CPPFLAGS=`${R_HOME}/bin/Rscript --vanilla -e "Rcpp:::CxxFlags()"`
+##    PKG_LIBS=`${R_HOME}/bin/Rscript --vanilla -e "Rcpp:::LdFlags()"`
 ## 
 ##    sed -e "s|@PKG_LIBS@|${PKG_LIBS}|" \
 ##        -e "s|@PKG_CPPFLAGS@|${PKG_CPPFLAGS}|" \

Modified: pkg/Rcpp/inst/skeleton/Makevars.win
===================================================================
--- pkg/Rcpp/inst/skeleton/Makevars.win	2010-02-17 11:17:32 UTC (rev 719)
+++ pkg/Rcpp/inst/skeleton/Makevars.win	2010-02-17 11:59:01 UTC (rev 720)
@@ -1,5 +1,5 @@
 
 ## This assume that we can call Rscript to ask Rcpp about its locations
 ## Use the R_HOME indirection to support installations of multiple R version
-PKG_LIBS = `$(R_HOME)/bin/Rscript -e 'Rcpp:::LdFlags()'`
-PKG_CPPFLAGS = `$(R_HOME)/bin/Rscript -e 'Rcpp:::CxxFlags()'`
+PKG_LIBS = `$(R_HOME)/bin/Rscript --vanilla -e 'Rcpp:::LdFlags()'`
+PKG_CPPFLAGS = `$(R_HOME)/bin/Rscript --vanilla -e 'Rcpp:::CxxFlags()'`

Modified: pkg/RcppArmadillo/src/Makevars
===================================================================
--- pkg/RcppArmadillo/src/Makevars	2010-02-17 11:17:32 UTC (rev 719)
+++ pkg/RcppArmadillo/src/Makevars	2010-02-17 11:59:01 UTC (rev 720)
@@ -1,6 +1,6 @@
 ## Use the R_HOME indirection to support installations of multiple R version
-PKG_CPPFLAGS=$(shell $(R_HOME)/bin/Rscript -e "Rcpp:::CxxFlags()" )
-PKG_LIBS = $(shell $(R_HOME)/bin/Rscript -e "Rcpp:::LdFlags()" )
+PKG_CPPFLAGS=$(shell $(R_HOME)/bin/Rscript --vanilla -e "Rcpp:::CxxFlags()" )
+PKG_LIBS = $(shell $(R_HOME)/bin/Rscript --vanilla -e "Rcpp:::LdFlags()" )
 
 INCLUDE_DIR=../inst/include
 

Modified: pkg/RcppArmadillo/src/Makevars.win
===================================================================
--- pkg/RcppArmadillo/src/Makevars.win	2010-02-17 11:17:32 UTC (rev 719)
+++ pkg/RcppArmadillo/src/Makevars.win	2010-02-17 11:59:01 UTC (rev 720)
@@ -1,8 +1,8 @@
 
 ## This assume that we can call Rscript to ask Rcpp about its locations
 ## Use the R_HOME indirection to support installations of multiple R version
-PKG_LIBS = `$(R_HOME)/bin/Rscript -e 'Rcpp:::LdFlags()'`
-PKG_CPPFLAGS = `$(R_HOME)/bin/Rscript -e 'Rcpp:::CxxFlags()'`
+PKG_LIBS = `$(R_HOME)/bin/Rscript --vanilla -e 'Rcpp:::LdFlags()'`
+PKG_CPPFLAGS = `$(R_HOME)/bin/Rscript --vanilla -e 'Rcpp:::CxxFlags()'`
 
 INCLUDE_DIR=../inst/include
 

Modified: pkg/RcppExamples/src/Makevars
===================================================================
--- pkg/RcppExamples/src/Makevars	2010-02-17 11:17:32 UTC (rev 719)
+++ pkg/RcppExamples/src/Makevars	2010-02-17 11:59:01 UTC (rev 720)
@@ -1,6 +1,6 @@
 ## Use the R_HOME indirection to support installations of multiple R version
-PKG_CPPFLAGS=$(shell $(R_HOME)/bin/Rscript -e "Rcpp:::CxxFlags()" )
-PKG_LIBS = $(shell $(R_HOME)/bin/Rscript -e "Rcpp:::LdFlags()" )
+PKG_CPPFLAGS=$(shell $(R_HOME)/bin/Rscript --vanilla -e "Rcpp:::CxxFlags()" )
+PKG_LIBS = $(shell $(R_HOME)/bin/Rscript --vanilla -e "Rcpp:::LdFlags()" )
 ## Uncomment this if you want to use C++0x features -- which are not currently portable
 ## CLINK_CPPFLAGS=$(shell Rscript -e "Rcpp:::Cxx0xFlags()" )
 

Modified: pkg/RcppExamples/src/Makevars.win
===================================================================
--- pkg/RcppExamples/src/Makevars.win	2010-02-17 11:17:32 UTC (rev 719)
+++ pkg/RcppExamples/src/Makevars.win	2010-02-17 11:59:01 UTC (rev 720)
@@ -1,5 +1,5 @@
 
 ## This assume that we can call Rscript to ask Rcpp about its locations
 ## Use the R_HOME indirection to support installations of multiple R version
-PKG_LIBS = `$(R_HOME)/bin/Rscript -e 'Rcpp:::LdFlags()'`
-PKG_CPPFLAGS = `$(R_HOME)/bin/Rscript -e 'Rcpp:::CxxFlags()'`
+PKG_LIBS = `$(R_HOME)/bin/Rscript --vanilla -e 'Rcpp:::LdFlags()'`
+PKG_CPPFLAGS = `$(R_HOME)/bin/Rscript --vanilla -e 'Rcpp:::CxxFlags()'`