diff --git a/README.md b/README.md index 0ddbd8ba6ed091b46cb362643b99979230f2dad3..4d9562da59743b24b29d11422b987bd3a6ba5c5f 100644 --- a/README.md +++ b/README.md @@ -192,41 +192,41 @@ export PATH=$GCC_PATH/gcc/bin:$CMAKEROOT/bin:$PATH ### 编译三方库 -进入到`openGauss-third_party/build` 目录下，执行`sh build_all.sh`，编译全量的三方组件。 +进入到`openGauss-third_party/build` 目录下，执行`bash build_all.sh`，编译全量的三方组件。 build_all.sh中先编译了openssl，然后编译buildtools, platform, dependency 和 component，可以对这三个按顺序分别编译: ***build tools*** ``` -cd openGauss-third_party/build_tools -sh build_tools.sh +cd openGauss-third_party/buildtools +bash build_tools.sh ``` ***build platform*** ``` cd openGauss-third_party/platform/build/ -sh build_platform.sh +bash build_platform.sh ``` ***build dependency*** ``` cd openGauss-third_party/dependency/build/ -sh build_dependency.sh +bash build_dependency.sh ``` ***build component*** ``` cd openGauss-third_party/component/build/ -sh build_component.sh +bash build_component.sh ``` ### openEuler系统编译Python3 -由于openEuler系统上openssl版本与openGauss三方库中版本不一致导致的兼容性问题，在使用OM安装，建立互信时候会出现错误。在openEuler上编译三方库完成后还需要编译下Python3。 +由于操作系统上openssl版本与openGauss三方库中版本不一致可能会导致兼容性问题，在使用OM安装，建立互信时候会出现错误。在编译三方库完成后对 Python3 也进行重新编译。 操作如下： ``` cd openGauss-third_party/build_tools/python3 -sh build.sh +bash build.sh ``` ### 编译完成 diff --git a/build/build_all.sh b/build/build_all.sh index 072559205359b8960c1657331d21093b2f6e39c8..b909e3575512c5c0796a80d1820dfd4079c7350f 100644 --- a/build/build_all.sh +++ b/build/build_all.sh @@ -46,19 +46,19 @@ echo "[openssl] $use_tm" start_tm=$(date +%s%N) # build platform cd ${TOOLS_BUILD_PATH} -sh build_tools.sh +bash build_tools.sh # build platform cd ${PLATFORM_BUILD_PATH} -sh build_platform.sh +bash build_platform.sh # build dependency cd ${DEPENDENCY_BUILD_PATH} -sh build_dependency.sh +bash build_dependency.sh # build component cd ${COMPONENT_BUILD_PATH} -sh build_component.sh +bash build_component.sh end_tm=$(date +%s%N) use_tm=$(echo $end_tm $start_tm | awk '{ print ($1 - $2) / 1000000000}' | xargs printf "%.2f") diff --git a/buildtools/build_tools.sh b/buildtools/build_tools.sh index 6a645320f34e8ec2d0cf69ef3fc368e284d4eb45..ff6d3fa5ed6e59079f5fb308537260a4e5bcd2ea 100644 --- a/buildtools/build_tools.sh +++ b/buildtools/build_tools.sh @@ -18,7 +18,7 @@ PLATFORM="$(bash ${ROOT_DIR}/build/get_PlatForm_str.sh)" echo --------------------------------python3------------------------------------------------- start_tm=$(date +%s%N) cd $(pwd)/python3 -sh ./build.sh >> build_tools.log +bash ./build.sh >> build_tools.log end_tm=$(date +%s%N) use_tm=$(echo $end_tm $start_tm | awk '{ print ($1 - $2) / 1000000000}' | xargs printf "%.2f") echo "[python3] $use_tm" @@ -27,7 +27,7 @@ cd .. echo ---------------------------license_control--------------------------------------------- start_tm=$(date +%s%N) cd $(pwd)/license_control -sh ./build.sh >> build_tools.log +bash ./build.sh >> build_tools.log end_tm=$(date +%s%N) use_tm=$(echo $end_tm $start_tm | awk '{ print ($1 - $2) / 1000000000}' | xargs printf "%.2f") echo "[license_control] $use_tm" diff --git a/buildtools/python/build.sh b/buildtools/python/build.sh index daeeb21d492064a674199de4f1222b177dacd04b..ed20c2e3f5964e270acd95903d7008a48ba5e47d 100644 --- a/buildtools/python/build.sh +++ b/buildtools/python/build.sh @@ -8,7 +8,7 @@ ####################################################################### set -e -PLATFORM=$(sh $(pwd)/../../build/get_PlatForm_str.sh) +PLATFORM=$(bash $(pwd)/../../build/get_PlatForm_str.sh) export SSL_PATH=$(pwd)/../../dependency/openssl/install/comm/lib export LD_LIBRARY_PATH=${SSL_PATH}:${LD_LIBRARY_PATH} if [ ${PLATFORM} == "euleros2.0_sp5_x86_64" ]; then diff --git a/buildtools/python3/build.sh b/buildtools/python3/build.sh index 1ab8817103f70be80ad4ab1273c5cd67105d8b31..1eb36a9c0a2d64de93c585ecfeee0465b9f52b72 100644 --- a/buildtools/python3/build.sh +++ b/buildtools/python3/build.sh @@ -9,7 +9,7 @@ set -e # Use for Plpython3u -PLATFORM=$(sh $(pwd)/../../build/get_PlatForm_str.sh) +PLATFORM=$(bash $(pwd)/../../build/get_PlatForm_str.sh) SSL_PATH=$(pwd)/../../output/kernel/dependency/openssl/comm/ if [ ! -d $SSL_PATH ]; then diff --git a/component/build/build_component.sh b/component/build/build_component.sh index f9887397e1c495fab150bb0b1f9d868cbd9a9fb5..c45ed314bce1bbb72bf984b773854330409c52f5 100644 --- a/component/build/build_component.sh +++ b/component/build/build_component.sh @@ -19,35 +19,35 @@ PLATFORM="$(bash ${ROOT_DIR}/build/get_PlatForm_str.sh)" echo ------------------------------CBB---------------------------------------------- start_tm=$(date +%s%N) cd $(pwd)/../cbb -sh build.sh >>../build/build_result.log +bash build.sh >>../build/build_result.log end_tm=$(date +%s%N) use_tm=$(echo $end_tm $start_tm | awk '{ print ($1 - $2) / 1000000000}' | xargs printf "%.2f") echo "[CBB] is " $use_tm echo ------------------------------DCF---------------------------------------------- start_tm=$(date +%s%N) cd $(pwd)/../dcf -sh build.sh >>../build/build_result.log +bash build.sh >>../build/build_result.log end_tm=$(date +%s%N) use_tm=$(echo $end_tm $start_tm | awk '{ print ($1 - $2) / 1000000000}' | xargs printf "%.2f") echo "[DCF] is " $use_tm echo ------------------------------DCC---------------------------------------------- start_tm=$(date +%s%N) cd $(pwd)/../dcc -sh build.sh >>../build/build_result.log +bash build.sh >>../build/build_result.log end_tm=$(date +%s%N) use_tm=$(echo $end_tm $start_tm | awk '{ print ($1 - $2) / 1000000000}' | xargs printf "%.2f") echo "[DCC] is " $use_tm echo ------------------------------DMS---------------------------------------------- start_tm=$(date +%s%N) cd $(pwd)/../dms -sh build.sh >>../build/build_result.log +bash build.sh >>../build/build_result.log end_tm=$(date +%s%N) use_tm=$(echo $end_tm $start_tm | awk '{ print ($1 - $2) / 1000000000}' | xargs printf "%.2f") echo "[DMS] is " $use_tm echo ------------------------------DSS---------------------------------------------- start_tm=$(date +%s%N) cd $(pwd)/../dss -sh build.sh >>../build/build_result.log +bash build.sh >>../build/build_result.log end_tm=$(date +%s%N) use_tm=$(echo $end_tm $start_tm | awk '{ print ($1 - $2) / 1000000000}' | xargs printf "%.2f") echo "[DSS] is " $use_tm diff --git a/component/cbb/build.sh b/component/cbb/build.sh index 77417fb6fce181ffdd5be1b23fc5cf1ea69eaf42..aa577a1b2cc49eb4b6333719e5b0decc01492168 100644 --- a/component/cbb/build.sh +++ b/component/cbb/build.sh @@ -23,7 +23,7 @@ cd CBB LOCAL_PATH="$(pwd)" LOCAL_DIR=$(dirname "${LOCAL_PATH}") ROOT_DIR="${PWD}/../../.." -export PLAT_FORM_STR=$(sh ${LOCAL_DIR}/../../build/get_PlatForm_str.sh) +export PLAT_FORM_STR=$(bash ${LOCAL_DIR}/../../build/get_PlatForm_str.sh) cp -r ${GCC_PATH} ${ROOT_DIR}/output/buildtools/ -sh -x build.sh -3rd "${ROOT_DIR}/output" \ No newline at end of file +bash -x build.sh -3rd "${ROOT_DIR}/output" \ No newline at end of file diff --git a/component/dcc/build.sh b/component/dcc/build.sh index 8f3311d30f23c085a170857950f565c742b2b05b..48b3dec135258e552d070a9f017c9db435f0382b 100644 --- a/component/dcc/build.sh +++ b/component/dcc/build.sh @@ -23,7 +23,7 @@ cd DCC LOCAL_PATH="$(pwd)" LOCAL_DIR=$(dirname "${LOCAL_PATH}") ROOT_DIR="${PWD}/../../../" -export PLAT_FORM_STR=$(sh ${LOCAL_DIR}/../../build/get_PlatForm_str.sh) +export PLAT_FORM_STR=$(bash ${LOCAL_DIR}/../../build/get_PlatForm_str.sh) cd build/linux/opengauss -sh -x build.sh -3rd "${ROOT_DIR}/output" -m Release -t cmake \ No newline at end of file +bash -x build.sh -3rd "${ROOT_DIR}/output" -m Release -t cmake \ No newline at end of file diff --git a/component/dcf/build.sh b/component/dcf/build.sh index c0b532b3a6e397e91310bd42b1b5dc28d44841bf..f229be50a39c4a03cc6a92da0ccaae74c28b8ea4 100644 --- a/component/dcf/build.sh +++ b/component/dcf/build.sh @@ -23,7 +23,7 @@ cd DCF LOCAL_PATH="$(pwd)" LOCAL_DIR=$(dirname "${LOCAL_PATH}") ROOT_DIR="${PWD}/../../.." -export PLAT_FORM_STR=$(sh ${LOCAL_DIR}/../../build/get_PlatForm_str.sh) +export PLAT_FORM_STR=$(bash ${LOCAL_DIR}/../../build/get_PlatForm_str.sh) cd build/linux/opengauss -sh -x build.sh -3rd "${ROOT_DIR}/output" -m Release -t cmake +bash -x build.sh -3rd "${ROOT_DIR}/output" -m Release -t cmake diff --git a/component/dms/build.sh b/component/dms/build.sh index 0e05401987aea4d7e9254e3a3aed437c54da9b87..5ae23ef9d12d1d19514ecaa0a5f3b42640d18235 100644 --- a/component/dms/build.sh +++ b/component/dms/build.sh @@ -23,7 +23,7 @@ cd DMS LOCAL_PATH="$(pwd)" LOCAL_DIR=$(dirname "${LOCAL_PATH}") ROOT_DIR="${PWD}/../../.." -export PLAT_FORM_STR=$(sh ${LOCAL_DIR}/../../build/get_PlatForm_str.sh) +export PLAT_FORM_STR=$(bash ${LOCAL_DIR}/../../build/get_PlatForm_str.sh) cd build/linux/opengauss -sh -x build.sh -3rd "${ROOT_DIR}/output/" +bash -x build.sh -3rd "${ROOT_DIR}/output/" diff --git a/component/dss/build.sh b/component/dss/build.sh index 37582648a9ef01f3fc7cbb4a98249ae1ac5d3e33..f6c688a69e52f5021eebd2c41ceced51cb89dcbb 100644 --- a/component/dss/build.sh +++ b/component/dss/build.sh @@ -23,7 +23,7 @@ cd DSS LOCAL_PATH="$(pwd)" LOCAL_DIR=$(dirname "${LOCAL_PATH}") ROOT_DIR="${PWD}/../../.." -export PLAT_FORM_STR=$(sh ${LOCAL_DIR}/../../build/get_PlatForm_str.sh) +export PLAT_FORM_STR=$(bash ${LOCAL_DIR}/../../build/get_PlatForm_str.sh) cd build/linux/opengauss -sh -x build.sh -3rd "${ROOT_DIR}/output/" +bash -x build.sh -3rd "${ROOT_DIR}/output/" diff --git a/dependency/bcrypt/build.sh b/dependency/bcrypt/build.sh index 432a845731d151d3cc0cfa0fd93e0f92717dc10a..5203e0ace44c64f39ffa589be88e8a5e96cc61b0 100644 --- a/dependency/bcrypt/build.sh +++ b/dependency/bcrypt/build.sh @@ -6,7 +6,7 @@ ####################################################################### set -e ROOT_DIR=$(pwd) -PLATFORM=$(sh $(pwd)/../../build/get_PlatForm_str.sh) +PLATFORM=$(bash $(pwd)/../../build/get_PlatForm_str.sh) mkdir -p $(pwd)/../../output/install_tools/ python_version=`python3 -V | awk -F ' ' '{print $2}' |awk -F '.' -v OFS='.' '{print $1,$2}'` export TARGET_PATH=$(pwd)/../../output/install_tools diff --git a/dependency/build/build_dependency.sh b/dependency/build/build_dependency.sh index c89f5c68add14557191cb10de042aeec9932cfe0..8f693124e91549b2dcb3407f8085f89c928f163a 100644 --- a/dependency/build/build_dependency.sh +++ b/dependency/build/build_dependency.sh @@ -18,7 +18,7 @@ ROOT_DIR="${PWD}/../.." echo ------------------------------cJSON------------------------------------------------------ start_tm=$(date +%s%N) cd $(pwd)/../cJSON -sh build.sh -m all >>../build/build_result.log +bash build.sh -m all >>../build/build_result.log end_tm=$(date +%s%N) use_tm=$(echo $end_tm $start_tm | awk '{ print ($1 - $2) / 1000000000}' | xargs printf "%.2f") echo "[cJSON] is " $use_tm @@ -48,7 +48,7 @@ echo "[numactl] is " $use_tm echo ------------------------------unixodbc-------------------------------------------------- start_tm=$(date +%s%N) cd $(pwd)/../unixodbc -sh build.sh -m all >>../build/build_result.log +bash build.sh -m all >>../build/build_result.log end_tm=$(date +%s%N) use_tm=$(echo $end_tm $start_tm | awk '{ print ($1 - $2) / 1000000000}' | xargs printf "%.2f") echo "[unixodbc] is " $use_tm @@ -78,21 +78,21 @@ echo $use_tm echo -------------------------------asn1crypto------------------------------------------------- start_tm=$(date +%s%N) cd $(pwd)/../asn1crypto -sh build.sh >>../build/build_result.log +bash build.sh >>../build/build_result.log end_tm=$(date +%s%N) use_tm=$(echo $end_tm $start_tm | awk '{ print ($1 - $2) / 1000000000}' | xargs printf "%.2f") echo "[asn1crypto] $use_tm" echo ---------------------------------six----------------------------------------------------- start_tm=$(date +%s%N) cd $(pwd)/../six -sh build.sh >>../build/build_result.log +bash build.sh >>../build/build_result.log end_tm=$(date +%s%N) use_tm=$(echo $end_tm $start_tm | awk '{ print ($1 - $2) / 1000000000}' | xargs printf "%.2f") echo "[six] $use_tm" echo -------------------------------ipaddres-------------------------------------------------- start_tm=$(date +%s%N) cd $(pwd)/../ipaddress -sh build.sh >>../build/build_result.log +bash build.sh >>../build/build_result.log end_tm=$(date +%s%N) use_tm=$(echo $end_tm $start_tm | awk '{ print ($1 - $2) / 1000000000}' | xargs printf "%.2f") echo "[ipaddress] $use_tm" @@ -101,21 +101,21 @@ echo "[ipaddress] $use_tm" echo -------------------------------pycparser------------------------------------------------- start_tm=$(date +%s%N) cd $(pwd)/../pycparser -sh build.sh >>../build/build_result.log +bash build.sh >>../build/build_result.log end_tm=$(date +%s%N) use_tm=$(echo $end_tm $start_tm | awk '{ print ($1 - $2) / 1000000000}' | xargs printf "%.2f") echo "[pycparser] $use_tm" echo ---------------------------------cffi---------------------------------------------------- start_tm=$(date +%s%N) cd $(pwd)/../cffi -sh build.sh >>../build/build_result.log +bash build.sh >>../build/build_result.log end_tm=$(date +%s%N) use_tm=$(echo $end_tm $start_tm | awk '{ print ($1 - $2) / 1000000000}' | xargs printf "%.2f") echo "[cffi] $use_tm" echo -------------------------------cryptography---------------------------------------------- start_tm=$(date +%s%N) cd $(pwd)/../cryptography -sh build.sh >>../build/build_result.log +bash build.sh >>../build/build_result.log end_tm=$(date +%s%N) use_tm=$(echo $end_tm $start_tm | awk '{ print ($1 - $2) / 1000000000}' | xargs printf "%.2f") echo "[cryptography] $use_tm" @@ -124,28 +124,28 @@ echo "[cryptography] $use_tm" echo ---------------------------------bcrypt-------------------------------------------------- start_tm=$(date +%s%N) cd $(pwd)/../bcrypt -sh build.sh >>../build/build_result.log +bash build.sh >>../build/build_result.log end_tm=$(date +%s%N) use_tm=$(echo $end_tm $start_tm | awk '{ print ($1 - $2) / 1000000000}' | xargs printf "%.2f") echo "[bcrypt] $use_tm" echo ---------------------------------bottle-------------------------------------------------- start_tm=$(date +%s%N) cd $(pwd)/../bottle -sh build.sh >>../build/build_result.log +bash build.sh >>../build/build_result.log end_tm=$(date +%s%N) use_tm=$(echo $end_tm $start_tm | awk '{ print ($1 - $2) / 1000000000}' | xargs printf "%.2f") echo "[bottle] $use_tm" echo ---------------------------------tornado-------------------------------------------------- start_tm=$(date +%s%N) cd $(pwd)/../tornado -sh build.sh >>../build/build_result.log +bash build.sh >>../build/build_result.log end_tm=$(date +%s%N) use_tm=$(echo $end_tm $start_tm | awk '{ print ($1 - $2) / 1000000000}' | xargs printf "%.2f") echo "[tornado] $use_tm" echo -------------------------------------dmlc-core---------------------------------------------- start_tm=$(date +%s%N) cd $(pwd)/../dmlc-core -sh build.sh >>../build/build_result.log +bash build.sh >>../build/build_result.log end_tm=$(date +%s%N) use_tm=$(echo $end_tm $start_tm | awk '{ print ($1 - $2) / 1000000000}' | xargs printf "%.2f") echo "[dmlc-core] $use_tm" @@ -159,7 +159,7 @@ echo "[libedit] $use_tm" echo ----------------------------------idna--------------------------------------------------- start_tm=$(date +%s%N) cd $(pwd)/../idna -sh build.sh >>../build/build_result.log +bash build.sh >>../build/build_result.log end_tm=$(date +%s%N) use_tm=$(echo $end_tm $start_tm | awk '{ print ($1 - $2) / 1000000000}' | xargs printf "%.2f") echo "[idna] $use_tm" @@ -173,28 +173,28 @@ echo "[nanomsg] $use_tm" echo ----------------------------------netifaces---------------------------------------------- start_tm=$(date +%s%N) cd $(pwd)/../netifaces -sh build.sh >>../build/build_result.log +bash build.sh >>../build/build_result.log end_tm=$(date +%s%N) use_tm=$(echo $end_tm $start_tm | awk '{ print ($1 - $2) / 1000000000}' | xargs printf "%.2f") echo "[netifaces] $use_tm" echo -------------------------------------paste----------------------------------------------- start_tm=$(date +%s%N) cd $(pwd)/../paste -sh build.sh >>../build/build_result.log +bash build.sh >>../build/build_result.log end_tm=$(date +%s%N) use_tm=$(echo $end_tm $start_tm | awk '{ print ($1 - $2) / 1000000000}' | xargs printf "%.2f") echo "[paste] $use_tm" echo -------------------------------------psutil---------------------------------------------- start_tm=$(date +%s%N) cd $(pwd)/../psutil -sh build.sh >>../build/build_result.log +bash build.sh >>../build/build_result.log end_tm=$(date +%s%N) use_tm=$(echo $end_tm $start_tm | awk '{ print ($1 - $2) / 1000000000}' | xargs printf "%.2f") echo "[psutil] $use_tm" echo -------------------------------------pyasn1---------------------------------------------- start_tm=$(date +%s%N) cd $(pwd)/../pyasn1 -sh build.sh >>../build/build_result.log +bash build.sh >>../build/build_result.log end_tm=$(date +%s%N) use_tm=$(echo $end_tm $start_tm | awk '{ print ($1 - $2) / 1000000000}' | xargs printf "%.2f") echo "[pyasn1] $use_tm" @@ -203,56 +203,56 @@ echo "[pyasn1] $use_tm" echo --------------------------------------pynacl--------------------------------------------- start_tm=$(date +%s%N) cd $(pwd)/../pynacl -sh build.sh >>../build/build_result.log +bash build.sh >>../build/build_result.log end_tm=$(date +%s%N) use_tm=$(echo $end_tm $start_tm | awk '{ print ($1 - $2) / 1000000000}' | xargs printf "%.2f") echo "[pynacl] $use_tm" echo -----------------------------------paramiko---------------------------------------------- start_tm=$(date +%s%N) cd $(pwd)/../paramiko -sh build.sh >>../build/build_result.log +bash build.sh >>../build/build_result.log end_tm=$(date +%s%N) use_tm=$(echo $end_tm $start_tm | awk '{ print ($1 - $2) / 1000000000}' | xargs printf "%.2f") echo "[paramiko] $use_tm" echo --------------------------------------pyOpenSSL------------------------------------------ start_tm=$(date +%s%N) cd $(pwd)/../pyOpenSSL -sh build.sh >>../build/build_result.log +bash build.sh >>../build/build_result.log end_tm=$(date +%s%N) use_tm=$(echo $end_tm $start_tm | awk '{ print ($1 - $2) / 1000000000}' | xargs printf "%.2f") echo "[pyOpenSSL] $use_tm" echo -----------------------------------------lz4--------------------------------------------- start_tm=$(date +%s%N) cd $(pwd)/../lz4 -sh build.sh -m all >>../build/build_result.log +bash build.sh -m all >>../build/build_result.log end_tm=$(date +%s%N) use_tm=$(echo $end_tm $start_tm | awk '{ print ($1 - $2) / 1000000000}' | xargs printf "%.2f") echo "[lz4] $use_tm" echo -----------------------------------------zlib-------------------------------------------- start_tm=$(date +%s%N) cd $(pwd)/../zlib -sh build.sh -m all >>../build/build_result.log +bash build.sh -m all >>../build/build_result.log end_tm=$(date +%s%N) use_tm=$(echo $end_tm $start_tm | awk '{ print ($1 - $2) / 1000000000}' | xargs printf "%.2f") echo "[zlib] $use_tm" echo -----------------------------------------boost------------------------------------------- start_tm=$(date +%s%N) cd $(pwd)/../boost -sh build.sh -m all >>../build/build_result.log +bash build.sh -m all >>../build/build_result.log end_tm=$(date +%s%N) use_tm=$(echo $end_tm $start_tm | awk '{ print ($1 - $2) / 1000000000}' | xargs printf "%.2f") echo "[boost] $use_tm" # echo ----------------------------------------brotli------------------------------------------- # start_tm=$(date +%s%N) # cd $(pwd)/../brotli -# sh build.sh >>../build/build_result.log +# bash build.sh >>../build/build_result.log # end_tm=$(date +%s%N) # use_tm=$(echo $end_tm $start_tm | awk '{ print ($1 - $2) / 1000000000}' | xargs printf "%.2f") # echo "[brotli] $use_tm" echo -----------------------------------------zstd-------------------------------------------- start_tm=$(date +%s%N) cd $(pwd)/../zstd -sh build.sh >>../build/build_result.log +bash build.sh >>../build/build_result.log end_tm=$(date +%s%N) use_tm=$(echo $end_tm $start_tm | awk '{ print ($1 - $2) / 1000000000}' | xargs printf "%.2f") echo "[zstd] $use_tm" @@ -266,42 +266,42 @@ echo "[kerberos] $use_tm" echo ---------------------------------------libcurl------------------------------------------- start_tm=$(date +%s%N) cd $(pwd)/../libcurl -sh build.sh >>../build/build_result.log +bash build.sh >>../build/build_result.log end_tm=$(date +%s%N) use_tm=$(echo $end_tm $start_tm | awk '{ print ($1 - $2) / 1000000000}' | xargs printf "%.2f") echo "[libcurl] $use_tm" echo --------------------------------------libiconv------------------------------------------- start_tm=$(date +%s%N) cd $(pwd)/../libiconv -sh build.sh >>../build/build_result.log +bash build.sh >>../build/build_result.log end_tm=$(date +%s%N) use_tm=$(echo $end_tm $start_tm | awk '{ print ($1 - $2) / 1000000000}' | xargs printf "%.2f") echo "[libiconv] $use_tm" echo ---------------------------------------libxml2------------------------------------------ start_tm=$(date +%s%N) cd $(pwd)/../libxml2 -sh build.sh -m all >>../build/build_result.log +bash build.sh -m all >>../build/build_result.log end_tm=$(date +%s%N) use_tm=$(echo $end_tm $start_tm | awk '{ print ($1 - $2) / 1000000000}' | xargs printf "%.2f") echo "[libxml2] $use_tm" echo ---------------------------------------nghttp2------------------------------------------ start_tm=$(date +%s%N) cd $(pwd)/../nghttp2 -sh build.sh >>../build/build_result.log +bash build.sh >>../build/build_result.log end_tm=$(date +%s%N) use_tm=$(echo $end_tm $start_tm | awk '{ print ($1 - $2) / 1000000000}' | xargs printf "%.2f") echo "[nghttp2] $use_tm" echo ----------------------------------------pcre--------------------------------------------- start_tm=$(date +%s%N) cd $(pwd)/../pcre -sh build.sh >>../build/build_result.log +bash build.sh >>../build/build_result.log end_tm=$(date +%s%N) use_tm=$(echo $end_tm $start_tm | awk '{ print ($1 - $2) / 1000000000}' | xargs printf "%.2f") echo "[pcre] $use_tm" echo ---------------------------------------esdk_obs_api-------------------------------------- start_tm=$(date +%s%N) cd $(pwd)/../esdk_obs_api -sh build.sh >>../build/build_result.log +bash build.sh >>../build/build_result.log end_tm=$(date +%s%N) use_tm=$(echo $end_tm $start_tm | awk '{ print ($1 - $2) / 1000000000}' | xargs printf "%.2f") echo "[esdk_obs_api] $use_tm" @@ -318,7 +318,7 @@ echo "[pljava] $use_tm" echo ---------------------------------------sqlparse----------------------------------- start_tm=$(date +%s%N) cd $(pwd)/../sqlparse -sh build.sh -m build >>../build/build_result.log +bash build.sh -m build >>../build/build_result.log end_tm=$(date +%s%N) use_tm=$(echo $end_tm $start_tm | awk '{ print ($1 - $2) / 1000000000}' | xargs printf "%.2f") echo "[sqlparse] $use_tm" @@ -334,21 +334,21 @@ echo "[masstree] $use_tm" echo ---------------------------------------xgboost----------------------------------- start_tm=$(date +%s%N) cd $(pwd)/../xgboost -sh build.sh >>../build/build_result.log +bash build.sh >>../build/build_result.log end_tm=$(date +%s%N) use_tm=$(echo $end_tm $start_tm | awk '{ print ($1 - $2) / 1000000000}' | xargs printf "%.2f") echo "[libxgboost] $use_tm" echo ---------------------------------------libevent------------------------------------------ start_tm=$(date +%s%N) cd $(pwd)/../libevent -sh build.sh >> ../build/build_result.log +bash build.sh >> ../build/build_result.log end_tm=$(date +%s%N) use_tm=$(echo $end_tm $start_tm | awk '{ print ($1 - $2) / 1000000000}' | xargs printf "%.2f") echo "[libevent] $use_tm" echo ---------------------------------------aws-sdk-cpp------------------------------------------ start_tm=$(date +%s%N) cd $(pwd)/../aws-sdk-cpp -sh build.sh >> ../build/build_result.log +bash build.sh >> ../build/build_result.log end_tm=$(date +%s%N) use_tm=$(echo $end_tm $start_tm | awk '{ print ($1 - $2) / 1000000000}' | xargs printf "%.2f") echo "[aws-sdk-cpp] $use_tm" @@ -357,28 +357,28 @@ echo "[aws-sdk-cpp] $use_tm" echo ----------------------------------------etcd------------------------------------------- start_tm=$(date +%s%N) cd $(pwd)/../etcd -sh build.sh >>../build/build_result.log +bash build.sh >>../build/build_result.log end_tm=$(date +%s%N) use_tm=$(echo $end_tm $start_tm | awk '{ print ($1 - $2) / 1000000000}' | xargs printf "%.2f") echo "[etcd] $use_tm" echo ---------------------------------------oracle_fdw----------------------------------- start_tm=$(date +%s%N) cd $(pwd)/../oracle_fdw -sh build.sh >>../build/build_result.log +bash build.sh >>../build/build_result.log end_tm=$(date +%s%N) use_tm=$(echo $end_tm $start_tm | awk '{ print ($1 - $2) / 1000000000}' | xargs printf "%.2f") echo "[oracle_fdw] $use_tm" echo ---------------------------------------mysql_fdw----------------------------------- start_tm=$(date +%s%N) cd $(pwd)/../mysql_fdw -sh build.sh >>../build/build_result.log +bash build.sh >>../build/build_result.log end_tm=$(date +%s%N) use_tm=$(echo $end_tm $start_tm | awk '{ print ($1 - $2) / 1000000000}' | xargs printf "%.2f") echo "[mysql_fdw] $use_tm" echo ---------------------------------------memcheck----------------------------------- start_tm=$(date +%s%N) cd $(pwd)/../memcheck -sh build.sh >>../build/build_result.log +bash build.sh >>../build/build_result.log end_tm=$(date +%s%N) use_tm=$(echo $end_tm $start_tm | awk '{ print ($1 - $2) / 1000000000}' | xargs printf "%.2f") echo "[memcheck] $use_tm" \ No newline at end of file diff --git a/dependency/esdk_obs_api/README.txt b/dependency/esdk_obs_api/README.txt index 8158dbdf2c1c4a6da36a1783982cd21eaaa4d6ca..a53404f79ddf30565716e555a7e86a772a817598 100644 --- a/dependency/esdk_obs_api/README.txt +++ b/dependency/esdk_obs_api/README.txt @@ -1,10 +1,10 @@ -open source target name esdk_obs_api +open source target name : esdk_obs_api source code repository : product warehouse compile dependency: openssl, huawei-securec, pcre, iconv, nghttp2, xml2, curl -upgrade open source package method +upgrade open source package method: ----|pull command : python $(pwd)../../build/pull_open_source.py "path" "name" "id" |----path : the parent directory name - |----namethe package name in product warehouse - |----idpdm version id + |----name: the package name in product warehouse + |----id: pdm version id the compile command : Patch Info: diff --git a/dependency/libevent/build.sh b/dependency/libevent/build.sh index f51a70e19bca55680a7500a4855c654f1212c179..344358ff99a810925aea4af57c38a94b81702a18 100644 --- a/dependency/libevent/build.sh +++ b/dependency/libevent/build.sh @@ -3,7 +3,7 @@ # description: the script that make install libevent # date: 2020-06-08 # version: -1.0 -# history: +# history: 2025-03-06 # 2020-06-08 100 LOC. set -e @@ -43,7 +43,7 @@ function build_component() tar -zxf $TAR_FILE_NAME -C $SOURCE_CODE_PATH --strip-components 1 cd ${LOCAL_DIR}/${SOURCE_CODE_PATH} - sh autogen.sh + bash autogen.sh chmod +x configure if [ $? -ne 0 ]; then diff --git a/platform/build/build_platform.sh b/platform/build/build_platform.sh index 23bc1a38b456b35e34fe616064a2749c441c7b48..27feafa3ae2746339b6144cb4eac3ab06b63961c 100644 --- a/platform/build/build_platform.sh +++ b/platform/build/build_platform.sh @@ -15,8 +15,8 @@ PLATFORM_PATH=${ROOT_PATH}/platform # build huawei secure c lib cd ${PLATFORM_PATH}/Huawei_Secure_C -sh build.sh -m all +bash build.sh -m all # build huawei jdk cd ${PLATFORM_PATH}/openjdk8 -sh ./build.sh +bash ./build.sh diff --git a/platform/kmc/build.sh b/platform/kmc/build.sh index 3c67b2c1b330ffe76f9861afd069cfee264739d2..63b21a1d8df5a04c23157bc0e8ac492cd658b6fb 100644 --- a/platform/kmc/build.sh +++ b/platform/kmc/build.sh @@ -6,7 +6,7 @@ set -e SOURCE_FILE=KMC # config TARGET_PATH -PLATFORM=$(sh $(pwd)/../../build/get_PlatForm_str.sh) +PLATFORM=$(bash $(pwd)/../../build/get_PlatForm_str.sh) mkdir -p $(pwd)/../../output/platform/$PLATFORM/kmc/comm export TARGET_PATH=$(pwd)/../../output/platform/$PLATFORM/kmc/comm export LD_LIBRARY_PATH=$TARGET_PATH:$LD_LIBRARY_PATH