From 1c01778ad89418c22929ae6c033339d7ae9ad18c Mon Sep 17 00:00:00 2001 From: James Lamb Date: Tue, 5 Nov 2019 08:29:12 -0600 Subject: [PATCH] trying a simple ignore --- R-package/.Rbuildignore | 2 +- R-package/src/install.libs.R | 42 ++++++++++++++++++------------------ 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/R-package/.Rbuildignore b/R-package/.Rbuildignore index 9ad099ed934d..1484c2c23e55 100644 --- a/R-package/.Rbuildignore +++ b/R-package/.Rbuildignore @@ -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$ diff --git a/R-package/src/install.libs.R b/R-package/src/install.libs.R index a4b2dcb4c645..50e28a350a44 100644 --- a/R-package/src/install.libs.R +++ b/R-package/src/install.libs.R @@ -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 = "/")