From ad2287ebe9bb9b02f91909666b8cd86569203bf3 Mon Sep 17 00:00:00 2001
From: Yuhong Guo <guoyuhong1985@outlook.com>
Date: Thu, 3 Jan 2019 15:51:11 +0800
Subject: [PATCH] Fix new boost libs failure in cache-lib mode and add test to
 cover collect_dependent_libs.sh (#3627)

* Fix building breaks and add lib collection to Travis.

* Fix arrow build

* Fix version mismatch problem
---
 .travis.yml                              |  1 +
 .travis/install-with-cache-libs.sh       | 22 ++++++++++++++++
 cmake/Modules/BoostExternalProject.cmake | 33 +++++++++++++++++-------
 3 files changed, 47 insertions(+), 9 deletions(-)
 create mode 100755 .travis/install-with-cache-libs.sh

diff --git a/.travis.yml b/.travis.yml
index a2963311c..43da79dcd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -69,6 +69,7 @@ matrix:
         - ./.travis/install-dependencies.sh
         - export PATH="$HOME/miniconda/bin:$PATH"
         - ./.travis/install-ray.sh
+        - ./.travis/install-with-cache-libs.sh
 
       script:
         - cd build
diff --git a/.travis/install-with-cache-libs.sh b/.travis/install-with-cache-libs.sh
new file mode 100755
index 000000000..f95a260c7
--- /dev/null
+++ b/.travis/install-with-cache-libs.sh
@@ -0,0 +1,22 @@
+#!/usr/bin/env bash
+
+# Cause the script to exit if a single command fails.
+set -e
+
+ROOT_DIR=$(cd "$(dirname "${BASH_SOURCE:-$0}")"; pwd)
+
+# Copy the libs to thirdparty/external_project_libs.
+# -n means do not build again.
+bash $ROOT_DIR/../thirdparty/scripts/collect_dependent_libs.sh -n
+
+# Import all the libs cached in local to environment variables.
+source $ROOT_DIR/../thirdparty/external_project_libs/resource.txt
+
+# Clean the arrow building libs and use the cache libs.
+pushd $ROOT_DIR/../build/external/arrow/src/arrow_ep
+echo "Clean Arrow building files."
+rm -rf $ROOT_DIR/../build/external/arrow/src/arrow_ep-build/
+popd
+
+# Rebuild ray with libs cache environment variables, which is fast.
+bash $ROOT_DIR/install-ray.sh
diff --git a/cmake/Modules/BoostExternalProject.cmake b/cmake/Modules/BoostExternalProject.cmake
index f839304fb..e37f0e463 100644
--- a/cmake/Modules/BoostExternalProject.cmake
+++ b/cmake/Modules/BoostExternalProject.cmake
@@ -2,25 +2,40 @@
 # target:
 #  - boost_ep
 # defines:
-#  - BOOST_ROOT
 #  - Boost_INCLUDE_DIR
 #  - Boost_SYSTEM_LIBRARY
 #  - Boost_FILESYSTEM_LIBRARY
+#  - Boost_THREAD_LIBRARY
+
+option(RAY_BUILD_BOOST "Whether to build boost locally" ON)
+
+# Set the required boost version.
+set(BOOST_MAJOR_VERSION 1)
+set(BOOST_MINOR_VERSION 68)
+set(BOOST_SUBMINOR_VERSION 0)
+set(TARGET_BOOST_VERSION ${BOOST_MAJOR_VERSION}.${BOOST_MINOR_VERSION}.${BOOST_SUBMINOR_VERSION})
 
 # boost is a stable library in ray, and it supports to find
 # the boost pre-built in environment to speed up build process
 if (DEFINED ENV{RAY_BOOST_ROOT} AND EXISTS $ENV{RAY_BOOST_ROOT})
   set(Boost_USE_STATIC_LIBS ON)
   set(BOOST_ROOT "$ENV{RAY_BOOST_ROOT}")
-  message(STATUS "Find BOOST_ROOT: ${BOOST_ROOT}")
-#  find_package(Boost COMPONENTS system filesystem REQUIRED)
-  set(Boost_INCLUDE_DIR ${BOOST_ROOT}/include)
-  set(Boost_LIBRARY_DIR ${BOOST_ROOT}/lib)
-  set(Boost_SYSTEM_LIBRARY ${Boost_LIBRARY_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}boost_system${CMAKE_STATIC_LIBRARY_SUFFIX})
-  set(Boost_FILESYSTEM_LIBRARY ${Boost_LIBRARY_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}boost_filesystem${CMAKE_STATIC_LIBRARY_SUFFIX})
+  find_package(Boost ${TARGET_BOOST_VERSION} COMPONENTS system filesystem thread)
+  if (Boost_FOUND)
+    # If there is a newer version of Boost, there will be a warning message and Boost_FOUND is true.
+    set(FOUND_BOOST_VERSION ${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION}.${Boost_SUBMINOR_VERSION})
+    if (${TARGET_BOOST_VERSION} STREQUAL ${FOUND_BOOST_VERSION})
+      set(RAY_BUILD_BOOST OFF)
+      set(Boost_INCLUDE_DIR ${Boost_INCLUDE_DIRS})
+      # Boost_SYSTEM_LIBRARY, Boost_FILESYSTEM_LIBRARY, Boost_THREAD_LIBRARY will be set by find_package(Boost).
+      add_custom_target(boost_ep)
+    else()
+      message("Required Boost Version ${TARGET_BOOST_VERSION} does not match the path: $ENV{RAY_BOOST_ROOT}. Will build Boost Locally.")
+    endif()
+  endif(Boost_FOUND)
+endif()
 
-  add_custom_target(boost_ep)
-else()
+if (RAY_BUILD_BOOST)
   set(Boost_INSTALL_PREFIX ${CMAKE_CURRENT_BINARY_DIR}/external/boost-install)
 
   set(Boost_INCLUDE_DIR ${Boost_INSTALL_PREFIX}/include)