[Rcpp-commits] r871 - in pkg/Rcpp: . R inst

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

Author: edd
Date: 2010-03-10 23:21:39 +0100 (Wed, 10 Mar 2010)
New Revision: 871

Modified:
   pkg/Rcpp/DESCRIPTION
   pkg/Rcpp/NEWS
   pkg/Rcpp/R/RcppLdpath.R
   pkg/Rcpp/inst/ChangeLog
Log:
move the quote protection (for paths on Windows) down to functions using the path


Modified: pkg/Rcpp/DESCRIPTION
===================================================================
--- pkg/Rcpp/DESCRIPTION	2010-03-10 01:59:19 UTC (rev 870)
+++ pkg/Rcpp/DESCRIPTION	2010-03-10 22:21:39 UTC (rev 871)
@@ -1,6 +1,6 @@
 Package: Rcpp
 Title: Rcpp R/C++ interface package
-Version: 0.7.8
+Version: 0.7.8.1
 Date: $Date$
 Author: Dirk Eddelbuettel and Romain Francois, with contributions 
  by Simon Urbanek and David Reiss; based on code written during 

Modified: pkg/Rcpp/NEWS
===================================================================
--- pkg/Rcpp/NEWS	2010-03-10 01:59:19 UTC (rev 870)
+++ pkg/Rcpp/NEWS	2010-03-10 22:21:39 UTC (rev 871)
@@ -1,3 +1,7 @@
+0.7.9   (under development)
+
+    o	Another small improvement to Windows build flags
+
 0.7.8   2010-03-09
 
     o	All vector classes are now generated from the same template class

Modified: pkg/Rcpp/R/RcppLdpath.R
===================================================================
--- pkg/Rcpp/R/RcppLdpath.R	2010-03-10 01:59:19 UTC (rev 870)
+++ pkg/Rcpp/R/RcppLdpath.R	2010-03-10 22:21:39 UTC (rev 871)
@@ -7,9 +7,6 @@
     } else {
         path <- system.file("lib",package="Rcpp")
     }
-    if (.Platform$OS.type=="windows") {
-        path <- paste('"', path, '"', sep="")
-    }
     path
 }
 
@@ -24,6 +21,9 @@
     rcppdir <- RcppLdPath()
     if (static) {                               # static is default on Windows and OS X
         flags <- paste(rcppdir, "/libRcpp.a", sep="")
+        if (.Platform$OS.type=="windows") {
+            flags <- paste('"', flags, '"', sep="")
+        }
     } else {					# else for dynamic linking
         flags <- paste("-L", rcppdir, " -lRcpp", sep="") # baseline setting
         if ((.Platform$OS.type == "unix") &&    # on Linux, we can use rpath to encode path
@@ -39,7 +39,11 @@
 
 ## Provide compiler flags -- i.e. -I/path/to/Rcpp.h
 RcppCxxFlags <- function(cxx0x=FALSE) {
-    paste("-I", RcppLdPath(), if( cxx0x && canUseCXX0X() ) " -std=c++0x" else "", sep="")
+    path <- RcppLdPath()
+    if (.Platform$OS.type=="windows") {
+        path <- paste('"', path, '"', sep="")
+    }
+    paste("-I", path, if( cxx0x && canUseCXX0X() ) " -std=c++0x" else "", sep="")
 }
 
 ## Shorter names, and call cat() directly

Modified: pkg/Rcpp/inst/ChangeLog
===================================================================
--- pkg/Rcpp/inst/ChangeLog	2010-03-10 01:59:19 UTC (rev 870)
+++ pkg/Rcpp/inst/ChangeLog	2010-03-10 22:21:39 UTC (rev 871)
@@ -1,3 +1,7 @@
+2010-03-10  Dirk Eddelbuettel  <edd at debian.org>
+
+	* R/RcppLdPath.R: Be more specific about quote-protection of path on Windows
+
 2010-03-09  Dirk Eddelbuettel  <edd at debian.org>
 
 	* DESCRIPTION: Release 0.7.8