refactor(Cmake): add support build selected applications and tools (#11836)

src/server/CMakeLists.txt

@@ -10,22 +10,19 @@
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 #
 
-# Specified files for Windows
-if (WIN32)
-# Crash logs
-set(winDebugging
-  ${CMAKE_SOURCE_DIR}/src/common/Debugging/WheatyExceptionReport.cpp
-  ${CMAKE_SOURCE_DIR}/src/common/Debugging/WheatyExceptionReport.h)
+add_subdirectory(apps)
 
-# Service
-set(winService
-  ${CMAKE_SOURCE_DIR}/src/common/Platform/ServiceWin32.cpp
-  ${CMAKE_SOURCE_DIR}/src/common/Platform/ServiceWin32.h)
+# if ((APPS_BUILD AND NOT APPS_BUILD STREQUAL "none") OR BUILD_TOOLS_DB_IMPORT) # DB import PR
+if ((APPS_BUILD AND NOT APPS_BUILD STREQUAL "none"))
+  add_subdirectory(database)
+endif()
+
+if (BUILD_APPLICATION_AUTHSERVER OR BUILD_APPLICATION_WORLDSERVER)
+  add_subdirectory(shared)
+endif()
+
+if (BUILD_APPLICATION_WORLDSERVER)
+  add_subdirectory(game)
+  add_subdirectory(scripts)
 endif()
 
-add_subdirectory(authserver)
-add_subdirectory(database)
-add_subdirectory(game)
-add_subdirectory(shared)
-add_subdirectory(scripts)
-add_subdirectory(worldserver)

src/server/apps/CMakeLists.txt

@@ -0,0 +1,198 @@
+#
+# This file is part of the AzerothCore Project. See AUTHORS file for Copyright information
+#
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+# Make the script module list available in the current scope
+GetApplicationsList(APPLICATIONS_BUILD_LIST)
+
+if (APPS_BUILD STREQUAL "none")
+  set(APPS_DEFAULT_BUILD "disabled")
+else()
+  set(APPS_DEFAULT_BUILD "enabled")
+endif()
+
+# Sets BUILD_APPS_USE_WHITELIST
+# Sets BUILD_APPS_WHITELIST
+if (APPS_BUILD MATCHES "-only")
+  set(BUILD_APPS_USE_WHITELIST ON)
+
+  if (APPS_BUILD STREQUAL "auth-only")
+    list(APPEND BUILD_APPS_WHITELIST authserver)
+  endif()
+
+  if (APPS_BUILD STREQUAL "world-only")
+    list(APPEND BUILD_APPS_WHITELIST worldserver)
+  endif()
+endif()
+
+# Set the SCRIPTS_${BUILD_APP} variables from the
+# variables set above
+foreach(BUILD_APP ${APPLICATIONS_BUILD_LIST})
+  ApplicationNameToVariable(${BUILD_APP} BUILD_APP_VARIABLE)
+
+  if(${BUILD_APP_VARIABLE} STREQUAL "default")
+    if(BUILD_APPS_USE_WHITELIST)
+      list(FIND BUILD_APPS_WHITELIST "${BUILD_APP}" INDEX)
+      if(${INDEX} GREATER -1)
+        set(${BUILD_APP_VARIABLE} ${APPS_DEFAULT_BUILD})
+      else()
+        set(${BUILD_APP_VARIABLE} "disabled")
+      endif()
+    else()
+      set(${BUILD_APP_VARIABLE} ${APPS_DEFAULT_BUILD})
+    endif()
+  endif()
+
+  # Build the Graph values
+  if(${BUILD_APP_VARIABLE} MATCHES "enabled")
+    list(APPEND BUILD_APP_GRAPH_KEYS apps)
+    set(BUILD_APP_VALUE_DISPLAY_apps apps)
+    list(APPEND BUILD_APP_VALUE_CONTAINS_apps ${BUILD_APP})
+
+    if (${BUILD_APP} MATCHES "authserver")
+      set (BUILD_APPLICATION_AUTHSERVER 1)
+    elseif(${BUILD_APP} MATCHES "worldserver")
+      set (BUILD_APPLICATION_WORLDSERVER 1)
+    endif()
+  else()
+    list(APPEND BUILD_APP_GRAPH_KEYS disabled)
+    set(BUILD_APP_VALUE_DISPLAY_disabled disabled)
+    list(APPEND BUILD_APP_VALUE_CONTAINS_disabled ${BUILD_APP})
+  endif()
+endforeach()
+
+list(SORT BUILD_APP_GRAPH_KEYS)
+list(REMOVE_DUPLICATES BUILD_APP_GRAPH_KEYS)
+
+# Display the graphs
+message("")
+message("* Apps build list (${APPS_BUILD}):")
+message("  |")
+
+foreach(BUILD_APP_GRAPH_KEY ${BUILD_APP_GRAPH_KEYS})
+  if(NOT BUILD_APP_GRAPH_KEY STREQUAL "disabled")
+    message("  +- ${BUILD_APP_VALUE_DISPLAY_${BUILD_APP_GRAPH_KEY}}")
+  else()
+    message("  |  ${BUILD_APP_VALUE_DISPLAY_${BUILD_APP_GRAPH_KEY}}")
+  endif()
+  foreach(BUILD_APP_GRAPH_ENTRY ${BUILD_APP_VALUE_CONTAINS_${BUILD_APP_GRAPH_KEY}})
+    message("  |   +- ${BUILD_APP_GRAPH_ENTRY}")
+  endforeach()
+  message("  |")
+endforeach()
+
+message("")
+
+GroupSources(${CMAKE_CURRENT_SOURCE_DIR})
+
+# Generates the actual apps projects
+foreach(APPLICATION_NAME ${APPLICATIONS_BUILD_LIST})
+  GetPathToApplication(${APPLICATION_NAME} SOURCE_APP_PATH)
+  ApplicationNameToVariable(${APPLICATION_NAME} BUILD_APP_VARIABLE)
+
+  if (${BUILD_APP_VARIABLE} STREQUAL "disabled")
+    continue()
+  endif()
+
+  unset(APP_PRIVATE_SOURCES)
+  CollectSourceFiles(
+    ${SOURCE_APP_PATH}
+    APP_PRIVATE_SOURCES
+    # Exclude
+    ${SOURCE_APP_PATH}/PrecompiledHeaders)
+
+  if (WIN32)
+    list(APPEND APP_PRIVATE_SOURCES ${winDebugging})
+
+    if (${APPLICATION_NAME} MATCHES "worldserver")
+      list(APPEND APP_PRIVATE_SOURCES ${winService})
+    endif()
+
+    if (MSVC)
+      list(APPEND APP_PRIVATE_SOURCES ${SOURCE_APP_PATH}/${APPLICATION_NAME}.rc)
+    endif()
+  endif()
+
+  GetProjectNameOfApplicationName(${APPLICATION_NAME} APP_PROJECT_NAME)
+
+  # Create the application project
+  add_executable(${APP_PROJECT_NAME}
+    ${APP_PRIVATE_SOURCES})
+
+  add_dependencies(${APP_PROJECT_NAME} revision.h)
+
+  target_link_libraries(${APP_PROJECT_NAME}
+    PRIVATE
+      acore-core-interface)
+
+  if (${APP_PROJECT_NAME} MATCHES "authserver")
+    target_link_libraries(${APP_PROJECT_NAME}
+      PUBLIC
+        shared)
+  elseif(${APP_PROJECT_NAME} MATCHES "worldserver")
+    target_link_libraries(${APP_PROJECT_NAME}
+      PUBLIC
+        modules
+        scripts
+        game
+        gsoap
+        readline
+        gperftools)
+
+    if (UNIX AND NOT NOJEM)
+      set(${APP_PROJECT_NAME}_LINK_FLAGS "-pthread -lncurses ${${APP_PROJECT_NAME}_LINK_FLAGS}")
+    endif()
+
+    set_target_properties(${APP_PROJECT_NAME} PROPERTIES LINK_FLAGS "${${APP_PROJECT_NAME}_LINK_FLAGS}")
+
+    # Add all dynamic projects as dependency to the worldserver
+    if (WORLDSERVER_DYNAMIC_SCRIPT_MODULES_DEPENDENCIES)
+      add_dependencies(${APP_PROJECT_NAME} ${WORLDSERVER_DYNAMIC_SCRIPT_MODULES_DEPENDENCIES})
+    endif()
+   endif()
+
+  unset(APP_PUBLIC_INCLUDES)
+  CollectIncludeDirectories(
+    ${SOURCE_APP_PATH}
+    APP_PUBLIC_INCLUDES
+    # Exclude
+    ${SOURCE_APP_PATH}/PrecompiledHeaders)
+
+  target_include_directories(${APP_PROJECT_NAME}
+    PUBLIC
+      ${CMAKE_CURRENT_SOURCE_DIR})
+
+  target_include_directories(${APP_PROJECT_NAME}
+    PUBLIC
+      ${APP_PUBLIC_INCLUDES}
+    PRIVATE
+      ${CMAKE_CURRENT_BINARY_DIR}/${APPLICATION_NAME})
+
+  set_target_properties(${APP_PROJECT_NAME}
+    PROPERTIES
+      FOLDER
+        "server")
+
+  # Install config
+  CopyApplicationConfig(${APP_PROJECT_NAME} ${APPLICATION_NAME})
+
+  if (UNIX)
+    install(TARGETS ${APP_PROJECT_NAME} DESTINATION bin)
+  elseif (WIN32)
+    install(TARGETS ${APP_PROJECT_NAME} DESTINATION "${CMAKE_INSTALL_PREFIX}")
+  endif()
+
+  set(PATH_TO_PCH ${SOURCE_APP_PATH}/PrecompiledHeaders/${APPLICATION_NAME}PCH.h)
+
+  # Generate precompiled header
+  if (USE_COREPCH AND EXISTS ${PATH_TO_PCH})
+    add_cxx_pch(${APP_PROJECT_NAME} ${PATH_TO_PCH})
+  endif()
+endforeach()

src/server/apps/authserver/Main.cpp

@@ -41,8 +41,11 @@
 #include "SharedDefines.h"
 #include "Util.h"
 #include <boost/asio/signal_set.hpp>
+#include <boost/program_options.hpp>
 #include <boost/version.hpp>
 #include <csignal>
+#include <filesystem>
+#include <iostream>
 #include <openssl/crypto.h>
 #include <openssl/opensslv.h>
 
@@ -51,19 +54,15 @@
 #endif
 
 using boost::asio::ip::tcp;
+using namespace boost::program_options;
+namespace fs = std::filesystem;
 
 bool StartDB();
 void StopDB();
 void SignalHandler(std::weak_ptr<Acore::Asio::IoContext> ioContextRef, boost::system::error_code const& error, int signalNumber);
 void KeepDatabaseAliveHandler(std::weak_ptr<Acore::Asio::DeadlineTimer> dbPingTimerRef, int32 dbPingInterval, boost::system::error_code const& error);
 void BanExpiryHandler(std::weak_ptr<Acore::Asio::DeadlineTimer> banExpiryCheckTimerRef, int32 banExpiryCheckInterval, boost::system::error_code const& error);
-
-/// Print out the usage string for this program on the console.
-void usage(const char* prog)
-{
-    LOG_INFO("server.authserver", "Usage: \n {} [<options>]\n"
-        "    -c config_file           use config_file as configuration file\n\r", prog);
-}
+variables_map GetConsoleArguments(int argc, char** argv, fs::path& configFile);
 
 /// Launch the auth server
 int main(int argc, char** argv)
@@ -71,27 +70,16 @@ int main(int argc, char** argv)
     Acore::Impl::CurrentServerProcessHolder::_type = SERVER_PROCESS_AUTHSERVER;
     signal(SIGABRT, &Acore::AbortHandler);
 
-    // Command line parsing to get the configuration file name
-    std::string configFile = sConfigMgr->GetConfigPath() + std::string(_ACORE_REALM_CONFIG);
-    int count = 1;
-    while (count < argc)
-    {
-        if (strcmp(argv[count], "-c") == 0)
-        {
-            if (++count >= argc)
-            {
-                printf("Runtime-Error: -c option requires an input argument\n");
-                usage(argv[0]);
-                return 1;
-            }
-            else
-                configFile = argv[count];
-        }
-        ++count;
-    }
+    // Command line parsing
+    auto configFile = fs::path(sConfigMgr->GetConfigPath() + std::string(_ACORE_REALM_CONFIG));
+    auto vm = GetConsoleArguments(argc, argv, configFile);
+
+    // exit if help or version is enabled
+    if (vm.count("help"))
+        return 0;
 
     // Add file and args in config
-    sConfigMgr->Configure(configFile, std::vector<std::string>(argv, argv + argc));
+    sConfigMgr->Configure(configFile.generic_string(), std::vector<std::string>(argv, argv + argc));
 
     if (!sConfigMgr->LoadAppConfigs())
         return 1;
@@ -149,6 +137,13 @@ int main(int argc, char** argv)
         return 1;
     }
 
+    // Stop auth server if dry run
+    if (sConfigMgr->isDryRun())
+    {
+        LOG_INFO("server.authserver", "Dry run completed, terminating.");
+        return 0;
+    }
+
     // Start the listening port (acceptor) for auth connections
     int32 port = sConfigMgr->GetOption<int32>("RealmServerPort", 3724);
     if (port < 0 || port > 0xFFFF)
@@ -268,3 +263,36 @@ void BanExpiryHandler(std::weak_ptr<Acore::Asio::DeadlineTimer> banExpiryCheckTi
         }
     }
 }
+
+variables_map GetConsoleArguments(int argc, char** argv, fs::path& configFile)
+{
+    options_description all("Allowed options");
+    all.add_options()
+        ("help,h", "print usage message")
+        ("version,v", "print version build info")
+        ("dry-run,d", "Dry run")
+        ("config,c", value<fs::path>(&configFile)->default_value(fs::path(sConfigMgr->GetConfigPath() + std::string(_ACORE_REALM_CONFIG))), "use <arg> as configuration file");
+
+    variables_map variablesMap;
+
+    try
+    {
+        store(command_line_parser(argc, argv).options(all).allow_unregistered().run(), variablesMap);
+        notify(variablesMap);
+    }
+    catch (std::exception const& e)
+    {
+        std::cerr << e.what() << "\n";
+    }
+
+    if (variablesMap.count("help"))
+    {
+        std::cout << all << "\n";
+    }
+    else if (variablesMap.count("dry-run"))
+    {
+        sConfigMgr->setDryRun(true);
+    }
+
+    return variablesMap;
+}

src/server/apps/worldserver/Main.cpp

@@ -36,6 +36,7 @@
 #include "IoContext.h"
 #include "MapMgr.h"
 #include "Metric.h"
+#include "ModuleMgr.h"
 #include "ModulesScriptLoader.h"
 #include "MySQLThreading.h"
 #include "OpenSSLCrypto.h"
@@ -54,12 +55,12 @@
 #include <boost/asio/signal_set.hpp>
 #include <boost/program_options.hpp>
 #include <csignal>
+#include <filesystem>
+#include <iostream>
 #include <openssl/crypto.h>
 #include <openssl/opensslv.h>
 
-#include "ModuleMgr.h"
-
-#ifdef _WIN32
+#if AC_PLATFORM == AC_PLATFORM_WINDOWS
 #include "ServiceWin32.h"
 char serviceName[] = "worldserver";
 char serviceLongName[] = "AzerothCore world service";
@@ -78,6 +79,8 @@ int m_ServiceStatus = -1;
 #endif
 
 #define WORLD_SLEEP_CONST 10
+using namespace boost::program_options;
+namespace fs = std::filesystem;
 
 class FreezeDetector
 {
@@ -110,20 +113,7 @@ void ShutdownCLIThread(std::thread* cliThread);
 void AuctionListingRunnable();
 void ShutdownAuctionListingThread(std::thread* thread);
 void WorldUpdateLoop();
-
-/// Print out the usage string for this program on the console.
-void usage(const char* prog)
-{
-    printf("Usage:\n");
-    printf(" %s [<options>]\n", prog);
-    printf("    -c config_file           use config_file as configuration file\n");
-#ifdef _WIN32
-    printf("    Running as service functions:\n");
-    printf("    --service                run as service\n");
-    printf("    -s install               install service\n");
-    printf("    -s uninstall             uninstall service\n");
-#endif
-}
+variables_map GetConsoleArguments(int argc, char** argv, fs::path& configFile, [[maybe_unused]] std::string& cfg_service);
 
 /// Launch the Azeroth server
 int main(int argc, char** argv)
@@ -131,66 +121,26 @@ int main(int argc, char** argv)
     Acore::Impl::CurrentServerProcessHolder::_type = SERVER_PROCESS_WORLDSERVER;
     signal(SIGABRT, &Acore::AbortHandler);
 
-    ///- Command line parsing to get the configuration file name
-    std::string configFile = sConfigMgr->GetConfigPath() + std::string(_ACORE_CORE_CONFIG);
-    int c = 1;
-    while (c < argc)
-    {
-        if (strcmp(argv[c], "--dry-run") == 0)
-        {
-            sConfigMgr->setDryRun(true);
-        }
+    // Command line parsing
+    auto configFile = fs::path(sConfigMgr->GetConfigPath() + std::string(_ACORE_CORE_CONFIG));
+    std::string configService;
+    auto vm = GetConsoleArguments(argc, argv, configFile, configService);
 
-        if (!strcmp(argv[c], "-c"))
-        {
-            if (++c >= argc)
-            {
-                printf("Runtime-Error: -c option requires an input argument");
-                usage(argv[0]);
-                return 1;
-            }
-            else
-                configFile = argv[c];
-        }
+    // exit if help or version is enabled
+    if (vm.count("help"))
+        return 0;
 
-#ifdef _WIN32
-        if (strcmp(argv[c], "-s") == 0) // Services
-        {
-            if (++c >= argc)
-            {
-                printf("Runtime-Error: -s option requires an input argument");
-                usage(argv[0]);
-                return 1;
-            }
-
-            if (strcmp(argv[c], "install") == 0)
-            {
-                if (WinServiceInstall())
-                    printf("Installing service\n");
-                return 1;
-            }
-            else if (strcmp(argv[c], "uninstall") == 0)
-            {
-                if (WinServiceUninstall())
-                    printf("Uninstalling service\n");
-                return 1;
-            }
-            else
-            {
-                printf("Runtime-Error: unsupported option %s", argv[c]);
-                usage(argv[0]);
-                return 1;
-            }
-        }
-
-        if (strcmp(argv[c], "--service") == 0)
-            WinServiceRun();
+#if AC_PLATFORM == AC_PLATFORM_WINDOWS
+    if (configService.compare("install") == 0)
+        return WinServiceInstall() == true ? 0 : 1;
+    else if (configService.compare("uninstall") == 0)
+        return WinServiceUninstall() == true ? 0 : 1;
+    else if (configService.compare("run") == 0)
+        WinServiceRun();
 #endif
-        ++c;
-    }
 
     // Add file and args in config
-    sConfigMgr->Configure(configFile, { argv, argv + argc }, CONFIG_FILE_LIST);
+    sConfigMgr->Configure(configFile.generic_string(), {argv, argv + argc}, CONFIG_FILE_LIST);
 
     if (!sConfigMgr->LoadAppConfigs())
         return 1;
@@ -399,7 +349,7 @@ int main(int argc, char** argv)
 
     // Launch CliRunnable thread
     std::shared_ptr<std::thread> cliThread;
-#ifdef _WIN32
+#if AC_PLATFORM == AC_PLATFORM_WINDOWS
     if (sConfigMgr->GetOption<bool>("Console.Enable", true) && (m_ServiceStatus == -1)/* need disable console in service mode*/)
 #else
     if (sConfigMgr->GetOption<bool>("Console.Enable", true))
@@ -768,3 +718,44 @@ void ShutdownAuctionListingThread(std::thread* thread)
         delete thread;
     }
 }
+
+variables_map GetConsoleArguments(int argc, char** argv, fs::path& configFile, [[maybe_unused]] std::string& configService)
+{
+    options_description all("Allowed options");
+    all.add_options()
+        ("help,h", "print usage message")
+        ("version,v", "print version build info")
+        ("dry-run,d", "Dry run")
+        ("config,c", value<fs::path>(&configFile)->default_value(fs::path(sConfigMgr->GetConfigPath() + std::string(_ACORE_CORE_CONFIG))), "use <arg> as configuration file");
+
+#if AC_PLATFORM == WARHEAD_PLATFORM_WINDOWS
+    options_description win("Windows platform specific options");
+    win.add_options()
+        ("service,s", value<std::string>(&configService)->default_value(""), "Windows service options: [install | uninstall]");
+
+    all.add(win);
+#endif
+
+    variables_map vm;
+
+    try
+    {
+        store(command_line_parser(argc, argv).options(all).allow_unregistered().run(), vm);
+        notify(vm);
+    }
+    catch (std::exception const& e)
+    {
+        std::cerr << e.what() << "\n";
+    }
+
+    if (vm.count("help"))
+    {
+        std::cout << all << "\n";
+    }
+    else if (vm.count("dry-run"))
+    {
+        sConfigMgr->setDryRun(true);
+    }
+
+    return vm;
+}

src/server/authserver/CMakeLists.txt

@@ -1,77 +0,0 @@
-#
-# This file is part of the AzerothCore Project. See AUTHORS file for Copyright information
-#
-# This file is free software; as a special exception the author gives
-# unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-#
-
-########### authserver ###############
-
-CollectSourceFiles(
-  ${CMAKE_CURRENT_SOURCE_DIR}
-  PRIVATE_SOURCES
-  # Exclude
-  ${CMAKE_CURRENT_SOURCE_DIR}/PrecompiledHeaders)
-
-if( WIN32 )
-  list(APPEND PRIVATE_SOURCES ${winDebugging})
-  if ( MSVC )
-    list(APPEND PRIVATE_SOURCES authserver.rc)
-  endif()
-endif()
-
-if (USE_COREPCH)
-  set(PRIVATE_PCH_HEADER PrecompiledHeaders/authPCH.h)
-endif()
-
-# Group sources
-GroupSources(${CMAKE_CURRENT_SOURCE_DIR})
-
-add_executable(authserver
-  ${PRIVATE_SOURCES})
-
-add_dependencies(authserver revision.h)
-
-target_link_libraries(authserver
-  PRIVATE
-    acore-core-interface
-  PUBLIC
-    shared)
-
-CollectIncludeDirectories(
-  ${CMAKE_CURRENT_SOURCE_DIR}
-  PUBLIC_INCLUDES
-  # Exclude
-  ${CMAKE_CURRENT_SOURCE_DIR}/PrecompiledHeaders)
-
-target_include_directories(authserver
-  PUBLIC
-    ${PUBLIC_INCLUDES}
-  PRIVATE
-    ${CMAKE_CURRENT_BINARY_DIR})
-
-set_target_properties(authserver
-  PROPERTIES
-    FOLDER
-      "server")
-
-# Install config
-CopyDefaultConfig(authserver)
-
-if ( UNIX )
-  install(TARGETS authserver DESTINATION bin)
-elseif ( WIN32 )
-  install(TARGETS authserver DESTINATION "${CMAKE_INSTALL_PREFIX}")
-endif()
-
-# Generate precompiled header
-if (USE_COREPCH)
-  add_cxx_pch(authserver ${PRIVATE_PCH_HEADER})
-endif()
-
-CU_RUN_HOOK("AFTER_AUTHSERVER_CMAKE")

src/server/database/Database/MySQLConnection.cpp

@@ -90,7 +90,7 @@ uint32 MySQLConnection::Open()
     MYSQL* mysqlInit = mysql_init(nullptr);
     if (!mysqlInit)
     {
-        LOG_ERROR("sql.sql", "Could not initialize Mysql connection to database `{}`", m_connectionInfo.database);
+        LOG_ERROR("sql.driver", "Could not initialize Mysql connection to database `{}`", m_connectionInfo.database);
         return CR_UNKNOWN_ERROR;
     }
 
@@ -170,7 +170,7 @@ uint32 MySQLConnection::Open()
     }
     else
     {
-        LOG_ERROR("sql.sql", "Could not connect to MySQL database at {}: {}", m_connectionInfo.host, mysql_error(mysqlInit));
+        LOG_ERROR("sql.driver", "Could not connect to MySQL database at {}: {}", m_connectionInfo.host, mysql_error(mysqlInit));
         uint32 errorCode = mysql_errno(mysqlInit);
         mysql_close(mysqlInit);
         return errorCode;

src/server/scripts/CMakeLists.txt

@@ -12,11 +12,8 @@
 
 CU_RUN_HOOK(BEFORE_SCRIPTS_LIBRARY)
 
-message("")
-
 # Make the script module list available in the current scope
 GetScriptModuleList(SCRIPT_MODULE_LIST)
-GetModuleSourceList(MODULES_MODULE_LIST)
 
 # Make the native install offset available in this scope
 GetInstallOffset(INSTALL_OFFSET)
@@ -33,18 +30,6 @@ else()
   set(SCRIPTS_DEFAULT_LINKAGE "disabled")
 endif()
 
-# Sets the MODULES_${SOURCE_MODULE} variables
-# when using predefined templates for script building
-# like dynamic, static
-# Sets MODULES_DEFAULT_LINKAGE
-if(MODULES MATCHES "dynamic")
-  set(MODULES_DEFAULT_LINKAGE "dynamic")
-elseif(MODULES MATCHES "static")
-  set(MODULES_DEFAULT_LINKAGE "static")
-else()
-  set(MODULES_DEFAULT_LINKAGE "disabled")
-endif()
-
 # Sets SCRIPTS_USE_WHITELIST
 # Sets SCRIPTS_WHITELIST
 if(SCRIPTS MATCHES "minimal")
@@ -93,8 +78,8 @@ list(SORT SCRIPT_GRAPH_KEYS)
 list(REMOVE_DUPLICATES SCRIPT_GRAPH_KEYS)
 
 # Display the script graph
-message("* Script configuration (${SCRIPTS}):
-  |")
+message("* Script configuration (${SCRIPTS}):")
+message("  |")
 
 foreach(SCRIPT_GRAPH_KEY ${SCRIPT_GRAPH_KEYS})
   if(NOT SCRIPT_GRAPH_KEY STREQUAL "disabled")
@@ -108,10 +93,8 @@ foreach(SCRIPT_GRAPH_KEY ${SCRIPT_GRAPH_KEYS})
   message("  |")
 endforeach()
 
-message("")
-
 # Base sources which are used by every script project
-if(USE_SCRIPTPCH)
+if (USE_SCRIPTPCH)
   set(PRIVATE_PCH_HEADER ScriptPCH.h)
 endif()
 

src/server/shared/SharedDefines.h

@@ -19,7 +19,6 @@
 #define ACORE_SHAREDDEFINES_H
 
 #include "Define.h"
-#include "DetourNavMesh.h"
 #include "EnumFlag.h"
 #include <cassert>
 

src/server/worldserver/CMakeLists.txt

@@ -1,91 +0,0 @@
-#
-# This file is part of the AzerothCore Project. See AUTHORS file for Copyright information
-#
-# This file is free software; as a special exception the author gives
-# unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-#
-
-CollectSourceFiles(
-  ${CMAKE_CURRENT_SOURCE_DIR}
-  PRIVATE_SOURCES
-  # Exclude
-  ${CMAKE_CURRENT_SOURCE_DIR}/PrecompiledHeaders)
-
-if( WIN32 )
-  list(APPEND PRIVATE_SOURCES ${winDebugging} ${winService})
-  if ( MSVC )
-    list(APPEND PRIVATE_SOURCES worldserver.rc)
-  endif()
-endif()
-
-if (USE_COREPCH)
-  set(PRIVATE_PCH_HEADER PrecompiledHeaders/worldPCH.h)
-endif()
-
-# Group sources
-GroupSources(${CMAKE_CURRENT_SOURCE_DIR})
-
-add_executable(worldserver
-  ${PRIVATE_SOURCES})
-
-add_dependencies(worldserver revision.h)
-
-if(UNIX AND NOT NOJEM)
-  set(worldserver_LINK_FLAGS "-pthread -lncurses ${worldserver_LINK_FLAGS}")
-endif()
-
-set_target_properties(worldserver PROPERTIES LINK_FLAGS "${worldserver_LINK_FLAGS}")
-
-CollectIncludeDirectories(
-  ${CMAKE_CURRENT_SOURCE_DIR}
-  PUBLIC_INCLUDES
-  # Exclude
-  ${CMAKE_CURRENT_SOURCE_DIR}/PrecompiledHeaders)
-
-target_include_directories(worldserver
-  PUBLIC
-    ${PUBLIC_INCLUDES}
-  PRIVATE
-    ${CMAKE_CURRENT_BINARY_DIR})
-
-target_link_libraries(worldserver
-  PRIVATE
-    acore-core-interface
-  PUBLIC
-    modules
-    scripts
-    game
-    gsoap
-    readline
-    gperftools)
-
-set_target_properties(worldserver
-  PROPERTIES
-    FOLDER
-      "server")
-
-# Add all dynamic projects as dependency to the worldserver
-if(WORLDSERVER_DYNAMIC_SCRIPT_MODULES_DEPENDENCIES)
-  add_dependencies(worldserver ${WORLDSERVER_DYNAMIC_SCRIPT_MODULES_DEPENDENCIES})
-endif()
-
-# Install config
-CopyDefaultConfig(worldserver)
-
-if( UNIX )
-  install(TARGETS worldserver DESTINATION bin)
-elseif( WIN32 )
-  install(TARGETS worldserver DESTINATION "${CMAKE_INSTALL_PREFIX}")
-endif()
-
-# Generate precompiled header
-if( USE_COREPCH )
-  add_cxx_pch(worldserver ${PRIVATE_PCH_HEADER})
-endif()
-
-CU_RUN_HOOK("AFTER_WORLDSERVER_CMAKE")