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

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

Author: jjallaire
Date: 2013-10-17 16:47:18 +0200 (Thu, 17 Oct 2013)
New Revision: 4577

Modified:
   pkg/Rcpp/ChangeLog
   pkg/Rcpp/R/Attributes.R
   pkg/Rcpp/inst/NEWS.Rd
Log:
sourceCpp now correctly binds to Rtools 3.0 and 3.1

Modified: pkg/Rcpp/ChangeLog
===================================================================
--- pkg/Rcpp/ChangeLog	2013-10-16 21:20:08 UTC (rev 4576)
+++ pkg/Rcpp/ChangeLog	2013-10-17 14:47:18 UTC (rev 4577)
@@ -1,3 +1,7 @@
+2013-10-17  JJ Allaire <jj at rstudio.org>
+
+        * R/Attributes.R: sourceCpp now correctly binds to Rtools 3.0 and 3.1
+
 2013-10-16  Dirk Eddelbuettel  <edd at debian.org>
 
 	* R/Rcpp.package.skeleton.R (Rcpp.package.skeleton): Deprecate

Modified: pkg/Rcpp/R/Attributes.R
===================================================================
--- pkg/Rcpp/R/Attributes.R	2013-10-16 21:20:08 UTC (rev 4576)
+++ pkg/Rcpp/R/Attributes.R	2013-10-17 14:47:18 UTC (rev 4577)
@@ -653,7 +653,8 @@
 
             # Check version -- we only support 2.15 and 2.16 right now
             ver <- key$`Current Version`
-            if (identical("2.15", ver) || identical("2.16", ver)) {
+            if (identical("2.15", ver) || identical("2.16", ver) ||
+                identical("3.0", ver) || identical("3.1", ver)) {
 
                 # See if the InstallPath leads to the expected directories
                 rToolsPath <- key$`InstallPath`

Modified: pkg/Rcpp/inst/NEWS.Rd
===================================================================
--- pkg/Rcpp/inst/NEWS.Rd	2013-10-16 21:20:08 UTC (rev 4576)
+++ pkg/Rcpp/inst/NEWS.Rd	2013-10-17 14:47:18 UTC (rev 4577)
@@ -28,6 +28,10 @@
       \item Raise requirement for R itself to be version 3.0.0 or later
       as needed by the vignette processing
     }
+    \item Changes in Rcpp attributes: 
+    \itemize{
+      \item \code{sourceCpp} now correctly binds to Rtools 3.0 and 3.1
+    }
   }
 }