tweaks (support alternate build types)

kevinushey · kevinushey · commit 12ea721833c1 · 2025-01-14T11:13:38.000-08:00
diff --git a/.gitignore b/.gitignore
@@ -12,5 +12,8 @@ src-i386
 src-x64
 tbb.log
 
+src/tbb/build
+src/tbb/build-tbb
+
 R/tbb-autodetected.R
 
diff --git a/src/install.libs.R b/src/install.libs.R
@@ -103,9 +103,12 @@ useBundledTbb <- function() {
       stop("error building tbb (status code ", status, ")")
    }
    
+   tbbFiles <- list.files(pattern = "libtbb.so", recursive = TRUE)
+   tbbDir <- dirname(tbbFiles[[1L]])
+   
    dir.create("tbb/build", showWarnings = FALSE)
-   system("mv tbb/build-tbb/*_relwithdebinfo tbb/build/lib_release")
-   system("rm -rf tbb/build-tbb")
+   file.rename(tbbDir, "tbb/build/lib_release")
+   unlink("tbb/build-tbb", recursive = TRUE)
    writeLines("*** finished building tbb")
    
 }

Original file line number	Diff line number	Diff line change
`@@ -103,9 +103,12 @@ useBundledTbb <- function() {`
`103`	`103`	`stop("error building tbb (status code ", status, ")")`
`104`	`104`	`}`
`105`	`105`
	`106`	`+ tbbFiles <- list.files(pattern = "libtbb.so", recursive = TRUE)`
	`107`	`+ tbbDir <- dirname(tbbFiles[[1L]])`
	`108`	`+`
`106`	`109`	`dir.create("tbb/build", showWarnings = FALSE)`
`107`		`- system("mv tbb/build-tbb/*_relwithdebinfo tbb/build/lib_release")`
`108`		`- system("rm -rf tbb/build-tbb")`
	`110`	`+ file.rename(tbbDir, "tbb/build/lib_release")`
	`111`	`+ unlink("tbb/build-tbb", recursive = TRUE)`
`109`	`112`	`writeLines("*** finished building tbb")`
`110`	`113`
`111`	`114`	`}`