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/12/14 04:29:32 UTC
[doris] 11/13: [chore](macOS) Resolve the issue with missing python program (#14864)
This is an automated email from the ASF dual-hosted git repository.
morningman pushed a commit to branch branch-1.2-lts
in repository https://gitbox.apache.org/repos/asf/doris.git
commit cd0073e924099ef05ded9a4a42d34434a5a674b5
Author: Adonis Ling <ad...@gmail.com>
AuthorDate: Wed Dec 7 15:30:12 2022 +0800
[chore](macOS) Resolve the issue with missing python program (#14864)
---
.../aggregate_function_sequence_match.h | 1 +
docs/en/community/developer-guide/fe-idea-dev.md | 14 +-------------
docs/zh-CN/community/developer-guide/fe-idea-dev.md | 16 +---------------
fe/fe-core/pom.xml | 4 ++++
4 files changed, 7 insertions(+), 28 deletions(-)
diff --git a/be/src/vec/aggregate_functions/aggregate_function_sequence_match.h b/be/src/vec/aggregate_functions/aggregate_function_sequence_match.h
index 6841e055af..75541fade2 100644
--- a/be/src/vec/aggregate_functions/aggregate_function_sequence_match.h
+++ b/be/src/vec/aggregate_functions/aggregate_function_sequence_match.h
@@ -22,6 +22,7 @@
#pragma once
#include <bitset>
+#include <stack>
#include "common/logging.h"
#include "vec/aggregate_functions/aggregate_function.h"
diff --git a/docs/en/community/developer-guide/fe-idea-dev.md b/docs/en/community/developer-guide/fe-idea-dev.md
index b75d2da5e3..552f586b06 100644
--- a/docs/en/community/developer-guide/fe-idea-dev.md
+++ b/docs/en/community/developer-guide/fe-idea-dev.md
@@ -87,12 +87,6 @@ under the License.
```
mvn clean install -DskipTests
```
-
- If it's MAC M1, run following command
-
- ```
- mvn clean install -DskipTests -Dos.arch=x86_64
- ```
You can also use IDE embedded GUI tools to run maven command to generate sources
@@ -101,13 +95,7 @@ under the License.
If you are developing on the OS which lack of support to run `shell script` and `make` such as Windows, a workround here
is generate codes in Linux and copy them back. Using Docker should also be an option.
-5. If it's MAC M1, python may not be found, so create a soft link from python3 to python:
-
- ```
- ln -s /usr/bin/python3 /usr/bin/python
- ```
-
-6. If a help document has not been generated, go to the docs directory and run`sh build_help_zip.sh`，
+5. If a help document has not been generated, go to the docs directory and run`sh build_help_zip.sh`，
Then copy help-resource.zip from build to fe/fe-core/target/classes
## 2. Debug
diff --git a/docs/zh-CN/community/developer-guide/fe-idea-dev.md b/docs/zh-CN/community/developer-guide/fe-idea-dev.md
index fda103ade2..65e152d94e 100644
--- a/docs/zh-CN/community/developer-guide/fe-idea-dev.md
+++ b/docs/zh-CN/community/developer-guide/fe-idea-dev.md
@@ -83,27 +83,13 @@ JDK1.8+, IntelliJ IDEA
```
- 如果是mac m1版，则执行：
-
- ```
- cd fe && mvn clean install -DskipTests -Dos.arch=x86_64
-
- ```
-
或者通过图形界面运行 maven 命令生成
如果使用windows环境可能会有make命令和sh脚本无法执行的情况 可以通过拷贝linux上的 `fe/fe-core/target/generated-sources` 目录拷贝到相应的目录的方式实现，也可以通过docker 镜像挂载本地目录之后，在docker 内部生成自动生成代码，可以参照编译一节
-5. 如果是 mac m1 版，可能会找不到 python，则创建一个 python3 到 python 的软链：
-
- ```
- ln -s /usr/bin/python3 /usr/bin/python
- ```
-
-
-6. 如果还未生成过help文档，需要跳转到docs目录，执行`sh build_help_zip.sh`，
+5. 如果还未生成过help文档，需要跳转到docs目录，执行`sh build_help_zip.sh`，
然后将build中的help-resource.zip拷贝到fe/fe-core/target/classes中
## 2.调试
diff --git a/fe/fe-core/pom.xml b/fe/fe-core/pom.xml
index f9fcad0966..bb415a81d4 100644
--- a/fe/fe-core/pom.xml
+++ b/fe/fe-core/pom.xml
@@ -863,6 +863,10 @@ under the License.
<goal>exec</goal>
</goals>
<configuration>
+ <environmentVariables>
+ <DORIS_HOME>${doris.home}</DORIS_HOME>
+ </environmentVariables>
+ <environmentScript>${doris.home}/env.sh</environmentScript>
<executable>make</executable>
<arguments>
<argument>-C</argument>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org