Skip to content

Commit e2130b2

Browse files
committed
help R CMD build
1 parent 53bb834 commit e2130b2

File tree

3 files changed

+15
-5
lines changed

3 files changed

+15
-5
lines changed

.Rbuildignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@
66
^appveyor\.yml$
77
^doc$
88
^gen$
9+
^libs$
910
^inst/lib$
11+
^inst/libs$
1012
^revdep$
1113
^src/.*\.o$
1214
^src/tbb/build/lib_.*$

.gitignore

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
.Rhistory
44
.RData
55
.DS_Store
6-
autom4te.cache/
7-
config.log
8-
config.status
96
inst/doc
7+
inst/lib
8+
inst/libs
9+
libs
1010
revdep
11-
src-i386/
12-
src-x64/
11+
src-i386
12+
src-x64
1313
tbb.log

src/install.libs.R

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,19 @@
11

2+
# !diagnostics suppress=R_PACKAGE_DIR,SHLIB_EXT,R_ARCH
23
.install.libs <- function() {
34

45
# copy default library
56
files <- Sys.glob(paste0("*", SHLIB_EXT))
67
dest <- file.path(R_PACKAGE_DIR, paste0("libs", R_ARCH))
78
dir.create(dest, recursive = TRUE, showWarnings = FALSE)
89
file.copy(files, dest, overwrite = TRUE)
10+
11+
# also copy to package 'libs' folder, for devtools
12+
dest <- paste0("../libs", R_ARCH)
13+
dir.create(dest, recursive = TRUE, showWarnings = FALSE)
14+
file.copy(files, dest, overwrite = TRUE)
15+
16+
# copy symbols if available
917
if (file.exists("symbols.rds"))
1018
file.copy("symbols.rds", dest, overwrite = TRUE)
1119

0 commit comments

Comments
 (0)