Merge pull request #1088 from 00k/deps

fix .travis.yml & update sofa-pbrpc to 1.1.1 & remove ubuntu_build.sh

Author: caijieming-baidu

.travis.yml

@@ -1,57 +1,28 @@
 language: cpp
 compiler: gcc
-install:
-    - sudo apt-get update
-    - sudo apt-get install libboost-dev uuid-dev
-
-    - wget https://github.com/google/protobuf/releases/download/v2.6.1/protobuf-2.6.1.tar.gz
-    - tar xf protobuf-2.6.1.tar.gz
-    - ( cd protobuf-2.6.1 && ./configure --with-pic && make -j4 && sudo make install && sudo ldconfig )
-
-    - git clone https://github.com/google/snappy
-    - ( cd snappy && sh ./autogen.sh && ./configure --with-pic && make -j4 && sudo make install && sudo ldconfig )
-
-    - git clone https://github.com/BaiduPS/sofa-pbrpc
-    - ( cd sofa-pbrpc && make -j4 && make install )
-
-    - wget http://www.us.apache.org/dist/zookeeper/stable/zookeeper-3.4.7.tar.gz
-    - tar zxvf zookeeper-3.4.7.tar.gz
-    - ( cd zookeeper-3.4.7/src/c && ./configure --disable-shared --with-pic && make -j4 && sudo make install )
-
-    - wget https://github.com/gflags/gflags/archive/v2.1.2.tar.gz
-    - tar xf v2.1.2.tar.gz
-    - ( cd gflags-2.1.2 && cmake -DGFLAGS_NAMESPACE=google -DCMAKE_CXX_FLAGS=-fPIC && make -j4 && sudo make install )
+addons:
+  apt:
+    packages:
+      - gdb
+      - apport
 
-    - git clone https://github.com/google/glog
-    - ( cd glog && git checkout v0.3.3 && ./configure --disable-shared --with-pic && make -j4 && sudo make install )
-    
-    - wget --no-check-certificate https://googletest.googlecode.com/files/gtest-1.7.0.zip
-    - unzip gtest-1.7.0.zip
-    - ( cd gtest-1.7.0 && ./configure --disable-shared --with-pic && make -j4 && sudo cp -a lib/.libs/* /usr/lib && sudo cp -a include/gtest /usr/include )
+before_install:
+    - ulimit -c unlimited -S
+    - ulimit -a
 
-    - wget http://download.savannah.gnu.org/releases/libunwind/libunwind-0.99-beta.tar.gz
-    - tar zxvf libunwind-0.99-beta.tar.gz
-    - ( cd libunwind-0.99-beta && ./configure CFLAGS=-U_FORTIFY_SOURCE --with-pic && make -j4 && sudo make install )
-
-    - wget https://googledrive.com/host/0B6NtGsLhIcf7MWxMMF9JdTN3UVk/gperftools-2.2.1.tar.gz
-    - tar zxvf gperftools-2.2.1.tar.gz
-    - ( cd gperftools-2.2.1 && ./configure --with-pic && make -j4 && sudo make install && sudo ldconfig )
-
-    - git clone https://github.com/fxsjy/ins
-    - (cd ins && PBRPC_PATH=../sofa-pbrpc/output/ make sdk )
-
-before_script:
-    - sed -i 's/^SOFA_PBRPC_PREFIX=.*/SOFA_PBRPC_PREFIX=.\/sofa-pbrpc\/output/' depends.mk
-    - sed -i 's/^PROTOBUF_PREFIX=.*/PROTOBUF_PREFIX=\/usr\/local/' depends.mk
-    - sed -i 's/^SNAPPY_PREFIX=.*/SNAPPY_PREFIX=\/usr\/local/' depends.mk
-    - sed -i 's/^ZOOKEEPER_PREFIX=.*/ZOOKEEPER_PREFIX=\/usr\/local/' depends.mk
-    - sed -i 's/^GFLAGS_PREFIX=.*/GFLAGS_PREFIX=\/usr\/local/' depends.mk
-    - sed -i 's/^GLOG_PREFIX=.*/GLOG_PREFIX=\/usr\/local/' depends.mk
-    - sed -i 's/^GTEST_PREFIX=.*/GTEST_PREFIX=.\/thirdparty/' depends.mk
-    - sed -i 's/^GPERFTOOLS_PREFIX=.*/GPERFTOOLS_PREFIX=\/usr\/local/' depends.mk
-    - sed -i 's/^BOOST_INCDIR=.*/BOOST_INCDIR=\/usr\/local\/include/' depends.mk
-    - sed -i 's/^INS_PREFIX=.*/INS_PREFIX=.\/ins\/output/' depends.mk
+install:
+    - bash -x build.sh origin
 
 script:
-    - make -j4
     - make check
+    - bash -x ft_test.sh
+
+after_failure:
+    - find . -name 'core.*' -print
+    - for core_file in $(find test_output -name 'core*' -print); do
+          echo "${core_file}";
+          tmp=${core_file#*core.}; exe_name=${tmp%.*};
+          echo "${core_file} is generated by ${exe_name}"
+          gdb ${exe_name} ${core_file} -ex "thread apply all bt" -ex "set pagination 0" -batch;
+      done
+

build.conf

@@ -8,7 +8,7 @@ MIRROR=$1
 BOOST_VERSION=1_58_0
 PROTOBUF_VERSION=2.6.1
 SNAPPY_VERSION=1.1.3
-SOFA_PBRPC_VERSION=1.1.0
+SOFA_PBRPC_VERSION=1.1.1
 ZOOKEEPER_VERSION=3.4.9
 CMAKE_VERSION=3.2.1
 GFLAGS_VERSION=2.1.2
@@ -20,47 +20,47 @@ INS_VERSION=0.14
 NOSE_VERSION=1.3.7
 
 if [ $MIRROR == "china" ]; then
-    BOOST_URL=http://mirrors.163.com/gentoo/distfiles/boost_1_58_0.tar.bz2
-    PROTOBUF_URL=http://mirrors.163.com/gentoo/distfiles/protobuf-2.6.1.tar.bz2
-    SNAPPY_URL=http://mirrors.163.com/gentoo/distfiles/snappy-1.1.3.tar.gz
-    SOFA_PBRPC_URL=https://github.com/baidu/sofa-pbrpc/archive/v1.1.0.tar.gz
-    ZOOKEEPER_URL=http://mirrors.163.com/gentoo/distfiles/zookeeper-3.4.9.tar.gz
-    CMAKE_URL=https://github.com/Kitware/CMake/archive/v3.2.1.tar.gz
-    GFLAGS_URL=https://github.com/schuhschuh/gflags/archive/v2.1.2.tar.gz
-    GLOG_URL=https://github.com/google/glog/archive/v0.3.3.tar.gz
-    GTEST_URL=https://github.com/google/googletest/archive/release-1.8.0.tar.gz
-    LIBUNWIND_URL=http://mirrors.163.com/gentoo/distfiles/libunwind-0.99.tar.gz
-    GPERFTOOLS_URL=https://github.com/00k/gperftools/raw/master/gperftools-2.5.tar.gz
-    INS_URL=https://github.com/baidu/ins/archive/0.14.tar.gz
-    NOSE_URL=http://mirrors.163.com/gentoo/distfiles/nose-1.3.7.tar.gz
+    BOOST_URL=http://mirrors.163.com/gentoo/distfiles/boost_${BOOST_VERSION}.tar.bz2
+    PROTOBUF_URL=http://mirrors.163.com/gentoo/distfiles/protobuf-${PROTOBUF_VERSION}.tar.bz2
+    SNAPPY_URL=http://mirrors.163.com/gentoo/distfiles/snappy-${SNAPPY_VERSION}.tar.gz
+    SOFA_PBRPC_URL=https://github.com/baidu/sofa-pbrpc/archive/v${SOFA_PBRPC_VERSION}.tar.gz
+    ZOOKEEPER_URL=http://mirrors.163.com/gentoo/distfiles/zookeeper-${ZOOKEEPER_VERSION}.tar.gz
+    CMAKE_URL=https://github.com/Kitware/CMake/archive/v${CMAKE_VERSION}.tar.gz
+    GFLAGS_URL=https://github.com/schuhschuh/gflags/archive/v${GFLAGS_VERSION}.tar.gz
+    GLOG_URL=https://github.com/google/glog/archive/v${GLOG_VERSION}.tar.gz
+    GTEST_URL=https://github.com/google/googletest/archive/release-${GTEST_VERSION}.tar.gz
+    LIBUNWIND_URL=http://mirrors.163.com/gentoo/distfiles/libunwind-${LIBUNWIND_VERSION}.tar.gz
+    GPERFTOOLS_URL=https://github.com/00k/gperftools/raw/master/gperftools-${GPERFTOOLS_VERSION}.tar.gz
+    INS_URL=https://github.com/baidu/ins/archive/${INS_VERSION}.tar.gz
+    NOSE_URL=http://mirrors.163.com/gentoo/distfiles/nose-${NOSE_VERSION}.tar.gz
 elif [ $MIRROR == "origin" ]; then
-    BOOST_URL=http://downloads.sourceforge.net/project/boost/boost/1.58.0/boost_1_58_0.tar.bz2
-    PROTOBUF_URL=https://github.com/google/protobuf/releases/download/v2.6.1/protobuf-2.6.1.tar.bz2
-    SNAPPY_URL=https://github.com/google/snappy/releases/download/1.1.3/snappy-1.1.3.tar.gz
-    SOFA_PBRPC_URL=https://github.com/baidu/sofa-pbrpc/archive/v1.1.0.tar.gz
-    ZOOKEEPER_URL=http://www-us.apache.org/dist/zookeeper/zookeeper-3.4.9/zookeeper-3.4.9.tar.gz
-    CMAKE_URL=https://github.com/Kitware/CMake/archive/v3.2.1.tar.gz
-    GFLAGS_URL=https://github.com/schuhschuh/gflags/archive/v2.1.2.tar.gz
-    GLOG_URL=https://github.com/google/glog/archive/v0.3.3.tar.gz
-    GTEST_URL=https://github.com/google/googletest/archive/release-1.8.0.tar.gz
-    LIBUNWIND_URL=http://download.savannah.gnu.org/releases/libunwind/libunwind-0.99.tar.gz
-    GPERFTOOLS_URL=https://github.com/gperftools/gperftools/releases/download/gperftools-2.5/gperftools-2.5.tar.gz
-    INS_URL=https://github.com/baidu/ins/archive/0.14.tar.gz
-    NOSE_URL=http://mirrors.163.com/gentoo/distfiles/nose-1.3.7.tar.gz
+    BOOST_URL=http://downloads.sourceforge.net/project/boost/boost/1.58.0/boost_${BOOST_VERSION}.tar.bz2
+    PROTOBUF_URL=https://github.com/google/protobuf/releases/download/v${PROTOBUF_VERSION}/protobuf-${PROTOBUF_VERSION}.tar.bz2
+    SNAPPY_URL=https://github.com/google/snappy/releases/download/${SNAPPY_VERSION}/snappy-${SNAPPY_VERSION}.tar.gz
+    SOFA_PBRPC_URL=https://github.com/baidu/sofa-pbrpc/archive/v${SOFA_PBRPC_VERSION}.tar.gz
+    ZOOKEEPER_URL=http://www-us.apache.org/dist/zookeeper/zookeeper-${ZOOKEEPER_VERSION}/zookeeper-${ZOOKEEPER_VERSION}.tar.gz
+    CMAKE_URL=https://github.com/Kitware/CMake/archive/v${CMAKE_VERSION}.tar.gz
+    GFLAGS_URL=https://github.com/schuhschuh/gflags/archive/v${GFLAGS_VERSION}.tar.gz
+    GLOG_URL=https://github.com/google/glog/archive/v${GLOG_VERSION}.tar.gz
+    GTEST_URL=https://github.com/google/googletest/archive/release-${GTEST_VERSION}.tar.gz
+    LIBUNWIND_URL=http://download.savannah.gnu.org/releases/libunwind/libunwind-${LIBUNWIND_VERSION}.tar.gz
+    GPERFTOOLS_URL=https://github.com/gperftools/gperftools/releases/download/gperftools-${GPERFTOOLS_VERSION}/gperftools-${GPERFTOOLS_VERSION}.tar.gz
+    INS_URL=https://github.com/baidu/ins/archive/${INS_VERSION}.tar.gz
+    NOSE_URL=http://mirrors.163.com/gentoo/distfiles/nose-${NOSE_VERSION}.tar.gz
 elif [ $MIRROR == "baidu" ]; then
-    BOOST_URL=http://gitlab.baidu.com/baidups/third/raw/master/boost_1_58_0.tar.bz2
-    PROTOBUF_URL=http://gitlab.baidu.com/baidups/third/raw/master/protobuf-2.6.1.tar.bz2
-    SNAPPY_URL=http://gitlab.baidu.com/baidups/third/raw/master/snappy-1.1.3.tar.gz
-    SOFA_PBRPC_URL=http://gitlab.baidu.com/baidups/third/raw/master/sofa-pbrpc-1.1.0.tar.gz
-    ZOOKEEPER_URL=http://gitlab.baidu.com/baidups/third/raw/master/zookeeper-3.4.9.tar.gz
-    CMAKE_URL=http://gitlab.baidu.com/baidups/third/raw/master/CMake-3.2.1.tar.gz
-    GFLAGS_URL=http://gitlab.baidu.com/baidups/third/raw/master/gflags-2.1.2.tar.gz
-    GLOG_URL=http://gitlab.baidu.com/baidups/third/raw/master/glog-0.3.3.tar.gz
-    GTEST_URL=http://gitlab.baidu.com/baidups/third/raw/master/googletest-release-1.8.0.tar.gz
-    LIBUNWIND_URL=http://gitlab.baidu.com/baidups/third/raw/master/libunwind-0.99.tar.gz
-    GPERFTOOLS_URL=http://gitlab.baidu.com/baidups/third/raw/master/gperftools-2.5.tar.gz
-    INS_URL=http://gitlab.baidu.com/baidups/third/raw/master/ins-0.14.tar.gz
-    NOSE_URL=http://gitlab.baidu.com/baidups/third/raw/master/nose-1.3.7.tar.gz
+    BOOST_URL=http://gitlab.baidu.com/baidups/third/raw/master/boost_${BOOST_VERSION}.tar.bz2
+    PROTOBUF_URL=http://gitlab.baidu.com/baidups/third/raw/master/protobuf-${PROTOBUF_VERSION}.tar.bz2
+    SNAPPY_URL=http://gitlab.baidu.com/baidups/third/raw/master/snappy-${SNAPPY_VERSION}.tar.gz
+    SOFA_PBRPC_URL=http://gitlab.baidu.com/baidups/third/raw/master/sofa-pbrpc-${SOFA_PBRPC_VERSION}.tar.gz
+    ZOOKEEPER_URL=http://gitlab.baidu.com/baidups/third/raw/master/zookeeper-${ZOOKEEPER_VERSION}.tar.gz
+    CMAKE_URL=http://gitlab.baidu.com/baidups/third/raw/master/CMake-${CMAKE_VERSION}.tar.gz
+    GFLAGS_URL=http://gitlab.baidu.com/baidups/third/raw/master/gflags-${GFLAGS_VERSION}.tar.gz
+    GLOG_URL=http://gitlab.baidu.com/baidups/third/raw/master/glog-${GLOG_VERSION}.tar.gz
+    GTEST_URL=http://gitlab.baidu.com/baidups/third/raw/master/googletest-release-${GTEST_VERSION}.tar.gz
+    LIBUNWIND_URL=http://gitlab.baidu.com/baidups/third/raw/master/libunwind-${LIBUNWIND_VERSION}.tar.gz
+    GPERFTOOLS_URL=http://gitlab.baidu.com/baidups/third/raw/master/gperftools-${GPERFTOOLS_VERSION}.tar.gz
+    INS_URL=http://gitlab.baidu.com/baidups/third/raw/master/ins-${INS_VERSION}.tar.gz
+    NOSE_URL=http://gitlab.baidu.com/baidups/third/raw/master/nose-${NOSE_VERSION}.tar.gz
 else
     return 1
 fi

build.sh

@@ -212,9 +212,8 @@ if [ ! -f "${FLAG_DIR}/nose_${NOSE_VERSION}" ] \
     wget --no-check-certificate -O nose-${NOSE_VERSION}.tar.gz ${NOSE_URL}
     tar zxf nose-${NOSE_VERSION}.tar.gz --recursive-unlink
     cd nose-${NOSE_VERSION}
-    python setup.py build
-    cp -af build/script*/nosetests ${DEPS_PREFIX}/bin
-    cp -arf build/lib/nose ${DEPS_PREFIX}/lib
+    export PYTHONPATH=${DEPS_PREFIX}/lib
+    python setup.py install --prefix=. --install-scripts=${DEPS_PREFIX}/bin --install-lib=${DEPS_PREFIX}/lib
     cd -
     touch "${FLAG_DIR}/nose_${NOSE_VERSION}"
 fi
@@ -240,4 +239,5 @@ sed -i "s:^INS_PREFIX=.*:INS_PREFIX=$DEPS_PREFIX:" depends.mk
 # build tera
 ########################################
 
+make clean
 make -j4

internal_build.sh

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-sh -$- build.sh baidu
+source ./build.sh baidu