Merge pull request #680 from taosdata/feature/windows64_client

Fix some compilation and packaging problems under windows

CMakeLists.txt

@@ -166,7 +166,7 @@ ELSEIF (TD_WINDOWS)
   INSTALL(TARGETS taos RUNTIME DESTINATION driver) 
   INSTALL(TARGETS shell RUNTIME DESTINATION .)
   IF (TD_MVN_INSTALLED)
-    INSTALL(FILES ${LIBRARY_OUTPUT_PATH}/taos-jdbcdriver-1.0.1-dist.jar DESTINATION connector/jdbc)
+      INSTALL(FILES ${LIBRARY_OUTPUT_PATH}/taos-jdbcdriver-1.0.2-dist.jar DESTINATION connector/jdbc)
   ENDIF ()
 ENDIF ()  
 

src/connector/jdbc/CMakeLists.txt

@@ -8,7 +8,7 @@ IF (TD_MVN_INSTALLED)
   ADD_CUSTOM_COMMAND(OUTPUT ${JDBC_CMD_NAME}
     POST_BUILD
     COMMAND mvn -Dmaven.test.skip=true install -f ${CMAKE_CURRENT_SOURCE_DIR}/pom.xml
-    COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/target/taos-jdbcdriver-*.jar ${LIBRARY_OUTPUT_PATH}
+    COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/target/taos-jdbcdriver-1.0.2-dist.jar ${LIBRARY_OUTPUT_PATH}
     COMMAND mvn -Dmaven.test.skip=true clean -f ${CMAKE_CURRENT_SOURCE_DIR}/pom.xml
     COMMENT "build jdbc driver")
   ADD_CUSTOM_TARGET(${JDBC_TARGET_NAME} ALL WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH} DEPENDS ${JDBC_CMD_NAME})

src/os/windows/inc/os.h

@@ -76,8 +76,10 @@ extern "C" {
 
 int32_t __sync_val_compare_and_swap_32(int32_t *ptr, int32_t oldval, int32_t newval);
 int32_t __sync_add_and_fetch_32(int32_t *ptr, int32_t val);
+int32_t __sync_sub_and_fetch_32(int32_t *ptr, int32_t val);
 int64_t __sync_val_compare_and_swap_64(int64_t *ptr, int64_t oldval, int64_t newval);
 int64_t __sync_add_and_fetch_64(int64_t *ptr, int64_t val);
+int64_t __sync_sub_and_fetch_64(int64_t *ptr, int64_t val);
 int32_t __sync_val_load_32(int32_t *ptr);
 void __sync_val_restore_32(int32_t *ptr, int32_t newval);
 

src/os/windows/src/twindows.c

@@ -70,6 +70,10 @@ int32_t __sync_add_and_fetch_32(int32_t *ptr, int32_t val) {
   return InterlockedAdd(ptr, val);
 }
 
+int32_t __sync_sub_and_fetch_32(int32_t *ptr, int32_t val) {
+  return InterlockedAdd(ptr, -val);
+}
+
 int64_t __sync_val_compare_and_swap_64(int64_t *ptr, int64_t oldval, int64_t newval) {
   return InterlockedCompareExchange64(ptr, newval, oldval);
 }
@@ -78,6 +82,10 @@ int64_t __sync_add_and_fetch_64(int64_t *ptr, int64_t val) {
   return InterlockedAdd64(ptr, val);
 }
 
+int64_t __sync_sub_and_fetch_64(int64_t *ptr, int64_t val) {
+  return InterlockedAdd64(ptr, -val);
+}
+
 int32_t __sync_val_load_32(int32_t *ptr) {
   return InterlockedOr(ptr, 0);
 }

src/util/src/version.c

-char version[64] = "1.6.3.0";
+char version[64] = "1.6.3.1";
 char compatible_version[64] = "1.6.1.0";
-char gitinfo[128] = "49080adeee33c95d1174ac96eca9e62536e2da0f";
-char buildinfo[512] = "Built by ubuntu at 2019-10-21 19:33";
+char gitinfo[128] = "c2f65ef028b41213c8c731778eff019814bd0538";
+char buildinfo[512] = "Built by ubuntu at 2019-11-07 11:17";