fix: add windows libtaosws (#17666)

cmake/cmake.define

@@ -100,6 +100,8 @@ IF (TD_WINDOWS)
     SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${COMMON_FLAGS}")
     SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${COMMON_FLAGS}")
 
+    SET(JEMALLOC_ENABLED OFF)
+
 ELSE ()
     IF (${TD_DARWIN})
         set(CMAKE_MACOSX_RPATH 0)

packaging/tools/make_install.bat

@@ -47,6 +47,15 @@ copy %binary_dir%\\build\\bin\\udfd.exe %tagert_dir% > nul
 if exist %binary_dir%\\build\\bin\\taosBenchmark.exe (
     copy %binary_dir%\\build\\bin\\taosBenchmark.exe %tagert_dir% > nul
 )
+if exist %binary_dir%\\build\\lib\\taosws.dll.lib (
+    copy %binary_dir%\\build\\lib\\taosws.dll.lib %tagert_dir%\\driver  > nul
+)
+if exist %binary_dir%\\build\\lib\\taosws.dll (
+    copy %binary_dir%\\build\\lib\\taosws.dll %tagert_dir%\\driver  > nul
+)
+if exist %binary_dir%\\build\\bin\\taosdump.exe (
+    copy %binary_dir%\\build\\bin\\taosdump.exe %tagert_dir% > nul
+)
 if exist %binary_dir%\\build\\bin\\taosadapter.exe (
     copy %binary_dir%\\build\\bin\\taosadapter.exe %tagert_dir% > nul
 )
@@ -54,4 +63,7 @@ if exist %binary_dir%\\build\\bin\\taosadapter.exe (
 mshta vbscript:createobject("shell.application").shellexecute("%~s0",":hasAdmin","","runas",1)(window.close)&& echo To start/stop TDengine with administrator privileges: sc start/stop taosd &goto :eof
 :hasAdmin
 copy /y C:\\TDengine\\driver\\taos.dll C:\\Windows\\System32 > nul
+if exist C:\\TDengine\\driver\\taosws.dll (
+    copy /y C:\\TDengine\\driver\\taosws.dll C:\\Windows\\System32 > nul
+)
 sc query "taosd" >nul || sc create "taosd" binPath= "C:\\TDengine\\taosd.exe --win_service" start= DEMAND

tools/CMakeLists.txt

@@ -3,49 +3,29 @@ IF (TD_WEBSOCKET)
         SET(websocket_lib_file "libtaosws.so")
     ELSEIF (TD_DARWIN)
         SET(websocket_lib_file "libtaosws.dylib")
+    ELSEIF (TD_WINDOWS)
+        SET(websocket_lib_file "{taosws.dll,taosws.dll.lib}")
     ENDIF ()
     MESSAGE("${Green} use libtaos-ws${ColourReset}")
-    IF (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/taosws-rs/target/release/${websocket_lib_file}" OR "${CMAKE_CURRENT_SOURCE_DIR}/taosws-rs/target/release/${websocket_lib_file}" 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 update
-            COMMAND cargo build --release -p taos-ws-sys --features native-tls-vendored
-            COMMAND ./taos-ws-sys/ci/package.sh
-            INSTALL_COMMAND
-            COMMAND cmake -E copy target/libtaosws/${websocket_lib_file} ${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 update
-            COMMAND cargo build --release -p taos-ws-sys --features native-tls-vendored
-            COMMAND ./taos-ws-sys/ci/package.sh
-            INSTALL_COMMAND
-            COMMAND cmake -E copy target/libtaosws/${websocket_lib_file} ${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 ()
+
+    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 update
+        COMMAND cargo build --release -p taos-ws-sys --features native-tls-vendored
+        INSTALL_COMMAND
+        COMMAND cp target/release/${websocket_lib_file} ${CMAKE_BINARY_DIR}/build/lib
+        COMMAND cmake -E make_directory ${CMAKE_BINARY_DIR}/build/include
+        COMMAND cmake -E copy target/release/taosws.h ${CMAKE_BINARY_DIR}/build/include
+        )
 ENDIF ()
 
 IF (TD_TAOS_TOOLS)

tools/shell/CMakeLists.txt

@@ -10,6 +10,10 @@ ELSEIF (TD_DARWIN AND TD_WEBSOCKET)
     ADD_DEFINITIONS(-DWEBSOCKET -I${CMAKE_BINARY_DIR}/build/include)
     SET(LINK_WEBSOCKET "${CMAKE_BINARY_DIR}/build/lib/libtaosws.dylib")
     ADD_DEPENDENCIES(shell taosws-rs)
+ELSEIF (TD_WINDOWS AND TD_WEBSOCKET)
+    ADD_DEFINITIONS(-DWEBSOCKET -I${CMAKE_BINARY_DIR}/build/include)
+    SET(LINK_WEBSOCKET "${CMAKE_BINARY_DIR}/build/lib/taosws.dll.lib")
+    ADD_DEPENDENCIES(shell taosws-rs)
 ELSE ()
     SET(LINK_WEBSOCKET "")
 ENDIF ()