deprecate namespace argument in Rcpp.package.skeleton

Author: eddelbuettel

ChangeLog

@@ -1,3 +1,9 @@
+2013-10-16  Dirk Eddelbuettel  <edd@debian.org>
+
+	* R/Rcpp.package.skeleton.R (Rcpp.package.skeleton): Deprecate
+	namespace argument which package.skeleton() no longer uses
+	* man/Rcpp.package.skeleton.Rd: Updated documentation accordingly
+
 2013-10-16 Romain Francois <romain@r-enthusiasts.com>
 
         * include/Rcpp/api/meat/is.h : added missing implementation for 

R/Rcpp.package.skeleton.R

@@ -1,6 +1,6 @@
 # -*- tab-width: 4; -*-
 
-# Copyright (C) 2009 - 2012  Dirk Eddelbuettel and Romain Francois
+# Copyright (C) 2009 - 2013  Dirk Eddelbuettel and Romain Francois
 #
 # This file is part of Rcpp.
 #
@@ -17,20 +17,17 @@
 # You should have received a copy of the GNU General Public License
 # along with Rcpp.  If not, see <http://www.gnu.org/licenses/>.
 
-Rcpp.package.skeleton <- function(
-	name = "anRpackage", list = character(), environment = .GlobalEnv,
-	path = ".", force = FALSE, namespace = TRUE,
-	code_files = character(), cpp_files = character(),
-	example_code = TRUE,
-	attributes = TRUE,
-	module = FALSE,
-	author = "Who wrote it",
-	maintainer = if(missing( author)) "Who to complain to" else author,
-	email = "yourfault@somewhere.net",
-	license = "What Licence is it under ?"
-	){
-	
-	if (!is.character(cpp_files)) 
+Rcpp.package.skeleton <- function(name = "anRpackage", list = character(),
+                                  environment = .GlobalEnv,
+                                  path = ".", force = FALSE,
+                                  code_files = character(), cpp_files = character(),
+                                  example_code = TRUE, attributes = TRUE, module = FALSE,
+                                  author = "Who wrote it",
+                                  maintainer = if(missing( author)) "Who to complain to" else author,
+                                  email = "yourfault@somewhere.net",
+                                  license = "What Licence is it under ?") {
+
+	if (!is.character(cpp_files))
 		stop("'cpp_files' must be a character vector")
 	# set example_code if attributes is set
 	if( isTRUE(attributes) )
@@ -40,7 +37,7 @@ Rcpp.package.skeleton <- function(
 	if( !length(list) ){
 		fake <- TRUE
 		assign( "Rcpp.fake.fun", function(){}, envir = env )
-		if( example_code && !isTRUE(attributes)){ 
+		if( example_code && !isTRUE(attributes)){
 			assign( "rcpp_hello_world", function(){}, envir = env )
 			remove_hello_world <- TRUE
 		} else {
@@ -59,7 +56,6 @@ Rcpp.package.skeleton <- function(
 	# first let the traditional version do its business
 	call <- match.call()
 	call[[1]] <- as.name("package.skeleton")
-	call[["namespace"]] <- namespace
 	# remove Rcpp specific arguments
 
 	call <- call[ c( 1L, which( names(call) %in% names(formals(package.skeleton)))) ]
@@ -117,15 +113,15 @@ Rcpp.package.skeleton <- function(
 		}
 		close( ns )
 	}
-	
+
 	# update the package description help page
 	package_help_page <- file.path( root, "man", sprintf( "%s-package.Rd", name ) )
 	if( file.exists(package_help_page) ){
 	    lines <- readLines(package_help_page)
 	    lines <- gsub( "What license is it under?", license, lines, fixed = TRUE )
-	    lines <- gsub( "Who to complain to <yourfault@somewhere.net>", 
-	        sprintf( "%s <%s>", maintainer, email),  
-	        lines, 
+	    lines <- gsub( "Who to complain to <yourfault@somewhere.net>",
+	        sprintf( "%s <%s>", maintainer, email),
+	        lines,
 	        fixed = TRUE
 	        )
 	    lines <- gsub( "Who wrote it", author, lines, fixed = TRUE )
@@ -149,18 +145,18 @@ Rcpp.package.skeleton <- function(
 		file.copy( file.path( skeleton, "Makevars.win" ), Makevars.win )
 		message( " >> added Makevars.win file with Rcpp settings" )
 	}
-	
+
 	if ( length(cpp_files) > 0L ) {
 		for (file in cpp_files) {
 			file.copy(file, src)
 			message( " >> copied ", file, " to src directory" )
 		}
 		compileAttributes(root)
 	}
-	
+
 	if( example_code ){
 		if ( isTRUE( attributes ) ) {
-			file.copy( file.path( skeleton, "rcpp_hello_world_attributes.cpp" ), 
+			file.copy( file.path( skeleton, "rcpp_hello_world_attributes.cpp" ),
 								 file.path( src, "rcpp_hello_world.cpp" ) )
 			message( " >> added example src file using Rcpp attributes")
 			compileAttributes(root)
@@ -170,16 +166,16 @@ Rcpp.package.skeleton <- function(
 			header <- gsub( "@PKG@", name, header, fixed = TRUE )
 			writeLines( header , file.path( src, "rcpp_hello_world.h" ) )
 			message( " >> added example header file using Rcpp classes")
-			
+
 			file.copy( file.path( skeleton, "rcpp_hello_world.cpp" ), src )
 			message( " >> added example src file using Rcpp classes")
-			
+
 			rcode <- readLines( file.path( skeleton, "rcpp_hello_world.R" ) )
 			rcode <- gsub( "@PKG@", name, rcode, fixed = TRUE )
 			writeLines( rcode , file.path( root, "R", "rcpp_hello_world.R" ) )
 			message( " >> added example R file calling the C++ example")
 		}
-		
+
 		hello.Rd <- file.path( root, "man", "rcpp_hello_world.Rd")
 		unlink( hello.Rd )
 		file.copy(

inst/NEWS.Rd

@@ -20,6 +20,8 @@
     \itemize{
       \item Export linking helper function \code{LdFlags} as well as
         \code{RcppLdFlags}.
+      \item Function \code{Rcpp.package.skeleton()} no longer passes a
+        \code{namespace} argument on to \code{package.skeleton()}
     }
     \item Changes in R setup:
     \itemize{

man/Rcpp.package.skeleton.Rd

@@ -13,7 +13,7 @@ Create a skeleton for a new package depending on Rcpp
 \usage{
 Rcpp.package.skeleton(name = "anRpackage", list = character(), 
 	environment = .GlobalEnv, path = ".", force = FALSE, 
-	namespace = TRUE, code_files = character(), cpp_files = character(),
+	code_files = character(), cpp_files = character(),
 	example_code = TRUE, attributes = TRUE, module = FALSE, 
 	author = "Who wrote it", 
 	maintainer = if(missing( author)) "Who to complain to" else author, 
@@ -27,7 +27,6 @@ Rcpp.package.skeleton(name = "anRpackage", list = character(),
 	\item{environment}{See \link[utils]{package.skeleton}}
 	\item{path}{See \link[utils]{package.skeleton}}
 	\item{force}{See \link[utils]{package.skeleton}}
-	\item{namespace}{See \link[utils]{package.skeleton}}
 	\item{code_files}{See \link[utils]{package.skeleton}}
 	\item{cpp_files}{A character vector with the paths to C++ source files to add to the package. }
 	\item{example_code}{If TRUE, example c++ code using Rcpp is added to the package. }