[Rcpp-commits] r1104 - in pkg: Rcpp/inst/skeleton Rcpp/inst/unitTests/RcppTestA/src Rcpp/inst/unitTests/RcppTestB/src RcppArmadillo/src RcppExamples RcppExamples/src

noreply at r-forge.r-project.org noreply at r-forge.r-project.org
Thu Apr 22 10:42:22 CEST 2010 

Author: romain
Date: 2010-04-22 10:42:22 +0200 (Thu, 22 Apr 2010)
New Revision: 1104

Modified:
   pkg/Rcpp/inst/skeleton/Makevars
   pkg/Rcpp/inst/skeleton/Makevars.win
   pkg/Rcpp/inst/unitTests/RcppTestA/src/Makevars
   pkg/Rcpp/inst/unitTests/RcppTestA/src/Makevars.win
   pkg/Rcpp/inst/unitTests/RcppTestB/src/Makevars
   pkg/Rcpp/inst/unitTests/RcppTestB/src/Makevars.win
   pkg/RcppArmadillo/src/Makevars
   pkg/RcppArmadillo/src/Makevars.win
   pkg/RcppExamples/DESCRIPTION
   pkg/RcppExamples/src/Makevars
   pkg/RcppExamples/src/Makevars.win
Log:
no --vanilla

Modified: pkg/Rcpp/inst/skeleton/Makevars
===================================================================
--- pkg/Rcpp/inst/skeleton/Makevars	2010-04-21 22:37:54 UTC (rev 1103)
+++ pkg/Rcpp/inst/skeleton/Makevars	2010-04-22 08:42:22 UTC (rev 1104)
@@ -1,11 +1,9 @@
 ## Use the R_HOME indirection to support installations of multiple R version
-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()" )
+PKG_LIBS = $(shell $(R_HOME)/bin/Rscript -e "Rcpp:::LdFlags()" )
 
 ## As an alternative, one can also add this code in a file 'configure'
 ##
-##    PKG_LIBS=`${R_HOME}/bin/Rscript --vanilla -e "Rcpp:::LdFlags()"`
+##    PKG_LIBS=`${R_HOME}/bin/Rscript -e "Rcpp:::LdFlags()"`
 ## 
 ##    sed -e "s|@PKG_LIBS@|${PKG_LIBS}|" \
 ##        src/Makevars.in > src/Makevars

Modified: pkg/Rcpp/inst/skeleton/Makevars.win
===================================================================
--- pkg/Rcpp/inst/skeleton/Makevars.win	2010-04-21 22:37:54 UTC (rev 1103)
+++ pkg/Rcpp/inst/skeleton/Makevars.win	2010-04-22 08:42:22 UTC (rev 1104)
@@ -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 = $(shell Rscript.exe --vanilla -e "Rcpp:::LdFlags()")
+PKG_LIBS = $(shell Rscript.exe -e "Rcpp:::LdFlags()")
 

Modified: pkg/Rcpp/inst/unitTests/RcppTestA/src/Makevars
===================================================================
--- pkg/Rcpp/inst/unitTests/RcppTestA/src/Makevars	2010-04-21 22:37:54 UTC (rev 1103)
+++ pkg/Rcpp/inst/unitTests/RcppTestA/src/Makevars	2010-04-22 08:42:22 UTC (rev 1104)
@@ -1,2 +1,2 @@
 ## Use the R_HOME indirection to support installations of multiple R version
-PKG_LIBS = $(shell $(R_HOME)/bin/Rscript --vanilla -e "Rcpp:::LdFlags()" )
+PKG_LIBS = $(shell $(R_HOME)/bin/Rscript -e "Rcpp:::LdFlags()" )

Modified: pkg/Rcpp/inst/unitTests/RcppTestA/src/Makevars.win
===================================================================
--- pkg/Rcpp/inst/unitTests/RcppTestA/src/Makevars.win	2010-04-21 22:37:54 UTC (rev 1103)
+++ pkg/Rcpp/inst/unitTests/RcppTestA/src/Makevars.win	2010-04-22 08:42:22 UTC (rev 1104)
@@ -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 = $(shell Rscript.exe --vanilla -e "Rcpp:::LdFlags()")
+PKG_LIBS = $(shell Rscript.exe -e "Rcpp:::LdFlags()")
 

Modified: pkg/Rcpp/inst/unitTests/RcppTestB/src/Makevars
===================================================================
--- pkg/Rcpp/inst/unitTests/RcppTestB/src/Makevars	2010-04-21 22:37:54 UTC (rev 1103)
+++ pkg/Rcpp/inst/unitTests/RcppTestB/src/Makevars	2010-04-22 08:42:22 UTC (rev 1104)
@@ -1,2 +1,2 @@
 ## Use the R_HOME indirection to support installations of multiple R version
-PKG_LIBS = `$(R_HOME)/bin/Rscript --vanilla -e "Rcpp:::LdFlags()"`
+PKG_LIBS = `$(R_HOME)/bin/Rscript -e "Rcpp:::LdFlags()"`

Modified: pkg/Rcpp/inst/unitTests/RcppTestB/src/Makevars.win
===================================================================
--- pkg/Rcpp/inst/unitTests/RcppTestB/src/Makevars.win	2010-04-21 22:37:54 UTC (rev 1103)
+++ pkg/Rcpp/inst/unitTests/RcppTestB/src/Makevars.win	2010-04-22 08:42:22 UTC (rev 1104)
@@ -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 = `Rscript.exe --vanilla -e "Rcpp:::LdFlags()"`
+PKG_LIBS = `Rscript.exe -e "Rcpp:::LdFlags()"`
 

Modified: pkg/RcppArmadillo/src/Makevars
===================================================================
--- pkg/RcppArmadillo/src/Makevars	2010-04-21 22:37:54 UTC (rev 1103)
+++ pkg/RcppArmadillo/src/Makevars	2010-04-22 08:42:22 UTC (rev 1104)
@@ -1,5 +1,5 @@
 ## -*- mode: makefile; -*-
 
-PKG_CXXFLAGS=$(shell Rscript -e "Rcpp:::CxxFlags()") -I. -I../inst/include
+PKG_CXXFLAGS=-I../inst/include
 PKG_LIBS=$(shell Rscript -e "Rcpp:::LdFlags()") $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS)
 

Modified: pkg/RcppArmadillo/src/Makevars.win
===================================================================
--- pkg/RcppArmadillo/src/Makevars.win	2010-04-21 22:37:54 UTC (rev 1103)
+++ pkg/RcppArmadillo/src/Makevars.win	2010-04-22 08:42:22 UTC (rev 1104)
@@ -1,9 +1,7 @@
 ## This assumes 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 = $(shell $(R_HOME)/bin/Rscript --vanilla -e 'Rcpp:::LdFlags()')
-PKG_CPPFLAGS = $(shell $(R_HOME)/bin/Rscript --vanilla -e 'Rcpp:::CxxFlags()')
+PKG_LIBS = $(shell $(R_HOME)/bin/Rscript -e 'Rcpp:::LdFlags()')
 
-INCLUDE_DIR=../inst/include
-PKG_CPPFLAGS += -I$(INCLUDE_DIR) -I.
-
+PKG_CPPFLAGS = -I../inst/include -I.
 PKG_LIBS += $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS)
+

Modified: pkg/RcppExamples/DESCRIPTION
===================================================================
--- pkg/RcppExamples/DESCRIPTION	2010-04-21 22:37:54 UTC (rev 1103)
+++ pkg/RcppExamples/DESCRIPTION	2010-04-22 08:42:22 UTC (rev 1104)
@@ -8,8 +8,9 @@
 Description: Examples for Seamless R and C++ integration
  The Rcpp package contains a C++ library that facilitates the integration of
  R and C++ in various ways. This package provides examples.
-Depends: R (>= 2.10.0), Rcpp (>= 0.7.8)
+Depends: R (>= 2.10.0), Rcpp (>= 0.7.11.6)
 Suggests: inline (>= 0.3.4), RUnit 
 SystemRequirements: None
+LinkingTo: Rcpp
 URL: http://dirk.eddelbuettel.com/code/rcpp.html, http://romainfrancois.blog.free.fr/index.php?category/R-package/Rcpp
 License: GPL (>= 2)

Modified: pkg/RcppExamples/src/Makevars
===================================================================
--- pkg/RcppExamples/src/Makevars	2010-04-21 22:37:54 UTC (rev 1103)
+++ pkg/RcppExamples/src/Makevars	2010-04-22 08:42:22 UTC (rev 1104)
@@ -1,8 +1,7 @@
 ## Emacs please make this a -*- mode: Makefile; -*-
 ##
 ## Use the R_HOME indirection to support installations of multiple R version
-PKG_CPPFLAGS = $(shell $(R_HOME)/bin/Rscript --vanilla -e "Rcpp:::CxxFlags()" )
-PKG_LIBS = $(shell $(R_HOME)/bin/Rscript --vanilla -e "Rcpp:::LdFlags()" )
+PKG_LIBS = $(shell $(R_HOME)/bin/Rscript -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-04-21 22:37:54 UTC (rev 1103)
+++ pkg/RcppExamples/src/Makevars.win	2010-04-22 08:42:22 UTC (rev 1104)
@@ -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 = $(shell $(R_HOME)/bin/Rscript --vanilla -e "Rcpp:::LdFlags()")
-PKG_CPPFLAGS = $(shell $(R_HOME)/bin/Rscript --vanilla -e "Rcpp:::CxxFlags()")
+PKG_LIBS = $(shell $(R_HOME)/bin/Rscript -e "Rcpp:::LdFlags()")
+

More information about the Rcpp-commits mailing list