Skip to content

Commit

Permalink
trying a simple ignore
Browse files Browse the repository at this point in the history
  • Loading branch information
jameslamb committed Nov 5, 2019
1 parent 1ff05f1 commit 1c01778
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 22 deletions.
2 changes: 1 addition & 1 deletion R-package/.Rbuildignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
^src/CMakeLists.txt$

# unnecessary files from submodules
^src/build/.git$
^src/build/Makefile$
^src/compute/.appveyor.yml$
^src/compute/.coveralls.yml$
^src/compute/.travis.yml$
Expand Down
42 changes: 21 additions & 21 deletions R-package/src/install.libs.R
Original file line number Diff line number Diff line change
Expand Up @@ -103,27 +103,27 @@ if (!use_precompile) {
# R CMD check complains about the .NOTPARALLEL directive created in the cmake
# Makefile. We don't need it here anyway since targets are built serially, so trying
# to remove it with this hack
generated_makefile <- file.path(
R_PACKAGE_SOURCE
, "src"
, "build"
, "Makefile"
)
if (file.exists(generated_makefile)) {
makefile_txt <- readLines(
con = generated_makefile
)
makefile_txt <- gsub(
pattern = ".*NOTPARALLEL.*"
, replacement = ""
, x = makefile_txt
)
writeLines(
text = makefile_txt
, con = generated_makefile
, sep = "\n"
)
}
# generated_makefile <- file.path(
# R_PACKAGE_SOURCE
# , "src"
# , "build"
# , "Makefile"
# )
# if (file.exists(generated_makefile)) {
# makefile_txt <- readLines(
# con = generated_makefile
# )
# makefile_txt <- gsub(
# pattern = ".*NOTPARALLEL.*"
# , replacement = ""
# , x = makefile_txt
# )
# writeLines(
# text = makefile_txt
# , con = generated_makefile
# , sep = "\n"
# )
# }

system(build_cmd)
src <- file.path(lib_folder, paste0("lib_lightgbm", SHLIB_EXT), fsep = "/")
Expand Down

0 comments on commit 1c01778

Please sign in to comment.