From 05efe6f97926569092b828143cd2c16c28bd2738 Mon Sep 17 00:00:00 2001
From: Shuduo Sang <sangshuduo@gmail.com>
Date: Sat, 23 Jul 2022 15:17:17 +0800
Subject: [PATCH] chore: libtaos ws submodule for3.0 (#15334)

* chore: add libtaos-ws for 3.0

* chore: update taosws-rs

* chore: add libtaosws to install/remove script

* chore: update taosws-rs

* chore: update taosws-rs

* chore: update taos-tools, taosws-rs

for 3.0

* fix: packaging/tools/make_install.sh

for 3.0

* chore: update taos-tools

* chore: fix release script for 3.0

* chore: update taosws-rs for 3.0

* chore: add taows-rs submodule for 3.0

* chore: update taosws-rs for 3.0

* fix: install script support taosws for 3.0

* fix: script error handle for 3.0

* chore: update taosws-rs for 3.0

fix segfault

* chore: change container_build for websocket build

* fix: install script for taosws

* fix: .

* chore: update taosws-rs for 3.0

* chore: update taosws-rs for 3.0

* chore: update tools/CMakeLists.txt to allow compile taosws-rw on any platform
---
 tools/CMakeLists.txt | 80 +++++++++++++++++++++-----------------------
 1 file changed, 39 insertions(+), 41 deletions(-)

diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index e6cd47b91d..58095940f3 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -1,46 +1,44 @@
 IF (TD_WEBSOCKET)
     MESSAGE("${Green} use libtaos-ws${ColourReset}")
-    IF (TD_LINUX)
-        IF (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/taosws-rs/target/release/libtaosws.so" OR "${CMAKE_CURRENT_SOURCE_DIR}/taosws-rs/target/release/libtaosws.so" IS_NEWER_THAN "${CMAKE_SOURCE_DIR}/.git/modules/tools/taosws-rs/FETCH_HEAD")
-            include(ExternalProject)
-            ExternalProject_Add(taosws-rs
-                    PREFIX        "taosws-rs"
-                    SOURCE_DIR    ${CMAKE_CURRENT_SOURCE_DIR}/taosws-rs
-                    BUILD_ALWAYS         off
-                    DEPENDS             taos
-                    BUILD_IN_SOURCE     1
-                    CONFIGURE_COMMAND cmake -E echo "taosws-rs no need cmake to config"
-                    PATCH_COMMAND
-                    COMMAND     git clean -f -d
-                    BUILD_COMMAND
-                    COMMAND cargo build --release -p taos-ws-sys
-                    COMMAND ./taos-ws-sys/ci/package.sh
-                    INSTALL_COMMAND
-                    COMMAND cmake -E copy target/libtaosws/libtaosws.so ${CMAKE_BINARY_DIR}/build/lib
-                    COMMAND cmake -E make_directory ${CMAKE_BINARY_DIR}/build/include
-                    COMMAND cmake -E copy target/libtaosws/taosws.h ${CMAKE_BINARY_DIR}/build/include
-                    )
-        ELSE()
-            include(ExternalProject)
-            ExternalProject_Add(taosws-rs
-                    PREFIX        "taosws-rs"
-                    SOURCE_DIR    ${CMAKE_CURRENT_SOURCE_DIR}/taosws-rs
-                    BUILD_ALWAYS         on
-                    DEPENDS             taos
-                    BUILD_IN_SOURCE     1
-                    CONFIGURE_COMMAND cmake -E echo "taosws-rs no need cmake to config"
-                    PATCH_COMMAND
-                    COMMAND     git clean -f -d
-                    BUILD_COMMAND
-                    COMMAND cargo build --release -p taos-ws-sys
-                    COMMAND ./taos-ws-sys/ci/package.sh
-                    INSTALL_COMMAND
-                    COMMAND cmake -E copy target/libtaosws/libtaosws.so ${CMAKE_BINARY_DIR}/build/lib
-                    COMMAND cmake -E make_directory ${CMAKE_BINARY_DIR}/build/include
-                    COMMAND cmake -E copy target/libtaosws/taosws.h ${CMAKE_BINARY_DIR}/build/include
-                    )
-        ENDIF ()
-    ENDIF()
+    IF (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/taosws-rs/target/release/libtaosws.so" OR "${CMAKE_CURRENT_SOURCE_DIR}/taosws-rs/target/release/libtaosws.so" IS_NEWER_THAN "${CMAKE_SOURCE_DIR}/.git/modules/tools/taosws-rs/FETCH_HEAD")
+        include(ExternalProject)
+        ExternalProject_Add(taosws-rs
+            PREFIX        "taosws-rs"
+            SOURCE_DIR    ${CMAKE_CURRENT_SOURCE_DIR}/taosws-rs
+            BUILD_ALWAYS         off
+            DEPENDS             taos
+            BUILD_IN_SOURCE     1
+            CONFIGURE_COMMAND cmake -E echo "taosws-rs no need cmake to config"
+            PATCH_COMMAND
+            COMMAND     git clean -f -d
+            BUILD_COMMAND
+            COMMAND cargo build --release -p taos-ws-sys
+            COMMAND ./taos-ws-sys/ci/package.sh
+            INSTALL_COMMAND
+            COMMAND cmake -E copy target/libtaosws/libtaosws.so ${CMAKE_BINARY_DIR}/build/lib
+            COMMAND cmake -E make_directory ${CMAKE_BINARY_DIR}/build/include
+            COMMAND cmake -E copy target/libtaosws/taosws.h ${CMAKE_BINARY_DIR}/build/include
+            )
+    ELSE()
+        include(ExternalProject)
+        ExternalProject_Add(taosws-rs
+            PREFIX        "taosws-rs"
+            SOURCE_DIR    ${CMAKE_CURRENT_SOURCE_DIR}/taosws-rs
+            BUILD_ALWAYS         on
+            DEPENDS             taos
+            BUILD_IN_SOURCE     1
+            CONFIGURE_COMMAND cmake -E echo "taosws-rs no need cmake to config"
+            PATCH_COMMAND
+            COMMAND     git clean -f -d
+            BUILD_COMMAND
+            COMMAND cargo build --release -p taos-ws-sys
+            COMMAND ./taos-ws-sys/ci/package.sh
+            INSTALL_COMMAND
+            COMMAND cmake -E copy target/libtaosws/libtaosws.so ${CMAKE_BINARY_DIR}/build/lib
+            COMMAND cmake -E make_directory ${CMAKE_BINARY_DIR}/build/include
+            COMMAND cmake -E copy target/libtaosws/taosws.h ${CMAKE_BINARY_DIR}/build/include
+            )
+    ENDIF ()
 ENDIF ()
 
 IF (TD_TAOS_TOOLS)
-- 
GitLab