Skip to content

Commit d4bc42c

Browse files
committed
Turn on scanning header files by default
1 parent 5fc437a commit d4bc42c

File tree

2 files changed

+3
-10
lines changed

2 files changed

+3
-10
lines changed

R/Attributes.R

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -340,8 +340,7 @@ areMacrosDefined <- function(names,
340340

341341
# Scan the source files within a package for attributes and generate code
342342
# based on the attributes.
343-
compileAttributes <- function(pkgdir = ".", verbose = getOption("verbose"),
344-
scanHeaderFiles = FALSE) {
343+
compileAttributes <- function(pkgdir = ".", verbose = getOption("verbose")) {
345344

346345
# verify this is a package and read the DESCRIPTION to get it's name
347346
pkgdir <- normalizePath(pkgdir, winslash = "/")
@@ -367,11 +366,8 @@ compileAttributes <- function(pkgdir = ".", verbose = getOption("verbose"),
367366
dir.create(rDir)
368367

369368
# get a list of all source files
370-
if (scanHeaderFiles)
371-
cppFiles <- list.files(srcDir, pattern = "\\.(c(c|pp))|(h(pp)?)$")
372-
else
373-
cppFiles <- list.files(srcDir, pattern="\\.c(c|pp)$")
374-
369+
cppFiles <- list.files(srcDir, pattern = "\\.(c(c|pp))|(h(pp)?)$")
370+
375371
# derive base names (will be used for modules)
376372
cppFileBasenames <- tools::file_path_sans_ext(cppFiles)
377373

man/compileAttributes.Rd

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,6 @@ compileAttributes(pkgdir = ".", verbose = getOption("verbose"))
1616
}
1717
\item{verbose}{
1818
\code{TRUE} to print detailed information about generated code to the console.
19-
}
20-
\item{scanHeaderFiles}{
21-
\code{TRUE} to scan both header files and source files.
2219
}
2320
}
2421
\details{

0 commit comments

Comments
 (0)