This is an automated email from the ASF dual-hosted git repository.
yangzhg pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-doris.git
The following commit(s) were added to refs/heads/master by this push:
new 210625b [Doc] Update fe-idea developer guide for latest version
(#6963)
210625b is described below
commit 210625b358490f9858a54ff2175ffe8e5cd30f16
Author: wei zhao <zhaowei_3...@163.com>
AuthorDate: Mon Nov 1 11:42:13 2021 +0800
[Doc] Update fe-idea developer guide for latest version (#6963)
---
docs/en/developer-guide/fe-idea-dev.md | 10 ++++++----
docs/zh-CN/developer-guide/fe-idea-dev.md | 14 ++++++++------
2 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/docs/en/developer-guide/fe-idea-dev.md
b/docs/en/developer-guide/fe-idea-dev.md
index 1bd6113..fac8f7c 100644
--- a/docs/en/developer-guide/fe-idea-dev.md
+++ b/docs/en/developer-guide/fe-idea-dev.md
@@ -43,12 +43,12 @@ If your are only interested in FE module, and for some
reason you can't or don't
the minimum tool required for FE module is `thrift`, so you can manually
install `thrift` and copy or create a link of
the executable `thrift` command to `./thirdparty/installed/bin`.
-Doris build against `thrift` 0.9.3, and `thrift` 0.9.3.1 should also work
well, but the newer version will not.
+Doris build against `thrift` 0.13.0 ( note : `Doris` 0.15 and later version
build against `thrift` 0.13.0 , the previous version is still `thrift` 0.9.3)
-If your are using macOS, try `brew install thrift@0.9` and will get `thrift`
0.9.3.1 installed at `/usr/local/opt/thrift@0.9/bin/thrift`,
+If your are using macOS, try `brew install thrift@0.13.0` and will get
`thrift` 0.13.0 installed at `/usr/local/opt/thrift@0.13.0/bin/thrift`,
then create a soft link to `./thirdparty/installed/bin/thrift`.
-For Windows users, download `thrift` 0.9.3 from
`http://archive.apache.org/dist/thrift/0.9.3/thrift-0.9.3.exe`,
+For Windows users, download `thrift` 0.13.0 from
`http://archive.apache.org/dist/thrift/0.13.0/thrift-0.13.0.exe`,
and put it into `thirdparty/installed/bin/` folder.
Go to `./fe` folder and run the following maven command to generate sources.
@@ -74,10 +74,12 @@ is generate codes in Linux and copy them back. Using Docker
should also be an op
1. Import `./fe` into IDEA
-2. Follow the picture to create the folders and copy files under `webroot`
into it.
+2. Follow the picture to create the folders
+3. Build `ui` project , and copy files from directory `ui/dist` into directory
`webroot` ( you can skip this step , if you don't need `Doris` UI )
+
## Custom FE configuration
Copy below content into `conf/fe.conf` and tune it to fit your environment.
diff --git a/docs/zh-CN/developer-guide/fe-idea-dev.md
b/docs/zh-CN/developer-guide/fe-idea-dev.md
index c51bbd7..9fae981 100644
--- a/docs/zh-CN/developer-guide/fe-idea-dev.md
+++ b/docs/zh-CN/developer-guide/fe-idea-dev.md
@@ -36,10 +36,10 @@ JDK1.8+, IntelliJ IDEA
3. 如果仅进行fe开发而没有编译过thirdparty，则需要安装thrift，并将thrift 复制或者连接到
`thirdparty/installed/bin` 目录下
- 1. 安装 thrift 0.9.3 版本(注意：Doris 基于 thrift 0.9.3 构建, 使用新版本会导致编译不通过)
-
- MacOS: `brew install thrift@0.9`
- Windows: `http://archive.apache.org/dist/thrift/0.9.3/thrift-0.9.3.exe`
+ 安装 `thrift` 0.13.0 版本(注意：`Doris` 0.15 和最新的版本基于 `thrift` 0.13.0 构建,
之前的版本依然使用`thrift` 0.9.3 构建)
+
+ MacOS: `brew install thrift@0.13.0`
+ Windows:
`http://archive.apache.org/dist/thrift/0.13.0/thrift-0.13.0.exe`
4. 如果是Mac 或者 Linux 环境 可以通过 如下命令生成自动生成代码：
@@ -62,12 +62,14 @@ JDK1.8+, IntelliJ IDEA
## 2.调试
-**1. 用idea导入fe工程；**
+1. 用idea导入fe工程
-2.在fe目录下创建下面红框标出的目录，并将webroot里的内容拷贝进去
+2. 在fe目录下创建下面红框标出的目录
+3. 编译`ui`项目，将 `ui/dist/`目录中的文件拷贝到`webroot`中（如果你不需要看`Doris` UI，这一步可以跳过）
+
## 3.配置conf/fe.conf
下面是我自己的配置，你可以根据自己的需要进行修改
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
