diff --git a/.travis.yml b/.travis.yml index f8df225cdbf061bb0d0911059ca06c801910a4aa..209bd466749d3d0910253f60ddf166ab4a2192c5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,6 @@ addons: - libsnappy-dev - liblz4-dev - clang-format-3.9 - - libboost-all-dev - libaio-dev - libzstd-dev @@ -20,11 +19,15 @@ cache: - ccache - apt +before_install: + - python --version + - pip install -U cmake # use the latest version of cmake + before_script: - cd rdsn/thirdparty - - wget https://github.com/XiaoMi/pegasus-common/releases/download/deps/pegasus-thirdparty-prebuild.zip - - unzip pegasus-thirdparty-prebuild.zip - - rm -f pegasus-thirdparty-prebuild.zip + - wget https://github.com/XiaoMi/pegasus-common/releases/download/deps/pegasus-thirdparty-prebuild-bionic.zip + - unzip pegasus-thirdparty-prebuild-bionic.zip + - rm -f pegasus-thirdparty-prebuild-bionic.zip - cd ../.. - ulimit -c unlimited -S diff --git a/rdsn b/rdsn index 113e7e601459d6165b448f731a7f7aa8bcf26f2b..cbf4dd6ef55959376ec6734c3d93714d821f5164 160000 --- a/rdsn +++ b/rdsn @@ -1 +1 @@ -Subproject commit 113e7e601459d6165b448f731a7f7aa8bcf26f2b +Subproject commit cbf4dd6ef55959376ec6734c3d93714d821f5164 diff --git a/run.sh b/run.sh index 4f8e3cc51fdbf077107adb87c0e9a31e9888f255..e848e8f8ca890e38c0ea0fcaee195f8ac206c4d8 100755 --- a/run.sh +++ b/run.sh @@ -6,7 +6,7 @@ LOCAL_IP=`scripts/get_local_ip` export REPORT_DIR="$ROOT/test_report" export DSN_ROOT=$ROOT/DSN_ROOT export DSN_THIRDPARTY_ROOT=$ROOT/rdsn/thirdparty/output -export LD_LIBRARY_PATH=$DSN_ROOT/lib:$DSN_THIRDPARTY_ROOT/lib:$BOOST_DIR/lib:$LD_LIBRARY_PATH +export LD_LIBRARY_PATH=$DSN_ROOT/lib:$DSN_THIRDPARTY_ROOT/lib:$LD_LIBRARY_PATH function usage() { @@ -65,7 +65,6 @@ function usage_build() echo " e.g., \"gcc,g++\" or \"clang-3.9,clang++-3.9\"" echo " default is \"gcc,g++\"" echo " -j|--jobs the number of jobs to run simultaneously, default 8" - echo " -b|--boost_dir specify customized boost directory, use system boost if not set" echo " -w|--warning_all open all warnings when building, default no" echo " --enable_gcov generate gcov code coverage report, default no" echo " -v|--verbose build in verbose mode, default no" @@ -88,7 +87,6 @@ function run_build() PART_CLEAR=NO CLEAR_THIRDPARTY=NO JOB_NUM=8 - BOOST_DIR="" WARNING_ALL=NO ENABLE_GCOV=NO RUN_VERBOSE=NO @@ -131,10 +129,6 @@ function run_build() JOB_NUM="$2" shift ;; - -b|--boost_dir) - BOOST_DIR="$2" - shift - ;; -w|--warning_all) WARNING_ALL=YES ;; @@ -193,9 +187,6 @@ function run_build() echo "INFO: start build rdsn..." cd $ROOT/rdsn OPT="-t $BUILD_TYPE -j $JOB_NUM --compiler $C_COMPILER,$CXX_COMPILER" - if [ "$BOOST_DIR" != "" ]; then - OPT="$OPT -b $BOOST_DIR" - fi if [ "$CLEAR" == "YES" ]; then OPT="$OPT -c" fi @@ -230,7 +221,7 @@ function run_build() cd $ROOT/src C_COMPILER="$C_COMPILER" CXX_COMPILER="$CXX_COMPILER" BUILD_TYPE="$BUILD_TYPE" \ CLEAR="$CLEAR" PART_CLEAR="$PART_CLEAR" JOB_NUM="$JOB_NUM" \ - BOOST_DIR="$BOOST_DIR" WARNING_ALL="$WARNING_ALL" ENABLE_GCOV="$ENABLE_GCOV" SANITIZER="$SANITIZER"\ + WARNING_ALL="$WARNING_ALL" ENABLE_GCOV="$ENABLE_GCOV" SANITIZER="$SANITIZER"\ RUN_VERBOSE="$RUN_VERBOSE" TEST_MODULE="$TEST_MODULE" DISABLE_GPERF="$DISABLE_GPERF" ./build.sh if [ $? -ne 0 ]; then echo "ERROR: build pegasus failed" diff --git a/scripts/pack_client.sh b/scripts/pack_client.sh index 7c3c1e5e99001274e9860839fa314141dba28d10..c4b01ead5b07d0ddb5d6799741511a9c876bc514 100755 --- a/scripts/pack_client.sh +++ b/scripts/pack_client.sh @@ -7,7 +7,6 @@ function usage() echo "Options for subcommand 'pack_client':" echo " -h" echo " -p|--update-package-template " - echo " -b|--custom-boost-lib" echo " -g|--custom-gcc" exit 0 } @@ -63,7 +62,6 @@ if [ -n "$MINOS_CONFIG_FILE" ]; then pack_template=`dirname $MINOS_CONFIG_FILE`/xiaomi-config/package/pegasus.yaml fi -custom_boost_lib="false" custom_gcc="false" while [[ $# > 0 ]]; do @@ -73,9 +71,6 @@ while [[ $# > 0 ]]; do pack_template="$2" shift ;; - -b|--custom-boost-lib) - custom_boost_lib="true" - ;; -g|--custom-gcc) custom_gcc="true" ;; @@ -89,11 +84,9 @@ done mkdir -p ${pack}/lib copy_file ./DSN_ROOT/lib/libpegasus_client_static.a ${pack}/lib copy_file ./DSN_ROOT/lib/libpegasus_client_shared.so ${pack}/lib -copy_file `get_boost_lib $custom_boost_lib system` ${pack}/lib +copy_file ./rdsn/thirdparty/output/lib/libboost*.so.1.69.0 ${pack}/lib ln -sf `ls ${pack}/lib | grep libboost_system` ${pack}/lib/libboost_system.so -copy_file `get_boost_lib $custom_boost_lib filesystem` ${pack}/lib ln -sf `ls ${pack}/lib | grep libboost_filesystem` ${pack}/lib/libboost_filesystem.so -copy_file `get_boost_lib $custom_boost_lib regex` ${pack}/lib ln -sf `ls ${pack}/lib | grep libboost_regex` ${pack}/lib/libboost_regex.so cp -v -r ./src/include ${pack} diff --git a/scripts/pack_common.sh b/scripts/pack_common.sh index 2c30666056bf4b918feabf0dc078d314c4b89929..df6517bfc3656141bda426fe07ddbf764079584d 100755 --- a/scripts/pack_common.sh +++ b/scripts/pack_common.sh @@ -1,16 +1,5 @@ #!/bin/bash -function get_boost_lib() -{ - libname=`ldd ./DSN_ROOT/bin/pegasus_server/pegasus_server 2>/dev/null | grep boost_$2` - libname=`echo $libname | cut -f1 -d" "` - if [ $1 = "true" ]; then - echo $BOOST_DIR/lib/$libname - else - echo `ldconfig -p|grep $libname|awk '{print $NF}'` - fi -} - function get_stdcpp_lib() { libname=`ldd ./DSN_ROOT/bin/pegasus_server/pegasus_server 2>/dev/null | grep libstdc++` diff --git a/scripts/pack_server.sh b/scripts/pack_server.sh index 25d36f8337adaef7e69b06cd4f1e6ef65be0b10c..60e781c6c9f9418f63a66d0b21d7530f65eb7711 100755 --- a/scripts/pack_server.sh +++ b/scripts/pack_server.sh @@ -7,7 +7,6 @@ function usage() echo "Options for subcommand 'pack_server':" echo " -h" echo " -p|--update-package-template " - echo " -b|--custom-boost-lib" echo " -g|--custom-gcc" exit 0 } @@ -63,7 +62,6 @@ if [ -n "$MINOS_CONFIG_FILE" ]; then pack_template=`dirname $MINOS_CONFIG_FILE`/xiaomi-config/package/pegasus.yaml fi -custom_boost_lib="false" custom_gcc="false" while [[ $# > 0 ]]; do @@ -73,9 +71,6 @@ while [[ $# > 0 ]]; do pack_template="$2" shift ;; - -b|--custom-boost-lib) - custom_boost_lib="true" - ;; -g|--custom-gcc) custom_gcc="true" ;; @@ -93,12 +88,10 @@ copy_file ./DSN_ROOT/lib/libdsn_replica_server.so ${pack}/bin copy_file ./DSN_ROOT/lib/libdsn_utils.so ${pack}/bin copy_file ./rdsn/thirdparty/output/lib/libPoco*.so.48 ${pack}/bin copy_file ./rdsn/thirdparty/output/lib/libtcmalloc_and_profiler.so.4 ${pack}/bin +copy_file ./rdsn/thirdparty/output/lib/libboost*.so.1.69.0 ${pack}/bin copy_file ./scripts/sendmail.sh ${pack}/bin copy_file ./src/server/config.ini ${pack}/bin -copy_file `get_boost_lib $custom_boost_lib system` ${pack}/bin -copy_file `get_boost_lib $custom_boost_lib filesystem` ${pack}/bin -copy_file `get_boost_lib $custom_boost_lib regex` ${pack}/bin copy_file `get_stdcpp_lib $custom_gcc` ${pack}/bin copy_file `get_system_lib server snappy` ${pack}/bin/`get_system_libname server snappy` copy_file `get_system_lib server crypto` ${pack}/bin/`get_system_libname server crypto` diff --git a/scripts/pack_tools.sh b/scripts/pack_tools.sh index c55e4b991c54adbb01980d86174a9e7492472f4e..6f172a34260dd2ad48cba3479d34b79f1ff14345 100755 --- a/scripts/pack_tools.sh +++ b/scripts/pack_tools.sh @@ -7,7 +7,6 @@ function usage() echo "Options for subcommand 'pack_tools':" echo " -h" echo " -p|--update-package-template " - echo " -b|--custom-boost-lib" echo " -g|--custom-gcc" exit 0 } @@ -63,7 +62,6 @@ if [ -n "$MINOS_CONFIG_FILE" ]; then pack_template=`dirname $MINOS_CONFIG_FILE`/xiaomi-config/package/pegasus.yaml fi -custom_boost_lib="false" custom_gcc="false" while [[ $# > 0 ]]; do @@ -73,9 +71,6 @@ while [[ $# > 0 ]]; do pack_template="$2" shift ;; - -b|--custom-boost-lib) - custom_boost_lib="true" - ;; -g|--custom-gcc) custom_gcc="true" ;; @@ -101,9 +96,7 @@ mkdir -p ${pack}/DSN_ROOT/lib copy_file ./DSN_ROOT/lib/*.so* ${pack}/DSN_ROOT/lib/ copy_file ./rdsn/thirdparty/output/lib/libPoco*.so.48 ${pack}/DSN_ROOT/lib/ copy_file ./rdsn/thirdparty/output/lib/libtcmalloc_and_profiler.so.4 ${pack}/DSN_ROOT/lib/ -copy_file `get_boost_lib $custom_boost_lib system` ${pack}/DSN_ROOT/lib/ -copy_file `get_boost_lib $custom_boost_lib filesystem` ${pack}/DSN_ROOT/lib/ -copy_file `get_boost_lib $custom_boost_lib regex` ${pack}/DSN_ROOT/lib/ +copy_file ./rdsn/thirdparty/output/lib/libboost*.so.1.69.0 ${pack}/DSN_ROOT/lib/ copy_file `get_stdcpp_lib $custom_gcc` ${pack}/DSN_ROOT/lib/ copy_file `get_system_lib shell snappy` ${pack}/DSN_ROOT/lib/`get_system_libname shell snappy` copy_file `get_system_lib shell crypto` ${pack}/DSN_ROOT/lib/`get_system_libname shell crypto`