change makefile to be compatible with r-travis

shaocf · Jun 16, 2015 · 67f0b69 · 67f0b69
1 parent 5568f83
commit 67f0b69
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -14,21 +14,16 @@ before_install:
     - ./travis-tool.sh bootstrap
 
 install:
-    - cd ./R-package
+    - make Rpack
+    - cd ./xgboost
     - ../travis-tool.sh install_deps
 
 script: 
     - bash ../travis-tool.sh run_tests  
-    - bash cat /home/travis/build/dmlc/xgboost/R-package/xgboost.Rcheck/00install.out
 
 after_failure: cat /home/travis/build/dmlc/xgboost/R-package/xgboost.Rcheck/00install.out
 
-on_failure:
-    - cat /home/travis/build/dmlc/xgboost/R-package/xgboost.Rcheck/00install.out
-    - ../travis-tool.sh dump_logs
-
-after_script: cat /home/travis/build/dmlc/xgboost/R-package/xgboost.Rcheck/00install.out
-
+
 notifications:
     email:
         recipients:

diff --git a/Makefile b/Makefile
@@ -145,6 +145,11 @@ Rpack:
 	cp xgboost/src/Makevars xgboost/src/Makevars.win
 	# R CMD build --no-build-vignettes xgboost
 	R CMD build xgboost
+	# rm -rf xgboost
+	# R CMD check --as-cran xgboost*.tar.gz
+
+Rcheck:
+	make Rpack
 	rm -rf xgboost
 	R CMD check --as-cran xgboost*.tar.gz