From 083ee928e97346a4a4e4257f2d45fa0412111ca0 Mon Sep 17 00:00:00 2001 From: haoranchen Date: Sat, 22 Mar 2025 10:59:20 +0800 Subject: [PATCH 1/5] docs:Add Windows support restriction details in README.md --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 5e768b36ea..54f4ff0e9b 100644 --- a/README.md +++ b/README.md @@ -80,7 +80,9 @@ For contributing/building/testing TDengine Connectors, please check the followin # 3. Prerequisites -At the moment, TDengine server supports running on Linux/Windows/MacOS systems. Any application can also choose the RESTful interface provided by taosAdapter to connect the taosd service. TDengine supports X64/ARM64 CPU, and it will support MIPS64, Alpha64, ARM32, RISC-V and other CPU architectures in the future. Right now we don't support build with cross-compiling environment. +At the moment, TDengine server supports running on Linux/MacOS systems. Any application can also choose the RESTful interface provided by taosAdapter to connect the taosd service. TDengine supports X64/ARM64 CPU, and it will support MIPS64, Alpha64, ARM32, RISC-V and other CPU architectures in the future. Right now we don't support build with cross-compiling environment. + +Starting from version 3.1.0.0, TDengine supports the Windows system exclusively in its Enterprise edition. If you want to compile taosAdapter or taosKeeper, you need to install Go 1.18 or above. From 8a1de67039c78dd7218e38ba1d90ad9db0315518 Mon Sep 17 00:00:00 2001 From: haoranchen Date: Sat, 22 Mar 2025 11:07:27 +0800 Subject: [PATCH 2/5] docs: add Windows support restriction details in README.md --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 54f4ff0e9b..13b063d6fb 100644 --- a/README.md +++ b/README.md @@ -126,7 +126,7 @@ brew install argp-standalone gflags pkgconfig ## 3.3 Prerequisites on Windows - +Not available for community edition.
Install required tools on Windows @@ -211,7 +211,7 @@ If you want to compile taosKeeper, you need to add the `-DBUILD_KEEPER=true` opt
## 4.3 Build on Windows - +Not available for community edition.
Detailed steps to build on Windows @@ -284,7 +284,7 @@ sudo make install
## 6.3 Install on Windows - +Not available for community edition.
Detailed steps to install on windows @@ -359,7 +359,7 @@ If TDengine CLI connects the server successfully, welcome messages and version i ## 7.3 Run TDengine on Windows - +Not available for community edition.
Detailed steps to run on windows From 8bbc3a6f9f930fab2d260652bcbcd2ff564eb123 Mon Sep 17 00:00:00 2001 From: haoranchen Date: Sat, 22 Mar 2025 11:11:37 +0800 Subject: [PATCH 3/5] docs:add python support restriction details in tests README.md --- tests/README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/README.md b/tests/README.md index df8fbfc655..b3906b8ae9 100644 --- a/tests/README.md +++ b/tests/README.md @@ -19,6 +19,8 @@ This manual is intended to give developers a comprehensive guidance to test TDen > - The commands and scripts below are verified on Linux (Ubuntu 18.04/20.04/22.04). > - [taos-connector-python](https://github.com/taosdata/taos-connector-python) is used by tests written in Python, which requires Python 3.7+. > - The commands and steps described below are to run the tests on a single host. +> - The testing framework is currently compatible with Python versions 3.8 through 3.10. + # 2. Prerequisites From 7a288ed388d8252027362073f9deb34a2b29fbd8 Mon Sep 17 00:00:00 2001 From: haoranchen Date: Sat, 22 Mar 2025 11:17:00 +0800 Subject: [PATCH 4/5] docs: remove content with windows README.md --- README.md | 71 ------------------------------------------------------- 1 file changed, 71 deletions(-) diff --git a/README.md b/README.md index 13b063d6fb..4da7730bae 100644 --- a/README.md +++ b/README.md @@ -127,13 +127,6 @@ brew install argp-standalone gflags pkgconfig ## 3.3 Prerequisites on Windows Not available for community edition. -
- -Install required tools on Windows - -Work in Progress. - -
## 3.4 Clone the repo @@ -212,40 +205,6 @@ If you want to compile taosKeeper, you need to add the `-DBUILD_KEEPER=true` opt ## 4.3 Build on Windows Not available for community edition. -
- -Detailed steps to build on Windows - -If you use the Visual Studio 2013, please open a command window by executing "cmd.exe". -Please specify "amd64" for 64 bits Windows or specify "x86" for 32 bits Windows when you execute vcvarsall.bat. - -```cmd -mkdir debug && cd debug -"C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" < amd64 | x86 > -cmake .. -G "NMake Makefiles" -nmake -``` - -If you use the Visual Studio 2019 or 2017: - -please open a command window by executing "cmd.exe". -Please specify "x64" for 64 bits Windows or specify "x86" for 32 bits Windows when you execute vcvarsall.bat. - -```cmd -mkdir debug && cd debug -"c:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat" < x64 | x86 > -cmake .. -G "NMake Makefiles" -nmake -``` - -Or, you can simply open a command window by clicking Windows Start -> "Visual Studio < 2019 | 2017 >" folder -> "x64 Native Tools Command Prompt for VS < 2019 | 2017 >" or "x86 Native Tools Command Prompt for VS < 2019 | 2017 >" depends what architecture your Windows is, then execute commands as follows: - -```cmd -mkdir debug && cd debug -cmake .. -G "NMake Makefiles" -nmake -``` -
# 5. Packaging @@ -285,17 +244,6 @@ sudo make install ## 6.3 Install on Windows Not available for community edition. -
- -Detailed steps to install on windows - -After building successfully, TDengine can be installed by: - -```cmd -nmake install -``` - -
# 7. Running @@ -360,25 +308,6 @@ If TDengine CLI connects the server successfully, welcome messages and version i ## 7.3 Run TDengine on Windows Not available for community edition. -
- -Detailed steps to run on windows - -You can start TDengine server on Windows platform with below commands: - -```cmd -.\build\bin\taosd.exe -c test\cfg -``` - -In another terminal, use the TDengine CLI to connect the server: - -```cmd -.\build\bin\taos.exe -c test\cfg -``` - -option "-c test/cfg" specifies the system configuration file directory. - -
# 8. Testing From cf0e4ccdf24c8d3f292b3702743bc45841d81fe3 Mon Sep 17 00:00:00 2001 From: WANG Xu Date: Sat, 22 Mar 2025 11:36:49 +0800 Subject: [PATCH 5/5] docs: update README.md and add venv suggestion Signed-off-by: WANG Xu --- README.md | 4 ++++ tests/README.md | 1 + 2 files changed, 5 insertions(+) diff --git a/README.md b/README.md index 4da7730bae..0a52daafab 100644 --- a/README.md +++ b/README.md @@ -126,6 +126,7 @@ brew install argp-standalone gflags pkgconfig
## 3.3 Prerequisites on Windows + Not available for community edition. ## 3.4 Clone the repo @@ -204,6 +205,7 @@ If you want to compile taosKeeper, you need to add the `-DBUILD_KEEPER=true` opt
## 4.3 Build on Windows + Not available for community edition. # 5. Packaging @@ -243,6 +245,7 @@ sudo make install ## 6.3 Install on Windows + Not available for community edition. # 7. Running @@ -307,6 +310,7 @@ If TDengine CLI connects the server successfully, welcome messages and version i ## 7.3 Run TDengine on Windows + Not available for community edition. # 8. Testing diff --git a/tests/README.md b/tests/README.md index b3906b8ae9..7c5e37e796 100644 --- a/tests/README.md +++ b/tests/README.md @@ -20,6 +20,7 @@ This manual is intended to give developers a comprehensive guidance to test TDen > - [taos-connector-python](https://github.com/taosdata/taos-connector-python) is used by tests written in Python, which requires Python 3.7+. > - The commands and steps described below are to run the tests on a single host. > - The testing framework is currently compatible with Python versions 3.8 through 3.10. +> - Vitural Environment is advised when setting up the environment, pease refer to [venv](https://docs.python.org/3/library/venv.html) for details. # 2. Prerequisites