Merge pull request #23858 from taosdata/packaging/TD-25387

add taosdump into rpm and deb
taosdata · Nov 29, 2023 · ecd809e · ecd809e
2 parents 3216492 + 0331c1f
commit ecd809e
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/README-CN.md b/README-CN.md
@@ -45,7 +45,7 @@ TDengine 目前可以在 Linux、 Windows、macOS 等平台上安装和运行。
 
 TDengine 还提供一组辅助工具软件 taosTools，目前它包含 taosBenchmark（曾命名为 taosdemo）和 taosdump 两个软件。默认 TDengine 编译不包含 taosTools, 您可以在编译 TDengine 时使用`cmake .. -DBUILD_TOOLS=true` 来同时编译 taosTools。
 
-为了构建TDengine, 请使用 [CMake](https://cmake.org/) 3.0.2 或者更高版本。
+为了构建TDengine, 请使用 [CMake](https://cmake.org/) 3.13.0 或者更高版本。
 
 ## 安装工具
 
@@ -124,7 +124,7 @@ brew install argp-standalone gflags pkgconfig
 
 TDengine 包含数个使用 Go 语言开发的组件，比如taosAdapter, 请参考 golang.org 官方文档设置 go 开发环境。
 
-请使用 1.14 及以上版本。对于中国用户，我们建议使用代理来加速软件包下载。
+请使用 1.20 及以上版本。对于中国用户，我们建议使用代理来加速软件包下载。
 
 ```
 go env -w GO111MODULE=on

diff --git a/README.md b/README.md
@@ -53,7 +53,7 @@ You can choose to install through source code, [container](https://docs.tdengine
 
 TDengine provide a few useful tools such as taosBenchmark (was named taosdemo) and taosdump. They were part of TDengine. By default, TDengine compiling does not include taosTools. You can use `cmake .. -DBUILD_TOOLS=true` to make them be compiled with TDengine.
 
-To build TDengine, use [CMake](https://cmake.org/) 3.0.2 or higher versions in the project directory.
+To build TDengine, use [CMake](https://cmake.org/) 3.13.0 or higher versions in the project directory.
 
 ## Install build tools
 
@@ -131,7 +131,7 @@ brew install argp-standalone gflags pkgconfig
 
 TDengine includes a few components like taosAdapter developed by Go language. Please refer to golang.org official documentation for golang environment setup.
 
-Please use version 1.14+. For the user in China, we recommend using a proxy to accelerate package downloading.
+Please use version 1.20+. For the user in China, we recommend using a proxy to accelerate package downloading.
 
 ```
 go env -w GO111MODULE=on

diff --git a/packaging/deb/makedeb.sh b/packaging/deb/makedeb.sh
@@ -87,6 +87,7 @@ cp ${compile_dir}/../packaging/tools/taosd-dump-cfg.gdb    ${pkg_dir}${install_h
 cp ${compile_dir}/build/bin/taosd                   ${pkg_dir}${install_home_path}/bin
 cp ${compile_dir}/build/bin/udfd                   ${pkg_dir}${install_home_path}/bin
 cp ${compile_dir}/build/bin/taosBenchmark           ${pkg_dir}${install_home_path}/bin
+cp ${compile_dir}/build/bin/taosdump               ${pkg_dir}${install_home_path}/bin
 
 if [ -f "${compile_dir}/build/bin/taosadapter" ]; then
     cp ${compile_dir}/build/bin/taosadapter                    ${pkg_dir}${install_home_path}/bin ||:

diff --git a/packaging/rpm/tdengine.spec b/packaging/rpm/tdengine.spec
@@ -82,6 +82,7 @@ cp %{_compiledir}/build/bin/taos                    %{buildroot}%{homepath}/bin
 cp %{_compiledir}/build/bin/taosd                   %{buildroot}%{homepath}/bin
 cp %{_compiledir}/build/bin/udfd                    %{buildroot}%{homepath}/bin
 cp %{_compiledir}/build/bin/taosBenchmark           %{buildroot}%{homepath}/bin
+cp %{_compiledir}/build/bin/taosdump                %{buildroot}%{homepath}/bin
 
 if [ -f %{_compiledir}/../build-taoskeeper/taoskeeper ]; then
     cp %{_compiledir}/../build-taoskeeper/taoskeeper %{buildroot}%{homepath}/bin