Merge branch 'develop' of github.com:treefrogframework/treefrog-framework into develop

Author: treefrogframework

configure.bat

@@ -178,7 +178,7 @@ mklink /j mongo-driver mongo-c-driver-%MONBOC_VERSION% >nul 2>&1
 cd %BASEDIR%3rdparty\mongo-driver
 rd /s /q CMakeFiles >nul 2>&1
 del /f /q CMakeCache.txt Makefile >nul 2>&1
-set CMAKECMD=cmake %CMAKEOPT% -S . -DCMAKE_BUILD_TYPE=Release -DENABLE_STATIC=ON -DENABLE_SSL=OFF -DENABLE_SNAPPY=OFF -DENABLE_ZLIB=OFF -DENABLE_ZSTD=OFF -DENABLE_SRV=OFF -DENABLE_SASL=OFF -DENABLE_ZLIB=OFF -DENABLE_SHM_COUNTERS=OFF -DENABLE_TESTS=OFF
+set CMAKECMD=cmake %CMAKEOPT% -S . -DENABLE_STATIC=ON -DENABLE_SSL=OFF -DENABLE_SNAPPY=OFF -DENABLE_ZLIB=OFF -DENABLE_ZSTD=OFF -DENABLE_SRV=OFF -DENABLE_SASL=OFF -DENABLE_ZLIB=OFF -DENABLE_SHM_COUNTERS=OFF -DENABLE_TESTS=OFF
 echo %CMAKECMD%
 %CMAKECMD% >nul 2>&1
 
@@ -228,11 +228,15 @@ del /f /q glog >nul 2>&1
 mklink /j glog glog-%GLOG_VERSION% >nul 2>&1
 cd %BASEDIR%3rdparty\glog
 rmdir /s /q build >nul 2>&1
-set CMAKECMD=cmake -S . -B build %CMAKEOPT% -DBUILD_SHARED_LIBS=OFF
+set CMAKECMD=cmake -S . -B build %CMAKEOPT% -DBUILD_SHARED_LIBS=OFF -DWITH_GFLAGS=OFF
 echo %CMAKECMD%
 %CMAKECMD%
 
-set BUILDCMD=cmake --build build -j
+if "%DEBUG%" == "yes" (
+  set BUILDCMD=cmake --build build --config Debug -j
+) else (
+  set BUILDCMD=cmake --build build --config Release -j
+)
 echo %BUILDCMD%
 %BUILDCMD% >nul 2>&1
 if ERRORLEVEL 1 (

src/test/queue/main.cpp

@@ -87,11 +87,9 @@ private slots:
 
 void TestQueue::initTestCase()
 {
-#if defined(Q_OS_UNIX) || !defined(QT_NO_DEBUG)
     // Setup signal handlers for SIGSEGV, SIGILL, SIGFPE, SIGABRT and SIGBUS
     google::InstallFailureWriter(writeFailure);
     google::InstallFailureSignalHandler();
-#endif
 }
 
 

src/test/stack/main.cpp

@@ -110,11 +110,9 @@ private slots:
 
 void TestStack::initTestCase()
 {
-#if defined(Q_OS_UNIX) || !defined(QT_NO_DEBUG)
     // Setup signal handlers for SIGSEGV, SIGILL, SIGFPE, SIGABRT and SIGBUS
     google::InstallFailureWriter(writeFailure);
     google::InstallFailureSignalHandler();
-#endif
 }
 
 

src/test/test.pri

@@ -17,7 +17,7 @@ windows {
     TARGET = $$join(TARGET,,,d)
     LIBS += -L../../debug -ltreefrogd$${TF_VER_MAJ} ../../../3rdparty/glog/build/Debug/glogd.lib dbghelp.lib
   } else {
-    LIBS += -L../../release -ltreefrog$${TF_VER_MAJ}
+    LIBS += -L../../release -ltreefrog$${TF_VER_MAJ} ../../../3rdparty/glog/build/Release/glog.lib dbghelp.lib
   }
   INCLUDEPATH += ../../../3rdparty/glog/build ../../../3rdparty/glog/src
 } else:unix {

tools/tfserver/main.cpp

@@ -57,14 +57,12 @@ void messageOutput(QtMsgType type, const QMessageLogContext &context, const QStr
 }
 
 
-#if defined(Q_OS_UNIX) || !defined(TF_NO_DEBUG)
 void writeFailure(const char *data, size_t size)
 {
     QByteArray message(data, qsizetype(size));
     message.replace('\n', "");
     tSystemError("{}", message.constData());
 }
-#endif
 
 
 QMap<QString, QString> convertArgs(const QStringList &args)
@@ -208,11 +206,9 @@ int main(int argc, char *argv[])
     bool showRoutesOption = args.contains(SHOW_ROUTES_OPTION);
     ushort portNumber = args.value(PORT_OPTION).toUShort();
 
-#if defined(Q_OS_UNIX) || !defined(TF_NO_DEBUG)
     // Setup signal handlers for SIGSEGV, SIGILL, SIGFPE, SIGABRT and SIGBUS
     google::InstallFailureWriter(writeFailure);
     google::InstallFailureSignalHandler();
-#endif
 
 #ifdef Q_OS_UNIX
     webapp.watchUnixSignal(SIGTERM);

tools/tfserver/tfserver.pro

@@ -32,7 +32,7 @@ windows {
     TARGET = $$join(TARGET,,,d)
     LIBS += -ltreefrogd$${TF_VER_MAJ} ../../3rdparty/glog/build/Debug/glogd.lib dbghelp.lib
   } else {
-    LIBS += -ltreefrog$${TF_VER_MAJ}
+    LIBS += -ltreefrog$${TF_VER_MAJ} ../../3rdparty/glog/build/Release/glog.lib dbghelp.lib
   }
   INCLUDEPATH += ../../3rdparty/glog/build ../../3rdparty/glog/src
   LIBS += -L"$$target.path"