[Rcpp-commits] r1025 - in pkg/Rcpp: R inst/skeleton man

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

Author: romain
Date: 2010-04-07 10:39:33 +0200 (Wed, 07 Apr 2010)
New Revision: 1025

Modified:
   pkg/Rcpp/R/Rcpp.package.skeleton.R
   pkg/Rcpp/inst/skeleton/Makevars
   pkg/Rcpp/inst/skeleton/Makevars.win
   pkg/Rcpp/man/Rcpp.package.skeleton.Rd
Log:
update Rcpp.package.skeleton to use LinkingTo

Modified: pkg/Rcpp/R/Rcpp.package.skeleton.R
===================================================================
--- pkg/Rcpp/R/Rcpp.package.skeleton.R	2010-04-07 08:27:31 UTC (rev 1024)
+++ pkg/Rcpp/R/Rcpp.package.skeleton.R	2010-04-07 08:39:33 UTC (rev 1025)
@@ -40,9 +40,11 @@
 	DESCRIPTION <- file.path( root, "DESCRIPTION" )
 	if( file.exists( DESCRIPTION ) ){
 		x <- cbind( read.dcf( DESCRIPTION ), 
-			"Depends" = sprintf( "Rcpp (>= %s)", packageDescription("Rcpp")[["Version"]]  ) )
+			"Depends" = sprintf( "Rcpp (>= %s)", packageDescription("Rcpp")[["Version"]]  ), 
+			"LinkingTo" = "Rcpp" )
 		write.dcf( x, file = DESCRIPTION )
-		message( " >> added Rcpp to Depends" )
+		message( " >> added Depends: Rcpp" )
+		message( " >> added LinkingTo: Rcpp" )
 	}
 	
 	# if there is a NAMESPACE, add a useDynLib

Modified: pkg/Rcpp/inst/skeleton/Makevars
===================================================================
--- pkg/Rcpp/inst/skeleton/Makevars	2010-04-07 08:27:31 UTC (rev 1024)
+++ pkg/Rcpp/inst/skeleton/Makevars	2010-04-07 08:39:33 UTC (rev 1025)
@@ -1,22 +1,18 @@
 ## Use the R_HOME indirection to support installations of multiple R version
-PKG_CPPFLAGS=$(shell $(R_HOME)/bin/Rscript --vanilla -e "Rcpp:::CxxFlags()" )
 PKG_LIBS = $(shell $(R_HOME)/bin/Rscript --vanilla -e "Rcpp:::LdFlags()" )
 ## Uncomment this if you want to use C++0x features -- which are not currently portable
 ## CLINK_CPPFLAGS=$(shell Rscript -e "Rcpp:::Cxx0xFlags()" )
 
 ## As an alternative, one can also add this code in a file 'configure'
 ##
-##    PKG_CPPFLAGS=`${R_HOME}/bin/Rscript --vanilla -e "Rcpp:::CxxFlags()"`
 ##    PKG_LIBS=`${R_HOME}/bin/Rscript --vanilla -e "Rcpp:::LdFlags()"`
 ## 
 ##    sed -e "s|@PKG_LIBS@|${PKG_LIBS}|" \
-##        -e "s|@PKG_CPPFLAGS@|${PKG_CPPFLAGS}|" \
 ##        src/Makevars.in > src/Makevars
 ## 
 ## which together with the following file 'src/Makevars.in'
 ##
 ##    PKG_LIBS = @PKG_LIBS@
-##    PKG_CPPFLAGS = @PKG_CPPFLAGS@
 ##
 ## can be used to create src/Makevars dynamically. This scheme is more
 ## powerful and can be expanded to also check for and link with other
@@ -27,7 +23,7 @@
 ## which removes the autogenerated file src/Makevars. 
 ##
 ## Of course, autoconf can also be used to write configure files. This is
-## done by a number of packages, but recommended onlu for more advanced users
+## done by a number of packages, but recommended only for more advanced users
 ## comfortable with autoconf and its related tools.
 
 

Modified: pkg/Rcpp/inst/skeleton/Makevars.win
===================================================================
--- pkg/Rcpp/inst/skeleton/Makevars.win	2010-04-07 08:27:31 UTC (rev 1024)
+++ pkg/Rcpp/inst/skeleton/Makevars.win	2010-04-07 08:39:33 UTC (rev 1025)
@@ -2,4 +2,4 @@
 ## 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 = `$(R_HOME)/bin/Rscript --vanilla -e 'Rcpp:::LdFlags()'`
-PKG_CPPFLAGS = `$(R_HOME)/bin/Rscript --vanilla -e 'Rcpp:::CxxFlags()'`
+

Modified: pkg/Rcpp/man/Rcpp.package.skeleton.Rd
===================================================================
--- pkg/Rcpp/man/Rcpp.package.skeleton.Rd	2010-04-07 08:27:31 UTC (rev 1024)
+++ pkg/Rcpp/man/Rcpp.package.skeleton.Rd	2010-04-07 08:39:33 UTC (rev 1025)
@@ -28,9 +28,10 @@
 	In addition to \link[utils]{package.skeleton} : 
 	
 	The \samp{DESCRIPTION} file gains a Depends line requesting that 
-	the package depends on Rcpp
+	the package depends on Rcpp and a LinkingTo lines so that the package
+	finds Rcpp header files.
 	
-	The \samp{NAMESPACE}, if any, gains a \code{useDynLib} directive
+	The \samp{NAMESPACE}, if any, gains a \code{useDynLib} directive.
 	
 	The \samp{src} directory is created if it does not exists and 
 	a \samp{Makevars} file is added setting the environment variables