From 74202fe7e288ad875bf8f50bd6e7e24c3ea560c3 Mon Sep 17 00:00:00 2001 From: Guangming Lu <71873108+LuGuangming@users.noreply.github.com> Date: Sun, 31 Dec 2023 13:42:56 +0800 Subject: [PATCH] [Enhancement] support user custom defined privite settings,xml for build fe (#29015) Issue Number: close #29014 --- build.sh | 13 +++++++++++-- docs/en/community/developer-guide/be-vscode-dev.md | 5 +++++ .../community/developer-guide/be-vscode-dev.md | 5 +++++ 3 files changed, 21 insertions(+), 2 deletions(-) diff --git a/build.sh b/build.sh index 4f5c83fca5..3b819929d0 100755 --- a/build.sh +++ b/build.sh @@ -590,9 +590,18 @@ if [[ "${FE_MODULES}" != '' ]]; then clean_fe fi if [[ "${DISABLE_JAVA_CHECK_STYLE}" = "ON" ]]; then - "${MVN_CMD}" package -pl ${FE_MODULES:+${FE_MODULES}} -Dskip.doc=true -DskipTests -Dcheckstyle.skip=true ${MVN_OPT:+${MVN_OPT}} + # Allowed user customer set env param USER_SETTINGS_MVN_REPO means settings.xml file path + if [[ -n ${USER_SETTINGS_MVN_REPO} && -f ${USER_SETTINGS_MVN_REPO} ]]; then + "${MVN_CMD}" package -pl ${FE_MODULES:+${FE_MODULES}} -Dskip.doc=true -DskipTests -Dcheckstyle.skip=true ${MVN_OPT:+${MVN_OPT}} -gs "${USER_SETTINGS_MVN_REPO}" + else + "${MVN_CMD}" package -pl ${FE_MODULES:+${FE_MODULES}} -Dskip.doc=true -DskipTests -Dcheckstyle.skip=true ${MVN_OPT:+${MVN_OPT}} + fi else - "${MVN_CMD}" package -pl ${FE_MODULES:+${FE_MODULES}} -Dskip.doc=true -DskipTests ${MVN_OPT:+${MVN_OPT}} + if [[ -n ${USER_SETTINGS_MVN_REPO} && -f ${USER_SETTINGS_MVN_REPO} ]]; then + "${MVN_CMD}" package -pl ${FE_MODULES:+${FE_MODULES}} -Dskip.doc=true -DskipTests ${MVN_OPT:+${MVN_OPT}} -gs "${USER_SETTINGS_MVN_REPO}" + else + "${MVN_CMD}" package -pl ${FE_MODULES:+${FE_MODULES}} -Dskip.doc=true -DskipTests ${MVN_OPT:+${MVN_OPT}} + fi fi cd "${DORIS_HOME}" fi diff --git a/docs/en/community/developer-guide/be-vscode-dev.md b/docs/en/community/developer-guide/be-vscode-dev.md index 21a3e689cb..e7964e2a3f 100644 --- a/docs/en/community/developer-guide/be-vscode-dev.md +++ b/docs/en/community/developer-guide/be-vscode-dev.md @@ -93,6 +93,11 @@ Note: This compilation has the following instructions: If nothing happens, the compilation should be successful, and the final deployment file will be output to the /home/workspace/doris/output/ directory. If you still encounter other problems, you can refer to the doris installation document http://doris.apache.org. +Note: If you want to specify the private maven repository address separately when compiling fe, you can set the environment variable USER_SETTINGS_MVN_REPO to specify the file path to settings.xml. +Example: +``` + export USER_SETTINGS_MVN_REPO="/xxx/xxx/settings.xml" +``` ## Deployment and debugging(GDB) 1. Authorize be compilation result files diff --git a/docs/zh-CN/community/developer-guide/be-vscode-dev.md b/docs/zh-CN/community/developer-guide/be-vscode-dev.md index eecc243726..9244ac61ac 100644 --- a/docs/zh-CN/community/developer-guide/be-vscode-dev.md +++ b/docs/zh-CN/community/developer-guide/be-vscode-dev.md @@ -92,6 +92,11 @@ cd /home/workspace/doris 如果不出意外,应该会编译成功,最终的部署文件将产出到 /home/workspace/doris/output/ 目录下。如果还遇到其他问题,可以参照 doris 的安装文档 http://doris.apache.org。 +注意:如果编译fe时希望单独指定私有的maven仓地址,可以设置环境变量USER_SETTINGS_MVN_REPO指定settings.xml的文件路径。 +举例: +``` + export USER_SETTINGS_MVN_REPO="/xxx/xxx/settings.xml" +``` ## 部署调试(GDB) 1. 给 be 编译结果文件授权