From c033592b291dfd7cd4c9c375a36731e088998d89 Mon Sep 17 00:00:00 2001
From: Ping Xiao <pxiao@taosdata.com>
Date: Tue, 18 Jul 2023 11:00:26 +0800
Subject: [PATCH] fix Windows packaging issue

---
 packaging/tools/make_install.bat |  4 ++--
 tools/CMakeLists.txt             | 22 ++++++++++++++++++++--
 tools/shell/CMakeLists.txt       |  2 +-
 3 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/packaging/tools/make_install.bat b/packaging/tools/make_install.bat
index 41113c9ae4..0b2a55b89c 100644
--- a/packaging/tools/make_install.bat
+++ b/packaging/tools/make_install.bat
@@ -56,8 +56,8 @@ copy %binary_dir%\\build\\bin\\taos.exe %target_dir% > nul
 if exist %binary_dir%\\build\\bin\\taosBenchmark.exe (
     copy %binary_dir%\\build\\bin\\taosBenchmark.exe %target_dir% > nul
 )
-if exist %binary_dir%\\build\\lib\\taosws.dll.lib (
-    copy %binary_dir%\\build\\lib\\taosws.dll.lib %target_dir%\\driver  > nul
+if exist %binary_dir%\\build\\lib\\taosws.lib (
+    copy %binary_dir%\\build\\lib\\taosws.lib %target_dir%\\driver  > nul
 )
 if exist %binary_dir%\\build\\lib\\taosws.dll (
     copy %binary_dir%\\build\\lib\\taosws.dll %target_dir%\\driver  > nul
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index e882658408..ea8b5e6169 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -3,8 +3,6 @@ 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 (TD_ALPINE)
@@ -26,6 +24,26 @@ IF (TD_WEBSOCKET)
             COMMAND cmake -E make_directory ${CMAKE_BINARY_DIR}/build/include
             COMMAND cmake -E copy target/release/taosws.h ${CMAKE_BINARY_DIR}/build/include
             )
+    ELSEIF (TD_WINDOWS)
+        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
+            INSTALL_COMMAND
+            COMMAND cp target/release/taosws.dll ${CMAKE_BINARY_DIR}/build/lib
+            COMMAND cp target/release/taosws.dll.lib ${CMAKE_BINARY_DIR}/build/lib/taosws.lib
+            COMMAND cmake -E make_directory ${CMAKE_BINARY_DIR}/build/include
+            COMMAND cmake -E copy target/release/taosws.h ${CMAKE_BINARY_DIR}/build/include
+            )
     ELSE()
         include(ExternalProject)
         ExternalProject_Add(taosws-rs
diff --git a/tools/shell/CMakeLists.txt b/tools/shell/CMakeLists.txt
index acc47d4910..0ce181808f 100644
--- a/tools/shell/CMakeLists.txt
+++ b/tools/shell/CMakeLists.txt
@@ -20,7 +20,7 @@ ELSEIF (TD_DARWIN AND TD_WEBSOCKET)
     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")
+    SET(LINK_WEBSOCKET "${CMAKE_BINARY_DIR}/build/lib/taosws.lib")
     ADD_DEPENDENCIES(shell taosws-rs)
 ELSE ()
     SET(LINK_WEBSOCKET "")