[Rcpp-commits] r2693 - in pkg/RcppExamples: . src

noreply at r-forge.r-project.org noreply at r-forge.r-project.org
Fri Dec 3 11:22:59 CET 2010 

Author: romain
Date: 2010-12-03 11:22:58 +0100 (Fri, 03 Dec 2010)
New Revision: 2693

Modified:
   pkg/RcppExamples/ChangeLog
   pkg/RcppExamples/DESCRIPTION
   pkg/RcppExamples/NEWS
   pkg/RcppExamples/src/Makevars
   pkg/RcppExamples/src/Makevars.win
   pkg/RcppExamples/src/RcppDateExample.cpp
   pkg/RcppExamples/src/RcppExample.cpp
   pkg/RcppExamples/src/RcppMatrixExample.cpp
   pkg/RcppExamples/src/RcppParamsExample.cpp
   pkg/RcppExamples/src/RcppStringVectorExample.cpp
   pkg/RcppExamples/src/RcppVectorExample.cpp
Log:
using RcppClassic so that we can still show the examples of the classic api

Modified: pkg/RcppExamples/ChangeLog
===================================================================
--- pkg/RcppExamples/ChangeLog	2010-12-03 08:42:54 UTC (rev 2692)
+++ pkg/RcppExamples/ChangeLog	2010-12-03 10:22:58 UTC (rev 2693)
@@ -1,3 +1,13 @@
+2010-12-03  Romain Francois <romain at r-enthusiasts.com>
+
+    * DESCRIPTION: depending on RcppClassic
+    
+    * src/*.cpp: using include <RcppClassic.h>
+    
+    * src/Makevars: link against the RcppClassic library
+    
+    * src/Makevars.win : link against the RcppClassic library
+
 2010-11-19  Dirk Eddelbuettel  <edd at debian.org>
 
 	* inst/ChangeLog: moved to top-level enabling 'C-x 4 a' lookups

Modified: pkg/RcppExamples/DESCRIPTION
===================================================================
--- pkg/RcppExamples/DESCRIPTION	2010-12-03 08:42:54 UTC (rev 2692)
+++ pkg/RcppExamples/DESCRIPTION	2010-12-03 10:22:58 UTC (rev 2693)
@@ -1,6 +1,6 @@
 Package: RcppExamples
 Title: Examples using Rcpp to interface R and C++ 
-Version: 0.1.1.2
+Version: 0.1.1.3
 Date: $Date$
 Author: Dirk Eddelbuettel and Romain Francois, based on code written 
  during 2005 and 2006 by Dominick Samperi 
@@ -11,8 +11,8 @@
  .
  Note that the documentation in this package currently does not all the
  features in the package.
-Depends: R (>= 2.11.0), Rcpp (>= 0.8.4)
-LinkingTo: Rcpp
+Depends: R (>= 2.11.0), Rcpp (>= 0.8.9.4), RcppClassic
+LinkingTo: RcppClassic, Rcpp
 Suggests: RUnit 
 URL: http://dirk.eddelbuettel.com/code/rcpp.html, http://romainfrancois.blog.free.fr/index.php?category/R-package/Rcpp
 License: GPL (>= 2)

Modified: pkg/RcppExamples/NEWS
===================================================================
--- pkg/RcppExamples/NEWS	2010-12-03 08:42:54 UTC (rev 2692)
+++ pkg/RcppExamples/NEWS	2010-12-03 10:22:58 UTC (rev 2693)
@@ -2,6 +2,9 @@
 
     o	Updated src/Makevars
     
+    o   Now depends also on RcppClassic so that we can keep continue to show
+        examples using the classic API
+    
 0.1.1   2010-07-29
 
     o	Minor update, no new examples or documentation added yet

Modified: pkg/RcppExamples/src/Makevars
===================================================================
--- pkg/RcppExamples/src/Makevars	2010-12-03 08:42:54 UTC (rev 2692)
+++ pkg/RcppExamples/src/Makevars	2010-12-03 10:22:58 UTC (rev 2693)
@@ -1,5 +1,5 @@
 ## Emacs please make this a -*- mode: Makefile; -*-
 ##
 ## Use the R_HOME indirection to support installations of multiple R version
-PKG_LIBS = `$(R_HOME)/bin/Rscript -e "Rcpp:::LdFlags()" `
+PKG_LIBS = `$(R_HOME)/bin/Rscript -e "Rcpp:::LdFlags()" ` `$(R_HOME)/bin/Rscript -e "RcppClassic:::LdFlags()" `
 

Modified: pkg/RcppExamples/src/Makevars.win
===================================================================
--- pkg/RcppExamples/src/Makevars.win	2010-12-03 08:42:54 UTC (rev 2692)
+++ pkg/RcppExamples/src/Makevars.win	2010-12-03 10:22:58 UTC (rev 2693)
@@ -2,4 +2,5 @@
 ## This assume that we can call Rscript to ask Rcpp about its locations
 ## Use the R_HOME indirection to support installations of multiple R version
 PKG_LIBS = $(shell "${R_HOME}/bin${R_ARCH_BIN}/Rscript.exe" -e "Rcpp:::LdFlags()")
+PKG_LIBS += $(shell "${R_HOME}/bin${R_ARCH_BIN}/Rscript.exe" -e "RcppClassic:::LdFlags()")
 

Modified: pkg/RcppExamples/src/RcppDateExample.cpp
===================================================================
--- pkg/RcppExamples/src/RcppDateExample.cpp	2010-12-03 08:42:54 UTC (rev 2692)
+++ pkg/RcppExamples/src/RcppDateExample.cpp	2010-12-03 10:22:58 UTC (rev 2693)
@@ -21,7 +21,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Rcpp.  If not, see <http://www.gnu.org/licenses/>.
 
-#include <Rcpp.h>
+#include <RcppClassic.h>
 
 RcppExport SEXP RcppDateExample(SEXP dvsexp, SEXP dtvsexp) {
 

Modified: pkg/RcppExamples/src/RcppExample.cpp
===================================================================
--- pkg/RcppExamples/src/RcppExample.cpp	2010-12-03 08:42:54 UTC (rev 2692)
+++ pkg/RcppExamples/src/RcppExample.cpp	2010-12-03 10:22:58 UTC (rev 2693)
@@ -20,7 +20,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Rcpp.  If not, see <http://www.gnu.org/licenses/>.
 
-#include <Rcpp.h>
+#include <RcppClassic.h>
 
 /*
  * The following class definitions employ advanced features of the Rcpp

Modified: pkg/RcppExamples/src/RcppMatrixExample.cpp
===================================================================
--- pkg/RcppExamples/src/RcppMatrixExample.cpp	2010-12-03 08:42:54 UTC (rev 2692)
+++ pkg/RcppExamples/src/RcppMatrixExample.cpp	2010-12-03 10:22:58 UTC (rev 2693)
@@ -21,7 +21,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Rcpp.  If not, see <http://www.gnu.org/licenses/>.
 
-#include <Rcpp.h>
+#include <RcppClassic.h>
 #include <cmath>
 
 /* suncc needs help to disambiguate between sqrt( float ) and sqrt(double) */

Modified: pkg/RcppExamples/src/RcppParamsExample.cpp
===================================================================
--- pkg/RcppExamples/src/RcppParamsExample.cpp	2010-12-03 08:42:54 UTC (rev 2692)
+++ pkg/RcppExamples/src/RcppParamsExample.cpp	2010-12-03 10:22:58 UTC (rev 2693)
@@ -21,7 +21,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Rcpp.  If not, see <http://www.gnu.org/licenses/>.
 
-#include <Rcpp.h>
+#include <RcppClassic.h>
 
 RcppExport SEXP RcppParamsExample(SEXP params) {
 

Modified: pkg/RcppExamples/src/RcppStringVectorExample.cpp
===================================================================
--- pkg/RcppExamples/src/RcppStringVectorExample.cpp	2010-12-03 08:42:54 UTC (rev 2692)
+++ pkg/RcppExamples/src/RcppStringVectorExample.cpp	2010-12-03 10:22:58 UTC (rev 2693)
@@ -21,7 +21,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Rcpp.  If not, see <http://www.gnu.org/licenses/>.
 
-#include <Rcpp.h>
+#include <RcppClassic.h>
 
 RcppExport SEXP newRcppStringVectorExample(SEXP strvec) {
 BEGIN_RCPP

Modified: pkg/RcppExamples/src/RcppVectorExample.cpp
===================================================================
--- pkg/RcppExamples/src/RcppVectorExample.cpp	2010-12-03 08:42:54 UTC (rev 2692)
+++ pkg/RcppExamples/src/RcppVectorExample.cpp	2010-12-03 10:22:58 UTC (rev 2693)
@@ -21,7 +21,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Rcpp.  If not, see <http://www.gnu.org/licenses/>.
 
-#include <Rcpp.h>
+#include <RcppClassic.h>
 #include <cmath>
 
 RcppExport SEXP newRcppVectorExample(SEXP vector) {

More information about the Rcpp-commits mailing list