[Rcpp-commits] r1293 - in pkg/Rcpp: inst/announce inst/skeleton inst/unitTests/RcppTestA/src inst/unitTests/RcppTestB/src man src

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

Author: romain
Date: 2010-05-20 15:04:30 +0200 (Thu, 20 May 2010)
New Revision: 1293

Modified:
   pkg/Rcpp/inst/announce/ANNOUNCE-0.8.0.txt
   pkg/Rcpp/inst/skeleton/Makevars.win
   pkg/Rcpp/inst/unitTests/RcppTestA/src/Makevars.win
   pkg/Rcpp/inst/unitTests/RcppTestB/src/Makevars.win
   pkg/Rcpp/man/Rcpp-package.Rd
   pkg/Rcpp/src/Makevars
   pkg/Rcpp/src/Makevars.win
Log:
propagate Brian Ripley advice about use of Rscript

Modified: pkg/Rcpp/inst/announce/ANNOUNCE-0.8.0.txt
===================================================================
--- pkg/Rcpp/inst/announce/ANNOUNCE-0.8.0.txt	2010-05-20 12:52:29 UTC (rev 1292)
+++ pkg/Rcpp/inst/announce/ANNOUNCE-0.8.0.txt	2010-05-20 13:04:30 UTC (rev 1293)
@@ -163,11 +163,11 @@
 - linking against the Rcpp dynamic or static library, which is achieved by 
   adding this line to the src/Makevars of the package:
   
-	PKG_LIBS = $(shell $(R_HOME)/bin/Rscript -e "Rcpp:::LdFlags()" )
+	PKG_LIBS = $(shell ${R_HOME}/bin/Rscript -e "Rcpp:::LdFlags()" )
 
   and this line to the src/Makevars.win file: 
   
-	PKG_LIBS = $(shell Rscript.exe -e "Rcpp:::LdFlags()")
+	PKG_LIBS = $(shell "${R_HOME}/bin${R_ARCH_BIN}/Rscript.exe" -e "Rcpp:::LdFlags()")
 
 Rcpp contains a function Rcpp.package.skeleton, modelled after
 package.skeleton from the utils package in base r, that creates a skeleton of

Modified: pkg/Rcpp/inst/skeleton/Makevars.win
===================================================================
--- pkg/Rcpp/inst/skeleton/Makevars.win	2010-05-20 12:52:29 UTC (rev 1292)
+++ pkg/Rcpp/inst/skeleton/Makevars.win	2010-05-20 13:04:30 UTC (rev 1293)
@@ -1,5 +1,4 @@
 
-## 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 -e "Rcpp:::LdFlags()")
+PKG_LIBS = $(shell "${R_HOME}/bin${R_ARCH_BIN}/Rscript.exe" -e "Rcpp:::LdFlags()")
 

Modified: pkg/Rcpp/inst/unitTests/RcppTestA/src/Makevars.win
===================================================================
--- pkg/Rcpp/inst/unitTests/RcppTestA/src/Makevars.win	2010-05-20 12:52:29 UTC (rev 1292)
+++ pkg/Rcpp/inst/unitTests/RcppTestA/src/Makevars.win	2010-05-20 13:04:30 UTC (rev 1293)
@@ -1,5 +1,4 @@
 
-## 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 -e "Rcpp:::LdFlags()")
+PKG_LIBS = $(shell "${R_HOME}/bin${R_ARCH_BIN}/Rscript.exe" -e "Rcpp:::LdFlags()")
 

Modified: pkg/Rcpp/inst/unitTests/RcppTestB/src/Makevars.win
===================================================================
--- pkg/Rcpp/inst/unitTests/RcppTestB/src/Makevars.win	2010-05-20 12:52:29 UTC (rev 1292)
+++ pkg/Rcpp/inst/unitTests/RcppTestB/src/Makevars.win	2010-05-20 13:04:30 UTC (rev 1293)
@@ -1,5 +1,4 @@
 
-## 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 -e "Rcpp:::LdFlags()"`
+PKG_LIBS = $(shell "${R_HOME}/bin${R_ARCH_BIN}/Rscript.exe" -e "Rcpp:::LdFlags()")
 

Modified: pkg/Rcpp/man/Rcpp-package.Rd
===================================================================
--- pkg/Rcpp/man/Rcpp-package.Rd	2010-05-20 12:52:29 UTC (rev 1292)
+++ pkg/Rcpp/man/Rcpp-package.Rd	2010-05-20 13:04:30 UTC (rev 1293)
@@ -66,10 +66,10 @@
 
   \preformatted{
 # compile flag providing header directory containing Rcpp.h
-PKG_CXXFLAGS=$(shell Rscript -e 'Rcpp:::CxxFlags()')
+PKG_CXXFLAGS=$(shell $(R_HOME)/bin/Rscript -e 'Rcpp:::CxxFlags()')
 
 # link flag providing library as well as path to library, and optionally rpath
-PKG_LIBS=$(shell Rscript -e 'Rcpp:::LdFlags()')
+PKG_LIBS=$(shell $(R_HOME)/bin/Rscript -e 'Rcpp:::LdFlags()')
 }
 
   Alternatively, one can also encode the test for these variables using

Modified: pkg/Rcpp/src/Makevars
===================================================================
--- pkg/Rcpp/src/Makevars	2010-05-20 12:52:29 UTC (rev 1292)
+++ pkg/Rcpp/src/Makevars	2010-05-20 13:04:30 UTC (rev 1293)
@@ -14,7 +14,7 @@
 ## - the environment variable RCPP_CXX0X is set to yes
 ## - it makes sense (GCC >= 4.3)
 ifeq ($(RCPP_CXX0X),yes)
-CLINK_CPPFLAGS = $(shell Rscript "cxx0x/cxx0x.R")
+CLINK_CPPFLAGS = $(shell $(R_HOME)/bin/Rscript "cxx0x/cxx0x.R")
 endif
 
 ifeq ($(SHLIB),)

Modified: pkg/Rcpp/src/Makevars.win
===================================================================
--- pkg/Rcpp/src/Makevars.win	2010-05-20 12:52:29 UTC (rev 1292)
+++ pkg/Rcpp/src/Makevars.win	2010-05-20 13:04:30 UTC (rev 1293)
@@ -21,7 +21,7 @@
 ## - the RCPP_CXX0X environment variable is set to "yes"
 ## - it is possible (GCC>=4.3)
 ifeq ($(RCPP_CXX0X),yes)
-CLINK_CPPFLAGS := $shell(Rscript.exe cxx0x/cxx0x.R)
+CLINK_CPPFLAGS := $shell("${R_HOME}/bin${R_ARCH_BIN}/Rscript.exe" cxx0x/cxx0x.R)
 endif
 
 ## the 'package' library contains both Rcpp.{cpp,h} and the RcppExample used to demonstrate the package