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

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

Author: edd
Date: 2010-03-15 20:12:55 +0100 (Mon, 15 Mar 2010)
New Revision: 906

Modified:
   pkg/Rcpp/NEWS
   pkg/Rcpp/R/RcppLdpath.R
   pkg/Rcpp/inst/ChangeLog
Log:
now using shQuote() on Windows to protect pathnames with spaces


Modified: pkg/Rcpp/NEWS
===================================================================
--- pkg/Rcpp/NEWS	2010-03-15 18:46:38 UTC (rev 905)
+++ pkg/Rcpp/NEWS	2010-03-15 19:12:55 UTC (rev 906)
@@ -8,7 +8,7 @@
 	Pairlist constructor has been updated to 20 (was 5) and a script has been
 	added to the source tree should we want to change it again
 
-    o   use shortPathName() to protect Windows paths with spaces 
+    o   use shQuotes() to protect Windows path names (which may contain spaces)
 
 0.7.9   2010-03-12
 

Modified: pkg/Rcpp/R/RcppLdpath.R
===================================================================
--- pkg/Rcpp/R/RcppLdpath.R	2010-03-15 18:46:38 UTC (rev 905)
+++ pkg/Rcpp/R/RcppLdpath.R	2010-03-15 19:12:55 UTC (rev 906)
@@ -22,7 +22,7 @@
     if (static) {                               # static is default on Windows and OS X
         flags <- paste(rcppdir, "/libRcpp.a", sep="")
         if (.Platform$OS.type=="windows") {
-            flags <- shortPathName(flags)
+            flags <- shQuote(flags)
         }
     } else {					# else for dynamic linking
         flags <- paste("-L", rcppdir, " -lRcpp", sep="") # baseline setting
@@ -41,7 +41,7 @@
 RcppCxxFlags <- function(cxx0x=FALSE) {
     path <- RcppLdPath()
     if (.Platform$OS.type=="windows") {
-        path <- shortPathName(path)
+        path <- shQuote(path)
     }
     paste("-I", path, if( cxx0x && canUseCXX0X() ) " -std=c++0x" else "", sep="")
 }

Modified: pkg/Rcpp/inst/ChangeLog
===================================================================
--- pkg/Rcpp/inst/ChangeLog	2010-03-15 18:46:38 UTC (rev 905)
+++ pkg/Rcpp/inst/ChangeLog	2010-03-15 19:12:55 UTC (rev 906)
@@ -1,6 +1,6 @@
 2010-03-15  Dirk Eddelbuettel  <edd at debian.org>
 
-	* RcppLdpath.R: Use shortPathName() to protect spaces in Windows pathnames
+	* RcppLdpath.R: Use shQuote() to protect spaces in Windows pathnames
 
 2010-03-15  Romain Francois <romain at r-enthusiasts.com>