From 0c65442c5bfdf1a7f6d82c3601a2d8fe24e5d2db Mon Sep 17 00:00:00 2001
From: Yu Yang <yuyang18@baidu.com>
Date: Wed, 14 Dec 2016 17:12:43 +0800
Subject: [PATCH] Upgrade protobuf to 3.1 in Travis-CI linux

---
 .travis.yml                                   |  6 ++----
 cmake/check_packages.cmake                    |  1 -
 paddle/scripts/travis/before_install.linux.sh | 11 +++++++++++
 paddle/scripts/travis/main.sh                 |  5 +++++
 4 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 7de4ec7fc51..5b14f8e61e6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,10 +29,6 @@ addons:
       - python-pip
       - python2.7-dev
       - m4
-      - libprotobuf-dev
-      - doxygen
-      - protobuf-compiler
-      - python-protobuf
       - python-numpy
       - python-wheel
       - libgoogle-glog-dev
@@ -43,6 +39,8 @@ addons:
       - graphviz
       - swig
       - clang-format-3.8
+      - automake
+      - libtool
 before_install:
   - |
     if [ ${JOB} == "BUILD_AND_TEST" ]; then
diff --git a/cmake/check_packages.cmake b/cmake/check_packages.cmake
index 06887455418..1a7c6a791bf 100644
--- a/cmake/check_packages.cmake
+++ b/cmake/check_packages.cmake
@@ -28,7 +28,6 @@ endif()
 
 if(WITH_DOC)
   find_package(Sphinx REQUIRED)
-  find_package(Doxygen REQUIRED)
   find_python_module(recommonmark REQUIRED)
 endif()
 
diff --git a/paddle/scripts/travis/before_install.linux.sh b/paddle/scripts/travis/before_install.linux.sh
index ec2ac1f2240..3351deddb97 100755
--- a/paddle/scripts/travis/before_install.linux.sh
+++ b/paddle/scripts/travis/before_install.linux.sh
@@ -1,5 +1,16 @@
 #!/bin/bash
 set -e
+
+cd /tmp
+wget https://github.com/google/protobuf/archive/v3.0.2.tar.gz -O protobuf.tar.gz
+tar xf protobuf.tar.gz
+cd protobuf*
+./autogen.sh
+./configure
+make -j 2 install
+cd ..
+rm -rf protobuf*
+
 pushd /usr/src/gtest
 cmake .
 make
diff --git a/paddle/scripts/travis/main.sh b/paddle/scripts/travis/main.sh
index 13f2552d29d..1b49a12563d 100755
--- a/paddle/scripts/travis/main.sh
+++ b/paddle/scripts/travis/main.sh
@@ -1,6 +1,11 @@
 #!/bin/bash
 cd `dirname $0`
 
+if [ "$TRAVIS_OS_NAME" == "linux" ]; then
+  # for manually installed protobuf 3.10
+  export LD_LIBRARY_PATH=/usr/local/lib/:$LD_LIBRARY_PATH
+fi
+
 if [ ${JOB} == "BUILD_AND_TEST" ]; then
   ./build_and_test.sh
 elif [ ${JOB} == "DOCS" ]; then
-- 
GitLab