Merge pull request #1088 from RcppCore/bugfix/skeleton

correct package skeleton behavior (closes #1087)

Author: eddelbuettel

ChangeLog

@@ -1,3 +1,11 @@
+2020-06-05  Dirk Eddelbuettel  <edd@debian.org>
+
+        * DESCRIPTION (Version, Date): Roll minor version
+        * inst/include/Rcpp/config.h: Idem
+
+	* R/Rcpp.package.skeleton.R: Remove a remaining NAMESPACE entry for
+	a temporary function symbol; ensure an exportPattern is set
+
 2020-05-18  Dirk Eddelbuettel  <edd@debian.org>
 
         * DESCRIPTION (Version, Date): Roll minor version

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: Rcpp
 Title: Seamless R and C++ Integration
-Version: 1.0.4.11
-Date: 2020-05-18
+Version: 1.0.4.12
+Date: 2020-06-05
 Author: Dirk Eddelbuettel, Romain Francois, JJ Allaire, Kevin Ushey, Qiang Kou,
  Nathan Russell, Douglas Bates and John Chambers
 Maintainer: Dirk Eddelbuettel <edd@debian.org>

R/Rcpp.package.skeleton.R

@@ -1,4 +1,4 @@
-# Copyright (C) 2009 - 2019  Dirk Eddelbuettel and Romain Francois
+# Copyright (C) 2009 - 2020  Dirk Eddelbuettel and Romain Francois
 #
 # This file is part of Rcpp.
 #
@@ -28,7 +28,6 @@ Rcpp.package.skeleton <- function(name = "anRpackage", list = character(),
 
     havePkgKitten <- requireNamespace("pkgKitten", quietly=TRUE)
 
-
     call <- match.call()
     call[[1]] <- as.name("package.skeleton")
     env <- parent.frame(1)
@@ -116,6 +115,9 @@ Rcpp.package.skeleton <- function(name = "anRpackage", list = character(),
         writeLines('importFrom(Rcpp, evalCpp)', ns)
         message(" >> added importFrom(Rcpp, evalCpp) directive to NAMESPACE" )
     }
+    if (!any(grepl("^exportPattern", lines))) {
+        writeLines("exportPattern(\"^[[:alpha:]]+\")", ns)
+    }
     close( ns )
 
     ## update the package description help page
@@ -206,6 +208,11 @@ Rcpp.package.skeleton <- function(name = "anRpackage", list = character(),
         rm("Rcpp.fake.fun", envir = env)
         unlink(file.path(root, "R"  , "Rcpp.fake.fun.R"))
         unlink(file.path(root, "man", "Rcpp.fake.fun.Rd"))
+
+        ## cleansing NAMESPACE of fake function entry
+        lines <- readLines(NAMESPACE)
+        lines <- lines[!grepl("^export.*fake\\.fun", lines)]
+        writeLines(lines, NAMESPACE)
     }
 
     if (isTRUE(remove_hello_world)) {

inst/include/Rcpp/config.h

@@ -30,7 +30,7 @@
 #define RCPP_VERSION_STRING     "1.0.4"
 
 // the current source snapshot
-#define RCPP_DEV_VERSION        RcppDevVersion(1,0,4,11)
-#define RCPP_DEV_VERSION_STRING "1.0.4.11"
+#define RCPP_DEV_VERSION        RcppDevVersion(1,0,4,12)
+#define RCPP_DEV_VERSION_STRING "1.0.4.12"
 
 #endif