From 5ef7fe5213dda6f09347ed2ece325348cfc18704 Mon Sep 17 00:00:00 2001 From: jeremiedb Date: Tue, 5 Feb 2019 03:24:34 -0500 Subject: [PATCH 1/2] rpkg Makefile --- Makefile | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/Makefile b/Makefile index cc7aebc9fb89..15d19aff79a6 100644 --- a/Makefile +++ b/Makefile @@ -607,11 +607,7 @@ rpkg: fi mkdir -p R-package/inst/include - cp -rf include/* R-package/inst/include - rm R-package/inst/include/dmlc - rm R-package/inst/include/nnvm - cp -rf 3rdparty/dmlc-core/include/* R-package/inst/include/ - cp -rf 3rdparty/tvm/nnvm/include/* R-package/inst/include + cp -rl include/* R-package/inst/include Rscript -e "if(!require(devtools)){install.packages('devtools', repo = 'https://cloud.r-project.org/')}" Rscript -e "if(!require(roxygen2)||packageVersion('roxygen2') < '6.1.1'){install.packages('roxygen2', repo = 'https://cloud.r-project.org/')}" Rscript -e "library(devtools); library(methods); options(repos=c(CRAN='https://cloud.r-project.org/')); install_deps(pkg='R-package', dependencies = TRUE)" From 67f3bf01ff617dc03e0b0f0b38309fcbb9d70c65 Mon Sep 17 00:00:00 2001 From: jeremiedb Date: Wed, 13 Feb 2019 23:39:25 -0500 Subject: [PATCH 2/2] rpkg makefile fix --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 15d19aff79a6..ed450196875f 100644 --- a/Makefile +++ b/Makefile @@ -616,7 +616,7 @@ rpkg: R CMD INSTALL R-package Rscript -e "require(mxnet); mxnet:::mxnet.export('R-package'); warnings()" rm R-package/NAMESPACE - Rscript -e "devtools::document('R-package'); warnings()" + Rscript -e "devtools::document('R-package');warnings()" R CMD INSTALL R-package rpkgtest: