[sync master]

CMakeLists.txt

@@ -87,6 +87,7 @@ IF (NOT DEFINED TD_CLUSTER)
   SET(TD_MIPS_32 FALSE)
   SET(TD_DARWIN_64 FALSE)
   SET(TD_WINDOWS_64 FALSE)
+  SET(TD_WINDOWS_32 FALSE)
   SET(TD_PAGMODE_LITE FALSE)
   
   IF (${PAGMODE} MATCHES "lite")
@@ -161,6 +162,11 @@ IF (NOT DEFINED TD_CLUSTER)
       SET(TD_OS_DIR ${TD_COMMUNITY_DIR}/src/os/windows)
       ADD_DEFINITIONS(-D_M_X64)
       MESSAGE(STATUS "The current platform is Windows 64-bit")
+    ELSEIF(${CMAKE_SIZEOF_VOID_P} MATCHES 4)
+      SET(TD_WINDOWS_32 TRUE)
+      SET(TD_OS_DIR ${TD_COMMUNITY_DIR}/src/os/windows)
+      #ADD_DEFINITIONS(-D_M_X64)
+      MESSAGE(STATUS "The current platform is Windows 32-bit")
     ELSE ()
       MESSAGE(FATAL_ERROR "The current platform is Windows 32-bit, not supported yet")
       EXIT ()
@@ -228,7 +234,7 @@ IF (NOT DEFINED TD_CLUSTER)
       link_library(/usr/lib/libargp.a)
       ADD_DEFINITIONS(-D_ALPINE)
     ENDIF ()
-  ELSEIF (TD_WINDOWS_64)
+  ELSEIF (TD_WINDOWS_64 OR TD_WINDOWS_32)
     SET(CMAKE_GENERATOR "NMake Makefiles" CACHE INTERNAL "" FORCE)
     IF (NOT TD_GODLL)
       SET(COMMON_FLAGS "/nologo /WX- /Oi /Oy- /Gm- /EHsc /MT /GS /Gy /fp:precise /Zc:wchar_t /Zc:forScope /Gd /errorReport:prompt /analyze-")
@@ -269,7 +275,7 @@ IF (NOT DEFINED TD_CLUSTER)
   ELSEIF (${CMAKE_BUILD_TYPE} MATCHES "Release")
     MESSAGE(STATUS "Build Release Version")
   ELSE ()
-    IF (TD_WINDOWS_64)
+    IF (TD_WINDOWS_64 OR TD_WINDOWS_32)
       SET(CMAKE_BUILD_TYPE "Release")
       MESSAGE(STATUS "Build Release Version in Windows as default")
     ELSE ()
@@ -302,7 +308,7 @@ IF (NOT DEFINED TD_CLUSTER)
     INSTALL(CODE "MESSAGE(\"make install script: ${TD_MAKE_INSTALL_SH}\")")
     INSTALL(CODE "execute_process(COMMAND chmod 777 ${TD_MAKE_INSTALL_SH})")
     INSTALL(CODE "execute_process(COMMAND ${TD_MAKE_INSTALL_SH} ${TD_COMMUNITY_DIR} ${PROJECT_BINARY_DIR})")  
-  ELSEIF (TD_WINDOWS_64)
+  ELSEIF (TD_WINDOWS_64 OR TD_WINDOWS_32)
     SET(CMAKE_INSTALL_PREFIX C:/${DB_FULL_NAME})  
     IF (NOT TD_GODLL)
       INSTALL(DIRECTORY ${TD_COMMUNITY_DIR}/src/connector/go DESTINATION connector)
@@ -311,6 +317,7 @@ IF (NOT DEFINED TD_CLUSTER)
       INSTALL(DIRECTORY ${TD_COMMUNITY_DIR}/tests/examples DESTINATION .)
       INSTALL(DIRECTORY ${TD_COMMUNITY_DIR}/packaging/cfg DESTINATION .)
       INSTALL(FILES ${TD_COMMUNITY_DIR}/src/inc/taos.h DESTINATION include)
+      INSTALL(FILES ${TD_COMMUNITY_DIR}/src/inc/taoserror.h DESTINATION include)
       INSTALL(FILES ${LIBRARY_OUTPUT_PATH}/taos.lib DESTINATION driver)
       INSTALL(FILES ${LIBRARY_OUTPUT_PATH}/taos.exp DESTINATION driver)
       INSTALL(FILES ${LIBRARY_OUTPUT_PATH}/taos.dll DESTINATION driver)      

deps/iconv/CMakeLists.txt

 CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
 PROJECT(TDengine)
 
-IF (TD_WINDOWS_64)
+IF (TD_WINDOWS_64 OR TD_WINDOWS_32)
   LIST(APPEND SRC iconv.c)
   LIST(APPEND SRC localcharset.c)
   INCLUDE_DIRECTORIES(.)

deps/pthread/CMakeLists.txt

 CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
 PROJECT(TDengine)
 
-IF (TD_WINDOWS_64)
+IF (TD_WINDOWS_64 OR TD_WINDOWS_32)
   INCLUDE_DIRECTORIES(.)
   LIST(APPEND SRC pthread.c)
   ADD_LIBRARY(pthread ${SRC})

deps/regex/CMakeLists.txt

 CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
 PROJECT(TDengine)
 
-IF (TD_WINDOWS_64)
+IF (TD_WINDOWS_64 OR TD_WINDOWS_32)
   INCLUDE_DIRECTORIES(inc .)
   LIST(APPEND SRC regex.c)
   ADD_LIBRARY(regex ${SRC})

documentation/webdocs/markdowndocs/Connector.md

@@ -740,12 +740,12 @@ The return value is like:
 
 ## Go Connector
 
-TDengine also provides a Go client package named _taosSql_ for users to access TDengine with Go. The package is in _/usr/local/taos/connector/go/src/taosSql_ by default if you installed TDengine. Users can copy the directory _/usr/local/taos/connector/go/src/taosSql_ to the _src_ directory of your project and import the package in the source code for use.
+TDengine also provides a Go client package named _taosSql_ for users to access TDengine with Go. The package is in _/usr/local/taos/connector/go/driver-go/taosSql_ by default if you installed TDengine. Users can copy the directory _/usr/local/taos/connector/go/driver-go/taosSql_ to the _src_ directory of your project and import the package in the source code for use.
 
 ```Go
 import (
     "database/sql"
-    _ "taosSql"
+    _ "github.com/taosdata/driver-go/taosSql"
 )
 ```