compileAttributes only after all code is generated

RcppCore · Jun 2, 2017 · 7f872ca · 7f872ca
1 parent 8f404df
commit 7f872ca
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,6 +1,7 @@
 2017-06-02  JJ Allaire  <jj@rstudio.com>
 
         * src/attributes.cpp: Automatically register init functions for RcppModules
+        * R/Rcpp.package.skeleton.R: compileAttributes only after all code is generated
 
 2017-06-01  JJ Allaire  <jj@rstudio.com>
 

diff --git a/R/Rcpp.package.skeleton.R b/R/Rcpp.package.skeleton.R
@@ -138,18 +138,13 @@ Rcpp.package.skeleton <- function(name = "anRpackage", list = character(),
             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.path( src, "rcpp_hello_world.cpp"))
             message(" >> added example src file using Rcpp attributes")
-            compileAttributes(root)
-            message(" >> compiled Rcpp attributes")
-            message(" >> do NOT modify by hand either RcppExports.cpp or ",
-                    "RcppExports.R")
         } else {
             header <- readLines(file.path(skeleton, "rcpp_hello_world.h"))
             header <- gsub("@PKG@", name, header, fixed = TRUE)
@@ -218,6 +213,11 @@ Rcpp.package.skeleton <- function(name = "anRpackage", list = character(),
         rm("rcpp_hello_world", envir = env)
     }
 
+    if (attributes) {
+        compileAttributes(root)
+        message(" >> compiled Rcpp attributes ")
+    }
+
     invisible(NULL)
 }