chore: update libtaos ws submodule for3.0 (#14729)

* 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

packaging/tools/make_install.sh

@@ -305,18 +305,23 @@ function install_lib() {
       ${install_main_dir}/driver &&
       ${csudo}chmod 777 ${install_main_dir}/driver/libtaos.so.${verNumber}
 
-    ${csudo}cp ${binary_dir}/build/lib/libtaosws.so \
-      ${install_main_dir}/driver &&
-      ${csudo}chmod 777 ${install_main_dir}/driver/libtaosws.so
-
     ${csudo}ln -sf ${install_main_dir}/driver/libtaos.* ${lib_link_dir}/libtaos.so.1
     ${csudo}ln -sf ${lib_link_dir}/libtaos.so.1 ${lib_link_dir}/libtaos.so
-    ${csudo}ln -sf ${install_main_dir}/driver/libtaosws.so ${lib_link_dir}/libtaosws.so || :
-
     if [ -d "${lib64_link_dir}" ]; then
-      ${csudo}ln -sf ${install_main_dir}/driver/libtaos.* ${lib64_link_dir}/libtaos.so.1
-      ${csudo}ln -sf ${lib64_link_dir}/libtaos.so.1 ${lib64_link_dir}/libtaos.so
-      ${csudo}ln -sf ${lib64_link_dir}/libtaosws.so ${lib64_link_dir}/libtaosws.so || :
+        ${csudo}ln -sf ${install_main_dir}/driver/libtaos.* ${lib64_link_dir}/libtaos.so.1
+        ${csudo}ln -sf ${lib64_link_dir}/libtaos.so.1 ${lib64_link_dir}/libtaos.so
+    fi
+
+    if [ -f ${binary_dir}/build/lib/libtaosws.so ]; then
+        ${csudo}cp ${binary_dir}/build/lib/libtaosws.so \
+            ${install_main_dir}/driver &&
+            ${csudo}chmod 777 ${install_main_dir}/driver/libtaosws.so ||:
+
+        ${csudo}ln -sf ${install_main_dir}/driver/libtaosws.so ${lib_link_dir}/libtaosws.so || :
+
+        if [ -d "${lib64_link_dir}" ]; then
+            ${csudo}ln -sf ${lib64_link_dir}/libtaosws.so ${lib64_link_dir}/libtaosws.so || :
+        fi
     fi
   else
     ${csudo}cp -Rf ${binary_dir}/build/lib/libtaos.${verNumber}.dylib \
@@ -357,26 +362,26 @@ function install_header() {
 
   if [ "$osType" != "Darwin" ]; then
     ${csudo}rm -f ${inc_link_dir}/taos.h ${inc_link_dir}/taosdef.h ${inc_link_dir}/taoserror.h ${inc_link_dir}/taosudf.h || :
+    ${csudo}rm -f ${inc_link_dir}/taosws.h ||:
     ${csudo}cp -f ${source_dir}/include/client/taos.h ${source_dir}/include/common/taosdef.h ${source_dir}/include/util/taoserror.h ${source_dir}/include/libs/function/taosudf.h \
-    ${csudo}rm -f ${inc_link_dir}/taosws.h || :
-
-    ${csudo}cp -f ${source_dir}/src/inc/taos.h ${source_dir}/src/inc/taosdef.h ${source_dir}/src/inc/taoserror.h \
       ${install_main_dir}/include && ${csudo}chmod 644 ${install_main_dir}/include/*
 
-    ${csudo}cp -f ${binary_dir}/build/include/taosws.h ${install_main_dir}/include && ${csudo}chmod 644 ${install_main_dir}/include/taosws.h
+    if [ -f ${binary_dir}/build/include/taosws.h ]; then
+      ${csudo}cp -f ${binary_dir}/build/include/taosws.h ${install_main_dir}/include && ${csudo}chmod 644 ${install_main_dir}/include/taosws.h ||:
+      ${csudo}ln -s ${install_main_dir}/include/taosws.h ${inc_link_dir}/taosws.h ||:
+    fi
 
     ${csudo}ln -s ${install_main_dir}/include/taos.h ${inc_link_dir}/taos.h
     ${csudo}ln -s ${install_main_dir}/include/taosdef.h ${inc_link_dir}/taosdef.h
     ${csudo}ln -s ${install_main_dir}/include/taoserror.h ${inc_link_dir}/taoserror.h
     ${csudo}ln -s ${install_main_dir}/include/taosudf.h ${inc_link_dir}/taosudf.h
 
-    ${csudo}ln -s ${install_main_dir}/include/taosws.h ${inc_link_dir}/taosws.h || :
   else
     ${csudo}cp -f ${source_dir}/include/client/taos.h ${source_dir}/include/common/taosdef.h ${source_dir}/include/util/taoserror.h ${source_dir}/include/libs/function/taosudf.h \
       ${install_main_dir}/include ||
       ${csudo}cp -f ${source_dir}/include/client/taos.h ${source_dir}/include/common/taosdef.h ${source_dir}/include/util/taoserror.h ${source_dir}/include/libs/function/taosudf.h \
         ${install_main_2_dir}/include &&
-      ${csudo}chmod 644 ${install_main_dir}/include/* ||
+      ${csudo}chmod 644 ${install_main_dir}/include/* ||:
       ${csudo}chmod 644 ${install_main_2_dir}/include/*
   fi
 }

tools/CMakeLists.txt

@@ -1,25 +1,46 @@
 IF (TD_WEBSOCKET)
-  MESSAGE("${Green} use libtaos-ws${ColourReset}")
-  IF (TD_LINUX)
-      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
-          )
-  ENDIF()
+    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()
 ENDIF ()
 
 IF (TD_TAOS_TOOLS)

tools/taos-tools

@@ -1 +1 @@
-Subproject commit 9cb71e3c4c0474553aa961cbe19795541c29b5c7
+Subproject commit d69d9feaf067db6af7c49b651f67ba0b0e11a861

tools/taosws-rs

@@ -1 +1 @@
-Subproject commit 430982a0c2c29a819ffc414d11f49f2d424ca3fe
+Subproject commit 7a94ffab45f08e16f09b3f430fe75d717054adb6