Merge pull request #274 from RcppCore/feature/rtools-33

Use Rtools 3.3 for compilation under R 3.2

Author: eddelbuettel

ChangeLog

@@ -1,3 +1,7 @@
+2015-03-11  JJ Allaire  <[email protected]>
+
+        * R/Attributes.R:  Rtools 3.3 is now located and used for compilation under R 3.2.
+
 2015-03-04  Dirk Eddelbuettel  <[email protected]>
 
         * DESCRIPTION: Release 0.11.5

R/Attributes.R

@@ -656,9 +656,9 @@ sourceCppFunction <- function(func, isVoid, dll, symbol) {
     # (don't do this for RStudio since it has it's own handling)
     if (identical(Sys.info()[['sysname']], "Windows") &&
         !nzchar(Sys.getenv("RSTUDIO"))) {
-        path <- .pathWithRtools()
-        if (!is.null(path))
-            buildEnv$PATH <- path
+        env <- .environmentWithRtools()
+        for (var in names(env))
+            buildEnv[[var]] <- env[[var]]
     }
 
     # create restore list
@@ -676,7 +676,7 @@ sourceCppFunction <- function(func, isVoid, dll, symbol) {
 
 # If we don't have the GNU toolchain already on the path then see if
 # we can find Rtools and add it to the path
-.pathWithRtools <- function() {
+.environmentWithRtools <- function() {
 
     # Only proceed if we don't have the required tools on the path
     hasRtools <- nzchar(Sys.which("ls.exe")) && nzchar(Sys.which("gcc.exe"))
@@ -691,24 +691,28 @@ sourceCppFunction <- function(func, isVoid, dll, symbol) {
         # If we found the key examine it
         if (!is.null(key)) {
 
-            # Check version -- we only support 2.15 and 2.16 right now
+            # Check version
             ver <- key$`Current Version`
-            if (identical("2.15", ver) || identical("2.16", ver) ||
-                identical("3.0", ver) || identical("3.1", ver) ||
-                identical("3.2", ver)) {
-
+            if (ver %in% (c("2.15", "2.16", "3.0", "3.1", "3.2", "3.3"))) {
                 # See if the InstallPath leads to the expected directories
+                isGcc49 <- ver %in% c("3.3")
                 rToolsPath <- key$`InstallPath`
                 if (!is.null(rToolsPath)) {
-
-                    # Return modified PATH if execpted directories exist
-                    binPath <- file.path(rToolsPath, "bin", fsep="\\")
-                    gccPath <- file.path(rToolsPath, "gcc-4.6.3", "bin", fsep="\\")
-                    if (file.exists(binPath) && file.exists(gccPath))
-                        return(paste(binPath,
-                                     gccPath,
-                                     Sys.getenv("PATH"),
-                                     sep=.Platform$path.sep))
+                    # add appropriate path entries
+                    path <- file.path(rToolsPath, "bin", fsep="\\")
+                    if (!isGcc49)
+                        path <- c(path, file.path(rToolsPath, "gcc-4.6.3", "bin", fsep="\\"))
+                    
+                    # if they all exist then return a list with modified
+                    # environment variables for the compilation
+                    if (all(file.exists(path))) {
+                        env <- list()
+                        path <- paste(path, collapse = .Platform$path.sep)
+                        env$PATH <- paste(path, Sys.getenv("PATH"), sep=.Platform$path.sep)
+                        if (isGcc49)
+                            env$RTOOLS <- .rtoolsPath(rToolsPath)
+                        return(env)
+                    }
                 }
             }
         }
@@ -718,6 +722,17 @@ sourceCppFunction <- function(func, isVoid, dll, symbol) {
 }
 
 
+# Ensure that the path is suitable for passing as an RTOOLS 
+# environment variable
+.rtoolsPath <- function(path) {
+    path <- gsub("\\\\", "/", path)
+    path <- trimws(path)
+    if (substring(path, nchar(path)) != "/")
+        path <- paste(path, "/", sep="")
+    path
+}
+
+
 # Build CLINK_CPPFLAGS from include directories of LinkingTo packages
 .buildClinkCppFlags <- function(linkingToPackages) {
     pkgCxxFlags <- NULL

inst/NEWS.Rd

@@ -2,6 +2,16 @@
 \title{News for Package 'Rcpp'}
 \newcommand{\cpkg}{\href{http://CRAN.R-project.org/package=#1}{\pkg{#1}}}
 
+\section{Changes in Rcpp version 0.11.6 (Unreleased)}{
+  \itemize{
+    \item Changes in Rcpp Attributes:
+    \itemize{
+        \item Rtools 3.3 is now located and used for compilation under
+        R 3.2.
+    }
+  }
+}
+
 \section{Changes in Rcpp version 0.11.5 (2015-03-04)}{
   \itemize{
     \item Changes in Rcpp API: