Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -363,9 +363,9 @@ if [[ ! -f "${DORIS_THIRDPARTY}/installed/lib/${LAST_THIRDPARTY_LIB}" ]]; then
rm -rf "${DORIS_THIRDPARTY}/installed"

if [[ "${CLEAN}" -eq 0 ]]; then
"${DORIS_THIRDPARTY}/build-thirdparty.sh" -j "${PARALLEL}"
bash "${DORIS_THIRDPARTY}/build-thirdparty.sh" -j "${PARALLEL}"
else
"${DORIS_THIRDPARTY}/build-thirdparty.sh" -j "${PARALLEL}" --clean
bash "${DORIS_THIRDPARTY}/build-thirdparty.sh" -j "${PARALLEL}" --clean
fi
fi

Expand Down Expand Up @@ -597,7 +597,7 @@ echo "Feature List: ${DORIS_FEATURE_LIST}"
if [[ "${CLEAN}" -eq 1 ]]; then
clean_gensrc
fi
"${DORIS_HOME}"/generated-source.sh noclean
bash "${DORIS_HOME}"/generated-source.sh noclean

# Assesmble FE modules
FE_MODULES=''
Expand Down Expand Up @@ -901,7 +901,7 @@ if [[ "${BUILD_FE}" -eq 1 ]]; then
#cp -r -p "${DORIS_HOME}/docs/build/help-resource.zip" "${DORIS_OUTPUT}/fe/lib"/

# Third-party filesystem jars (JuiceFS, JindoFS) are packaged by post-build.sh
"${DORIS_HOME}/post-build.sh" --fe --output "${DORIS_OUTPUT}"
bash "${DORIS_HOME}/post-build.sh" --fe --output "${DORIS_OUTPUT}"

cp -r -p "${DORIS_HOME}/minidump" "${DORIS_OUTPUT}/fe"/
cp -r -p "${DORIS_HOME}/webroot/static" "${DORIS_OUTPUT}/fe/webroot"/
Expand Down Expand Up @@ -1113,7 +1113,7 @@ EOF
done

# Third-party filesystem jars (JuiceFS, JindoFS) are packaged by post-build.sh
"${DORIS_HOME}/post-build.sh" --be --output "${DORIS_OUTPUT}"
bash "${DORIS_HOME}/post-build.sh" --be --output "${DORIS_OUTPUT}"

cp -r -p "${DORIS_THIRDPARTY}/installed/webroot"/* "${DORIS_OUTPUT}/be/www"/
copy_common_files "${DORIS_OUTPUT}/be/"
Expand All @@ -1132,7 +1132,7 @@ if [[ "${BUILD_BROKER}" -eq 1 ]]; then
install -d "${DORIS_OUTPUT}/apache_hdfs_broker"

cd "${DORIS_HOME}/fs_brokers/apache_hdfs_broker"
./build.sh
bash ./build.sh
rm -rf "${DORIS_OUTPUT}/apache_hdfs_broker"/*
cp -r -p "${DORIS_HOME}/fs_brokers/apache_hdfs_broker/output/apache_hdfs_broker"/* "${DORIS_OUTPUT}/apache_hdfs_broker"/
copy_common_files "${DORIS_OUTPUT}/apache_hdfs_broker/"
Expand All @@ -1142,7 +1142,7 @@ fi
if [[ "${BUILD_BE_CDC_CLIENT}" -eq 1 ]]; then
install -d "${DORIS_OUTPUT}/be/lib/cdc_client"
cd "${DORIS_HOME}/fs_brokers/cdc_client"
./build.sh
bash ./build.sh
rm -rf "${DORIS_OUTPUT}/be/lib/cdc_client"/*
cp -r -p "${DORIS_HOME}/fs_brokers/cdc_client/target/cdc-client.jar" "${DORIS_OUTPUT}/be/lib/cdc_client/"
cd "${DORIS_HOME}"
Expand Down
2 changes: 1 addition & 1 deletion gensrc/script/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -38,5 +38,5 @@ gen_func: ${GEN_FUNC_OUTPUT}

# generate version info
gen_version:
${CURDIR}/gen_build_version.sh
bash ${CURDIR}/gen_build_version.sh
.PHONY: gen_version
2 changes: 1 addition & 1 deletion run-fe-ut.sh
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ echo "******************************"
#cp build/help-resource.zip "${DORIS_HOME}"/fe/fe-core/src/test/resources/real-help-resource.zip
#cd "${DORIS_HOME}"

"${DORIS_HOME}"/generated-source.sh
bash "${DORIS_HOME}"/generated-source.sh

cd "${DORIS_HOME}/fe"
mkdir -p build/compile
Expand Down
2 changes: 1 addition & 1 deletion thirdparty/build-thirdparty.sh
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ if [[ "${CLEAN}" -eq 1 ]] && [[ -d "${TP_SOURCE_DIR}" ]]; then
fi

# Download thirdparties.
eval "${TP_DIR}/download-thirdparty.sh ${packages[*]}"
eval "bash ${TP_DIR}/download-thirdparty.sh ${packages[*]}"

export LD_LIBRARY_PATH="${TP_DIR}/installed/lib:${LD_LIBRARY_PATH}"

Expand Down
Loading