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

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

Author: romain
Date: 2010-09-14 10:10:41 +0200 (Tue, 14 Sep 2010)
New Revision: 2102

Modified:
   pkg/Rcpp/DESCRIPTION
   pkg/Rcpp/R/zzz.R
   pkg/Rcpp/inst/ChangeLog
Log:
added R svn version requirement check (for the interim perdiod only)

Modified: pkg/Rcpp/DESCRIPTION
===================================================================
--- pkg/Rcpp/DESCRIPTION	2010-09-12 15:19:06 UTC (rev 2101)
+++ pkg/Rcpp/DESCRIPTION	2010-09-14 08:10:41 UTC (rev 2102)
@@ -1,6 +1,6 @@
 Package: Rcpp
 Title: Seamless R and C++ Integration
-Version: 0.8.6.1
+Version: 0.8.6.2
 Date: $Date$
 Author: Dirk Eddelbuettel and Romain Francois, with contributions 
  by Simon Urbanek, David Reiss and Douglas Bates; based on code written during 
@@ -34,9 +34,9 @@
  Several examples are included, and 773 unit tests in 366 unit test functions
  provide additional usage examples.
 Depends: R (>= 2.12.0), methods
-Suggests: RUnit, inline, highlight, rbenchmark
+Suggests: RUnit, inline, rbenchmark
 URL: http://dirk.eddelbuettel.com/code/rcpp.html, http://romainfrancois.blog.free.fr/index.php?category/R-package/Rcpp
 License: GPL (>= 2)
 BugReports: http://r-forge.r-project.org/tracker/?atid=637&group_id=155&func=browse
 MailingList: Please send questions and comments regarding Rcpp to rcpp-devel at lists.r-forge.r-project.org
-
+MinimumSvnRev: 52905

Modified: pkg/Rcpp/R/zzz.R
===================================================================
--- pkg/Rcpp/R/zzz.R	2010-09-12 15:19:06 UTC (rev 2101)
+++ pkg/Rcpp/R/zzz.R	2010-09-14 08:10:41 UTC (rev 2102)
@@ -17,5 +17,10 @@
 
 .onLoad <- function(libname, pkgname){
 	install_help_workaround()
+	
+	minimum_svn_rev <- as.integer( packageDescription( pkgname )[["MinimumSvnRev"]] )
+	if( minimum_svn_rev < R.version[["svn rev"]] ){
+		packageStartupMessage("R version too old for full use of reference methods" )
+	}
 }
 

Modified: pkg/Rcpp/inst/ChangeLog
===================================================================
--- pkg/Rcpp/inst/ChangeLog	2010-09-12 15:19:06 UTC (rev 2101)
+++ pkg/Rcpp/inst/ChangeLog	2010-09-14 08:10:41 UTC (rev 2102)
@@ -1,3 +1,12 @@
+2010-09-15  Romain Francois <romain at r-enthusiasts.com>
+
+    * DESCRIPTION: added the declaration MinimumSvnRev to control which version
+    of R-devel we need so that Rcpp fully works, currently set to 52905
+    
+    * R/zzz.R: check the svn revision of R against the declared MinimumSvnRev
+    requirement and print a message if necessary (this will only stay for the 
+    interim period while we develop 0.8.7 so that we all are on the same page.
+
 2010-09-11  Dirk Eddelbuettel  <edd at debian.org>
 
 	* src/Date.cpp: Add include of unistd.h to make Solaris happy