This is an automated email from the ASF dual-hosted git repository.

the pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git


The following commit(s) were added to refs/heads/master by this push:
     new 3d0ffd2  R-Package Makefile (#14068)
3d0ffd2 is described below

commit 3d0ffd23382ca85b24357c5c03d169855a502672
Author: jeremiedb <jeremi...@users.noreply.github.com>
AuthorDate: Fri Feb 15 15:23:01 2019 -0500

    R-Package Makefile (#14068)
    
    * rpkg Makefile
    
    * rpkg makefile fix
---
 Makefile | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index cc7aebc..ed45019 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)"
@@ -620,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:

Reply via email to