Include pkg_types.h file in RcppExports.cpp 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-01-25  Kevin Ushey  <kevinushey@gmail.com>
 
         * inst/include/Rcpp/utils/tinyformat.h: define an error handler for

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,