提交 0c65442c 编写于 作者: Y Yu Yang

Upgrade protobuf to 3.1 in Travis-CI linux

上级 140edd24
...@@ -29,10 +29,6 @@ addons: ...@@ -29,10 +29,6 @@ addons:
- python-pip - python-pip
- python2.7-dev - python2.7-dev
- m4 - m4
- libprotobuf-dev
- doxygen
- protobuf-compiler
- python-protobuf
- python-numpy - python-numpy
- python-wheel - python-wheel
- libgoogle-glog-dev - libgoogle-glog-dev
...@@ -43,6 +39,8 @@ addons: ...@@ -43,6 +39,8 @@ addons:
- graphviz - graphviz
- swig - swig
- clang-format-3.8 - clang-format-3.8
- automake
- libtool
before_install: before_install:
- | - |
if [ ${JOB} == "BUILD_AND_TEST" ]; then if [ ${JOB} == "BUILD_AND_TEST" ]; then
......
...@@ -28,7 +28,6 @@ endif() ...@@ -28,7 +28,6 @@ endif()
if(WITH_DOC) if(WITH_DOC)
find_package(Sphinx REQUIRED) find_package(Sphinx REQUIRED)
find_package(Doxygen REQUIRED)
find_python_module(recommonmark REQUIRED) find_python_module(recommonmark REQUIRED)
endif() endif()
......
#!/bin/bash #!/bin/bash
set -e 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 pushd /usr/src/gtest
cmake . cmake .
make make
......
#!/bin/bash #!/bin/bash
cd `dirname $0` 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 if [ ${JOB} == "BUILD_AND_TEST" ]; then
./build_and_test.sh ./build_and_test.sh
elif [ ${JOB} == "DOCS" ]; then elif [ ${JOB} == "DOCS" ]; then
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册