From cf1c6346d5351277b049fb1ce71c0357f0be4bb7 Mon Sep 17 00:00:00 2001
From: afwerar <1296468573@qq.com>
Date: Wed, 24 Aug 2022 17:09:12 +0800
Subject: [PATCH] build: cmake warning error

---
 cmake/cmake.define            |  2 ++
 packaging/release.bat         | 18 ++++--------------
 source/client/src/clientEnv.c |  2 ++
 source/os/src/osFile.c        |  5 +++--
 source/os/src/osSysinfo.c     |  7 +++----
 5 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/cmake/cmake.define b/cmake/cmake.define
index 5d64815a9a..376a55d396 100644
--- a/cmake/cmake.define
+++ b/cmake/cmake.define
@@ -2,6 +2,8 @@ cmake_minimum_required(VERSION 3.0)
 
 set(CMAKE_VERBOSE_MAKEFILE OFF)
 
+SET(BUILD_SHARED_LIBS "OFF")
+
 #set output directory
 SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/build/lib)
 SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/build/bin)
diff --git a/packaging/release.bat b/packaging/release.bat
index ffd3a68048..591227382f 100644
--- a/packaging/release.bat
+++ b/packaging/release.bat
@@ -40,10 +40,12 @@ if not exist %work_dir%\debug\ver-%2-x86 (
 )
 cd %work_dir%\debug\ver-%2-x64
 call vcvarsall.bat x64
-cmake ../../ -G "NMake Makefiles JOM" -DCMAKE_MAKE_PROGRAM=jom -DBUILD_TOOLS=true -DBUILD_HTTP=false -DVERNUMBER=%2 -DCPUTYPE=x64
+cmake ../../ -G "NMake Makefiles JOM" -DCMAKE_MAKE_PROGRAM=jom -DBUILD_TOOLS=true -DBUILD_HTTP=false -DBUILD_TEST=false -DVERNUMBER=%2 -DCPUTYPE=x64
 cmake --build .
 rd /s /Q C:\TDengine
 cmake --install .
+for /r c:\TDengine %%i in (*.dll) do signtool sign /f D:\\123.pfx /p taosdata %%i
+for /r c:\TDengine %%i in (*.exe) do signtool sign /f D:\\123.pfx /p taosdata %%i
 if not %errorlevel% == 0  ( call :RUNFAILED build x64 failed & exit /b 1)
 cd %package_dir%
 iscc /DMyAppInstallName="%packagServerName_x64%" /DMyAppVersion="%2" /DMyAppExcludeSource="" tools\tdengine.iss /O..\release
@@ -51,19 +53,7 @@ if not %errorlevel% == 0  ( call :RUNFAILED package %packagServerName_x64% faile
 iscc /DMyAppInstallName="%packagClientName_x64%" /DMyAppVersion="%2" /DMyAppExcludeSource="taosd.exe" tools\tdengine.iss /O..\release
 if not %errorlevel% == 0  ( call :RUNFAILED package %packagClientName_x64% failed & exit /b 1)
 
-cd %work_dir%\debug\ver-%2-x86
-call vcvarsall.bat x86
-cmake ../../ -G "NMake Makefiles JOM" -DCMAKE_MAKE_PROGRAM=jom -DBUILD_TOOLS=true -DBUILD_HTTP=false -DVERNUMBER=%2 -DCPUTYPE=x86
-cmake --build .
-rd /s /Q C:\TDengine
-cmake --install .
-if not %errorlevel% == 0  ( call :RUNFAILED build x86 failed & exit /b 1)
-cd %package_dir%
-@REM iscc /DMyAppInstallName="%packagServerName_x86%" /DMyAppVersion="%2" /DMyAppExcludeSource="" tools\tdengine.iss /O..\release
-@REM if not %errorlevel% == 0  ( call :RUNFAILED package %packagServerName_x86% failed & exit /b 1)
-iscc /DMyAppInstallName="%packagClientName_x86%" /DMyAppVersion="%2" /DMyAppExcludeSource="taosd.exe" tools\tdengine.iss /O..\release
-if not %errorlevel% == 0  ( call :RUNFAILED package %packagClientName_x86% failed & exit /b 1)
-
+for /r ..\release %%i in (*.exe) do signtool sign /f d:\\123.pfx /p taosdata %%i
 goto EXIT0
 
 :USAGE
diff --git a/source/client/src/clientEnv.c b/source/client/src/clientEnv.c
index ff1b9322c9..99ecab9642 100644
--- a/source/client/src/clientEnv.c
+++ b/source/client/src/clientEnv.c
@@ -393,7 +393,9 @@ void taos_init_imp(void) {
   schedulerInit();
   tscDebug("starting to initialize TAOS driver");
 
+#ifndef WINDOWS
   taosSetCoreDump(true);
+#endif
 
   initTaskQueue();
   fmFuncMgtInit();
diff --git a/source/os/src/osFile.c b/source/os/src/osFile.c
index 2d9cfe3246..f9797f6319 100644
--- a/source/os/src/osFile.c
+++ b/source/os/src/osFile.c
@@ -203,10 +203,11 @@ int32_t taosRenameFile(const char *oldName, const char *newName) {
 }
 
 int32_t taosStatFile(const char *path, int64_t *size, int32_t *mtime) {
-  struct stat fileStat;
 #ifdef WINDOWS
-  int32_t code = _stat(path, &fileStat);
+  struct _stati64 fileStat;
+  int32_t code = _stati64(path, &fileStat);
 #else
+  struct stat fileStat;
   int32_t code = stat(path, &fileStat);
 #endif
   if (code < 0) {
diff --git a/source/os/src/osSysinfo.c b/source/os/src/osSysinfo.c
index 3a75e18a7f..3aa3f4f29e 100644
--- a/source/os/src/osSysinfo.c
+++ b/source/os/src/osSysinfo.c
@@ -851,13 +851,12 @@ char *taosGetCmdlineByPID(int pid) {
 }
 
 void taosSetCoreDump(bool enable) {
+  if (!enable) return;
 #ifdef WINDOWS
-  // SetUnhandledExceptionFilter(exceptionHandler);
-  // SetUnhandledExceptionFilter(&FlCrashDump);
+  SetUnhandledExceptionFilter(exceptionHandler);
+  SetUnhandledExceptionFilter(&FlCrashDump);
 #elif defined(_TD_DARWIN_64)
 #else
-  if (!enable) return;
-
   // 1. set ulimit -c unlimited
   struct rlimit rlim;
   struct rlimit rlim_new;
-- 
GitLab