You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@doris.apache.org by mo...@apache.org on 2022/06/25 15:21:33 UTC
[doris] 01/02: [chore] Rename Doris binary output format (#10359)
This is an automated email from the ASF dual-hosted git repository.
morningman pushed a commit to branch dev-1.0.1
in repository https://gitbox.apache.org/repos/asf/doris.git
commit 54f5dd88dd73fa52f83d53b61905fa27234fc178
Author: morningman <mo...@163.com>
AuthorDate: Sat Jun 25 23:08:39 2022 +0800
[chore] Rename Doris binary output format (#10359)
---
be/src/service/CMakeLists.txt | 18 +++++++++---------
bin/start_be.sh | 6 +++---
bin/stop_be.sh | 2 +-
build.sh | 7 +++++--
fe/fe-core/pom.xml | 2 +-
5 files changed, 19 insertions(+), 16 deletions(-)
diff --git a/be/src/service/CMakeLists.txt b/be/src/service/CMakeLists.txt
index fb07d2cca7..31588b62ab 100644
--- a/be/src/service/CMakeLists.txt
+++ b/be/src/service/CMakeLists.txt
@@ -30,28 +30,28 @@ add_library(Service
)
if (${MAKE_TEST} STREQUAL "OFF")
- add_executable(palo_be
+ add_executable(doris_be
doris_main.cpp
)
# This permits libraries loaded by dlopen to link to the symbols in the program.
- set_target_properties(palo_be PROPERTIES ENABLE_EXPORTS 1)
+ set_target_properties(doris_be PROPERTIES ENABLE_EXPORTS 1)
- target_link_libraries(palo_be
+ target_link_libraries(doris_be
${DORIS_LINK_LIBS}
)
install(DIRECTORY DESTINATION ${OUTPUT_DIR}/lib/)
- install(TARGETS palo_be DESTINATION ${OUTPUT_DIR}/lib/)
+ install(TARGETS doris_be DESTINATION ${OUTPUT_DIR}/lib/)
if ("${STRIP_DEBUG_INFO}" STREQUAL "ON")
- add_custom_command(TARGET palo_be POST_BUILD
- COMMAND ${CMAKE_OBJCOPY} --only-keep-debug $<TARGET_FILE:palo_be> $<TARGET_FILE:palo_be>.dbg
- COMMAND ${CMAKE_STRIP} --strip-debug --strip-unneeded $<TARGET_FILE:palo_be>
- COMMAND ${CMAKE_OBJCOPY} --add-gnu-debuglink=$<TARGET_FILE:palo_be>.dbg $<TARGET_FILE:palo_be>
+ add_custom_command(TARGET doris_be POST_BUILD
+ COMMAND ${CMAKE_OBJCOPY} --only-keep-debug $<TARGET_FILE:doris_be> $<TARGET_FILE:doris_be>.dbg
+ COMMAND ${CMAKE_STRIP} --strip-debug --strip-unneeded $<TARGET_FILE:doris_be>
+ COMMAND ${CMAKE_OBJCOPY} --add-gnu-debuglink=$<TARGET_FILE:doris_be>.dbg $<TARGET_FILE:doris_be>
)
install(DIRECTORY DESTINATION ${OUTPUT_DIR}/lib/debug_info/)
- install(FILES $<TARGET_FILE:palo_be>.dbg DESTINATION ${OUTPUT_DIR}/lib/debug_info/)
+ install(FILES $<TARGET_FILE:doris_be>.dbg DESTINATION ${OUTPUT_DIR}/lib/debug_info/)
endif()
endif()
diff --git a/bin/start_be.sh b/bin/start_be.sh
index 7981c56938..17d3406e4e 100755
--- a/bin/start_be.sh
+++ b/bin/start_be.sh
@@ -104,7 +104,7 @@ if [ -f $pidfile ]; then
fi
fi
-chmod 755 ${DORIS_HOME}/lib/palo_be
+chmod 755 ${DORIS_HOME}/lib/doris_be
echo "start time: "$(date) >> $LOG_DIR/be.out
if [ ! -f /bin/limit3 ]; then
@@ -114,8 +114,8 @@ else
fi
if [ ${RUN_DAEMON} -eq 1 ]; then
- nohup $LIMIT ${DORIS_HOME}/lib/palo_be "$@" >> $LOG_DIR/be.out 2>&1 < /dev/null &
+ nohup $LIMIT ${DORIS_HOME}/lib/doris_be "$@" >> $LOG_DIR/be.out 2>&1 < /dev/null &
else
export DORIS_LOG_TO_STDERR=1
- $LIMIT ${DORIS_HOME}/lib/palo_be "$@" 2>&1 < /dev/null
+ $LIMIT ${DORIS_HOME}/lib/doris_be "$@" 2>&1 < /dev/null
fi
diff --git a/bin/stop_be.sh b/bin/stop_be.sh
index 03c6b7abe5..2ca1b47124 100755
--- a/bin/stop_be.sh
+++ b/bin/stop_be.sh
@@ -35,7 +35,7 @@ pidfile=$PID_DIR/be.pid
if [ -f $pidfile ]; then
pid=`cat $pidfile`
pidcomm=`ps -p $pid -o comm=`
- if [ "palo_be"x != "$pidcomm"x ]; then
+ if [ "doris_be"x != "$pidcomm"x ]; then
echo "ERROR: pid process may not be be. "
exit 1
fi
diff --git a/build.sh b/build.sh
index a5013530da..54cef6140a 100755
--- a/build.sh
+++ b/build.sh
@@ -206,7 +206,7 @@ if [[ -z ${USE_LIBCPP} ]]; then
USE_LIBCPP=OFF
fi
if [[ -z ${BUILD_META_TOOL} ]]; then
- BUILD_META_TOOL=ON
+ BUILD_META_TOOL=OFF
fi
if [[ -z ${USE_LLD} ]]; then
USE_LLD=OFF
@@ -347,7 +347,8 @@ if [ ${BUILD_FE} -eq 1 ]; then
cp -r -p ${DORIS_HOME}/conf/fe.conf ${DORIS_OUTPUT}/fe/conf/
rm -rf ${DORIS_OUTPUT}/fe/lib/*
cp -r -p ${DORIS_HOME}/fe/fe-core/target/lib/* ${DORIS_OUTPUT}/fe/lib/
- cp -r -p ${DORIS_HOME}/fe/fe-core/target/palo-fe.jar ${DORIS_OUTPUT}/fe/lib/
+ rm -f ${DORIS_OUTPUT}/fe/lib/palo-fe.jar
+ cp -r -p ${DORIS_HOME}/fe/fe-core/target/doris-fe.jar ${DORIS_OUTPUT}/fe/lib/
cp -r -p ${DORIS_HOME}/docs/build/help-resource.zip ${DORIS_OUTPUT}/fe/lib/
cp -r -p ${DORIS_HOME}/webroot/static ${DORIS_OUTPUT}/fe/webroot/
@@ -373,6 +374,8 @@ if [ ${BUILD_BE} -eq 1 ]; then
cp -r -p ${DORIS_HOME}/be/output/bin/* ${DORIS_OUTPUT}/be/bin/
cp -r -p ${DORIS_HOME}/be/output/conf/* ${DORIS_OUTPUT}/be/conf/
cp -r -p ${DORIS_HOME}/be/output/lib/* ${DORIS_OUTPUT}/be/lib/
+ # make a soft link palo_be point to doris_be, for forward compatibility
+ cd ${DORIS_OUTPUT}/be/lib && rm palo_be && ln -s doris_be palo_be && cd -
cp -r -p ${DORIS_HOME}/be/output/udf/*.a ${DORIS_OUTPUT}/udf/lib/
cp -r -p ${DORIS_HOME}/be/output/udf/include/* ${DORIS_OUTPUT}/udf/include/
cp -r -p ${DORIS_HOME}/webroot/be/* ${DORIS_OUTPUT}/be/www/
diff --git a/fe/fe-core/pom.xml b/fe/fe-core/pom.xml
index 1f3b4a6f4e..91fdadaa27 100644
--- a/fe/fe-core/pom.xml
+++ b/fe/fe-core/pom.xml
@@ -604,7 +604,7 @@ under the License.
</dependencies>
<build>
- <finalName>palo-fe</finalName>
+ <finalName>doris-fe</finalName>
<plugins>
<!--jcup-->
<plugin>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org