Merge pull request #247 from RcppCore/feature/rcppexports-types

Include pkg_types.h file in exports if it's present in inst/include or src

Author: jjallaire

ChangeLog

@@ -1,3 +1,10 @@
+2014-02-03  JJ Allaire  <jj@rstudio.org>
+
+        * R/Attributes.R: Include pkg_types.h file in RcppExports.cpp
+        if it's present in inst/include or src
+        * src/attributes.cpp: Include pkg_types.h file in generated
+        C++ interface file if it's present in inst/include or src
+
 2015-02-02  JJ Allaire  <jj@rstudio.org>
 
         * R/exceptions.R: Evaluate R code within an R_toplevelExec block

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: Rcpp
 Title: Seamless R and C++ Integration
-Version: 0.11.4.1
+Version: 0.11.4.2
 Date: 2015-02-03
 Author: Dirk Eddelbuettel, Romain Francois, JJ Allaire, Kevin Ushey, 
  Douglas Bates, and John Chambers

R/Attributes.R

@@ -380,15 +380,24 @@ compileAttributes <- function(pkgdir = ".", verbose = getOption("verbose")) {
     linkingTo <- .readPkgDescField(pkgDesc, "LinkingTo")
     includes <- .linkingToIncludes(linkingTo, TRUE)
 
-    # if a master include file is defined for the package then include it
-    pkgHeader <- paste(pkgname, ".h", sep="")
+    # if a master include file or types file is in inst/include then use it
+    typesHeader <- c(paste0(pkgname, "_types.h"), paste0(pkgname, "_types.hpp"))
+    pkgHeader <- c(paste0(pkgname, ".h"), typesHeader)
     pkgHeaderPath <- file.path(pkgdir, "inst", "include",  pkgHeader)
-    if (file.exists(pkgHeaderPath)) {
+    pkgHeader <- pkgHeader[file.exists(pkgHeaderPath)]
+    if (length(pkgHeader) > 0) {
         pkgInclude <- paste("#include \"../inst/include/",
                             pkgHeader, "\"", sep="")
         includes <- c(pkgInclude, includes)
     }
 
+    # if a _types file is in src then include it
+    pkgHeader <- typesHeader
+    pkgHeaderPath <- file.path(pkgdir, "src", pkgHeader)
+    pkgHeader <- pkgHeader[file.exists(pkgHeaderPath)]
+    if (length(pkgHeader) > 0)
+        includes <- c(paste0("#include \"", pkgHeader ,"\""), includes)
+
     # generate exports
     invisible(.Call("compileAttributes", PACKAGE="Rcpp",
                     pkgdir, pkgname, depends, cppFiles, cppFileBasenames,

inst/NEWS.Rd

@@ -11,6 +11,11 @@
       \item Evaluate R code within an \code{R_toplevelExec} block to prevent
       user interrupts from bypassing C++ destructors on the stack.
     }
+    \item Changes in Rcpp Attributes:
+    \itemize{
+      \item Include pkg_types.h file in RcppExports.cpp if it's present in
+      inst/include or src.
+    }
   }
 }
 

src/attributes.cpp

@@ -1750,9 +1750,23 @@ namespace attributes {
             if (!includes.empty()) {
                 for (std::size_t i=0;i<includes.size(); i++)
                 {
-                    // don't do inst/include here
-                    if (includes[i].find("#include \"../inst/include/")
-                                                       == std::string::npos)
+                    // some special processing is required here. we exclude
+                    // the package header file (since it includes this file)
+                    // and we transorm _types includes into local includes
+                    std::string preamble = "#include \"../inst/include/";
+                    std::string pkgInclude = preamble + package() + ".h\"";
+                    if (includes[i] == pkgInclude)
+                        continue;
+
+                    // check for _types
+                    std::string typesInclude = preamble + package() + "_types.h";
+                    if (includes[i].find(typesInclude) != std::string::npos)
+                    {
+                        std::string include = "#include \"" +
+                                      includes[i].substr(preamble.length());
+                        ostr << include << std::endl;
+                    }
+                    else
                     {
                         ostr << includes[i] << std::endl;
                     }