From b97daeabff33da6d74ec50aa5cb49822b252e864 Mon Sep 17 00:00:00 2001 From: Luis Date: Sat, 5 Sep 2026 16:26:56 +0200 Subject: [PATCH] more cleanup and and reducing differences with TC --- .gitignore | 30 ------------------------------ CMakeLists.txt | 2 +- PreLoad.cmake | 23 +++++++++++++++++++++++ appveyor.yml | 2 +- revision_data.h.in.cmake | 4 ++-- 5 files changed, 27 insertions(+), 34 deletions(-) create mode 100644 PreLoad.cmake diff --git a/.gitignore b/.gitignore index 3c8a46638..ca87c0fcc 100644 --- a/.gitignore +++ b/.gitignore @@ -23,33 +23,3 @@ nbproject/* cmake-build-*/* .vs *.user -.aider* - -# Build artifacts and logs -*.exe -*.log -build_*.txt -build_*.bat -worldserver_*.exe -*_build.log -*_output.txt -final_*.txt -test_*.bat - -# Python temporary files -*.tmp.* -*.pyc -__pycache__/ - -# SQL dumps and temporary data -*.sql.backup - -# Claude Code Enhancement - Environment variables (contains secrets) -.env -.env.local - -# Playerbot vendored dependencies (tracked via git submodules) -# Git automatically manages submodule contents via .gitmodules -# build*/ pattern above catches TBB build artifacts - -phase7a-compile-log.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index a2ff09541..3c0ec29fa 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -86,7 +86,7 @@ add_subdirectory(src) include(CTest) if(BUILD_TESTING) list(APPEND CMAKE_MODULE_PATH - "${Catch2_SOURCE_DIR}/extras") + "${Catch2_SOURCE_DIR}/contrib") include(Catch) add_subdirectory(tests) diff --git a/PreLoad.cmake b/PreLoad.cmake new file mode 100644 index 000000000..080ea5215 --- /dev/null +++ b/PreLoad.cmake @@ -0,0 +1,23 @@ +# This file is part of the TrinityCore 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. + +# This file is run right before CMake starts configuring the sourcetree + +# Example: Force CMAKE_INSTALL_PREFIX to be preloaded with something before +# doing the actual first "configure"-part - allows for hardforcing +# destinations elsewhere in the CMake buildsystem (commented out on purpose) + +# Override CMAKE_INSTALL_PREFIX on Windows platforms +#if(WIN32) +# if(NOT CYGWIN) +# set(CMAKE_INSTALL_PREFIX +# "" CACHE PATH "Default install path") +# endif() +#endif() diff --git a/appveyor.yml b/appveyor.yml index b9ee19158..3f2b1bbaa 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -11,7 +11,7 @@ build_script: - cmd: >- git config user.email "appveyor@build.bot" && git config user.name "AppVeyor" - cmake -S . -B .\build -G"Visual Studio 17 2022" -A x64 -DSCRIPTS=dynamic -DWITH_WARNINGS_AS_ERRORS=OFF -DTOOLS=ON + cmake -S . -B .\build -G"Visual Studio 17 2022" -A x64 -DSCRIPTS=dynamic -DWITH_WARNINGS_AS_ERRORS=ON -DTOOLS=ON cd build diff --git a/revision_data.h.in.cmake b/revision_data.h.in.cmake index 23a14c8f6..6d41be883 100644 --- a/revision_data.h.in.cmake +++ b/revision_data.h.in.cmake @@ -40,8 +40,8 @@ // Database updater base information #define DATABASE_MYSQL_EXECUTABLE R"(@MYSQL_EXECUTABLE@)" -#define DATABASE_FULL_DATABASE "TDB_full_world_1127.26011_2026_01_14.sql" -#define DATABASE_HOTFIXES_DATABASE "TDB_full_hotfixes_1127.26011_2026_01_14.sql" +#define DATABASE_FULL_DATABASE "TDB_full_world_1125.25101_2025_10_29.sql" +#define DATABASE_HOTFIXES_DATABASE "TDB_full_hotfixes_1125.25101_2025_10_29.sql" // Windows resource defines #define TRINITY_COMPANYNAME_STR "TrinityCore Developers"