Merge pull request #888 from reyoung/feature/upgrade_to_proto3

Upgrade protobuf to 3.1 in Travis-CI

.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

cmake/check_packages.cmake

@@ -24,7 +24,6 @@ endif()
 
 if(WITH_DOC)
   find_package(Sphinx REQUIRED)
-  find_package(Doxygen REQUIRED)
   find_python_module(recommonmark REQUIRED)
 endif()
 

paddle/scripts/travis/before_install.linux.sh

 #!/bin/bash
 set -e
+pip install protobuf
+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 --prefix=/usr/
+make -j 2 install
+cd ..
+rm -rf protobuf*
+
 pushd /usr/src/gtest
 cmake .
 make

paddle/scripts/travis/before_install.osx.sh

@@ -2,9 +2,8 @@
 brew update
 brew tap homebrew/science
 brew install python
-sudo pip install --upgrade protobuf==2.6.0
-brew install homebrew/versions/protobuf260 --without-python
-brew install cmake python glog gflags openblas wget md5sha1sum
+sudo pip install --upgrade protobuf
+brew install cmake python glog gflags openblas wget md5sha1sum protobuf
 
 wget https://github.com/google/googletest/archive/release-1.8.0.tar.gz -O gtest.tar.gz
 tar xf gtest.tar.gz