Merge pull request #197 from RcppCore/release/5.1.7

CRAN release 5.1.7

Author: kevinushey

.Rbuildignore

@@ -15,5 +15,5 @@
 ^tags$
 ^tests/testthat/pkg/RcppParallelTest/src/.*\.dll$
 ^tests/testthat/pkg/RcppParallelTest/src/.*\.s?o$
-
+^tools/tbb$
 ^\.github$

.gitignore

@@ -13,3 +13,5 @@ src-x64
 tbb.log
 
 R/tbb-autodetected.R
+src/install.libs.R
+

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: RcppParallel
 Type: Package
 Title: Parallel Programming Tools for 'Rcpp'
-Version: 5.1.6-9000
+Version: 5.1.7
 Authors@R: c(
     person("JJ", "Allaire", role = c("aut"), email = "jj@rstudio.com"),
     person("Romain", "Francois", role = c("aut", "cph")),

NEWS.md

@@ -1,5 +1,5 @@
 
-## RcppParallel 5.1.7 (UNRELEASED)
+## RcppParallel 5.1.7
 
 * Remove deprecated `std::iterator`. (#192; @Enchufa2)
 

src/install.libs.R renamed to src/install.libs.R.in

@@ -2,6 +2,9 @@
 # !diagnostics suppress=R_PACKAGE_DIR,SHLIB_EXT,R_ARCH
 .install.libs <- function() {
 
+   # get TBB library path
+   tbbLib <- "@TBB_LIB@"
+
    # copy default library
    files <- Sys.glob(paste0("*", SHLIB_EXT))
    dest <- file.path(R_PACKAGE_DIR, paste0("libs", R_ARCH))
@@ -22,13 +25,6 @@
    tbbDest <- file.path(R_PACKAGE_DIR, paste0("lib", R_ARCH))
    dir.create(tbbDest, recursive = TRUE, showWarnings = FALSE)
 
-   # check for bundled vs. system tbb
-   tbbRoot <- Sys.getenv("TBB_ROOT", unset = NA)
-   
-   tbbLib <- Sys.getenv("TBB_LIB", unset = NA)
-   if (is.na(tbbLib) && !is.na(tbbRoot))
-      tbbLib <- file.path(tbbRoot, "lib")
-   
    # note: on Linux, TBB gets compiled with extensions like
    # '.so.2', so be ready to handle those
    shlibPattern <- switch(
@@ -38,7 +34,7 @@
       "^libtbb.*\\.so.*$"
    )
 
-   if (is.na(tbbLib)) {
+   if (!nzchar(tbbLib)) {
 
       # using bundled TBB
       tbbLibs <- list.files(

tools/config/cleanup.R

@@ -5,3 +5,8 @@
 unlink("src/tbb/build/lib_release", recursive = TRUE)
 unlink("inst/lib",  recursive = TRUE)
 unlink("inst/libs", recursive = TRUE)
+unlink("inst/include/index.html", recursive = TRUE)
+unlink("inst/include/oneapi", recursive = TRUE)
+unlink("inst/include/serial", recursive = TRUE)
+unlink("inst/include/tbb", recursive = TRUE)
+

tools/config/configure.R

@@ -161,7 +161,7 @@ if (!is.na(tbbLib) && is.na(tbbInc)) {
 # if TBB_LIB and TBB_INC are still not defined, try auto-detecting
 tryAutoDetect <-
    .Platform$OS.type == "unix" &&
-   Sys.getenv("TBB_AUTODETECT", unset = "TRUE") == "TRUE" &&
+   Sys.getenv("TBB_AUTODETECT", unset = "FALSE") == "TRUE" &&
    is.na(tbbLib) &&
    is.na(tbbInc)