Build Improvements (#5033)

* Start rewrite, add vcpkg

* Simple vcpkg manifest, will almost certainly need tweaking

* Remove cmake ext we wont be using anymore

* Update vcpkg to no longer be from 2022, update cmake lists (wip)

* Add finds to the toplevel cmakelists

* WIP, luabind and perlbind build.  Common only partially builds.

* Fix common build.

* shared_memory compiles

* client files compile

* Tests and more cmake version updates

* World, had to swap out zlib-ng for now because it wasn't playing nicely along side the zlib install.  May revisit.

* UCS compiles now too!

* queryserv and eqlaunch

* loginserver works

* Zone works but is messy, tomorrow futher cleanup!

* Cleanup main file

* remove old zlibng, remove perlwrap, remove hc

* More cleanup

* vcpkg baseline set for CI

* Remove pkg-config, it's the suggested way to use luajit with vcpkg but it causes issues with CI and might be a pain point for windows users

* Actually add file

* Set perlbind include dir

* Perl link got lost

* PERL_SET_INTERP causes an issue on newer versions of perl on windows because a symbol is not properly exported in their API, change the lines so it's basically what it used to be

* Remove static unix linking, we dont do automated released anymore and this was tightly coupled to that.  Can explore this again if we decide to change that.

* Remove unused submodules, set cmake policy for boost

* Fix some cereal includes

* Improve some boilerplate, I'd still like to do better about getting linker stuff set.

* Going through and cleaning up the build.

* Fix world, separate out data_buckets.

* add fixes for other servers

* fix zone

* Fix client files, loginserver and tests

* Newer versions of libmariadb default to tls forced on, return to the default of not forcing that.
auto_login were breaking on linux builds
loginserver wasn't setting proper openssl compile flag

* Move set out of a giant cpp file include.

* Convert show

* convert find

* Add uuid to unix builds

* Remove some cpp includes.

* Restructure to remove more things.

* change db update manifest to header
change build yml

* Move world CLI include cpps to cmake.

* Move zone cli out of source and into cmake

* Sidecar stuff wont directly include cpp files now too.

* Fix uuid-dev missing on linux runner

* Reorg common cmake file

* Some cleanup

* Fix libsodium support (oops). Fix perl support (more oops)

* Change doc

---------

Co-authored-by: KimLS <KimLS@peqtgc.com>

world/CMakeLists.txt

@@ -1,17 +1,35 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 3.12)
+cmake_minimum_required(VERSION 3.20)
 
-SET(world_sources
+set(world_sources
     adventure.cpp
     adventure_manager.cpp
+    cli/cli_bots_disable.cpp
+    cli/cli_bots_enable.cpp
+    cli/cli_copy_character.cpp
+    cli/cli_database_concurrency.cpp
+    cli/cli_database_dump.cpp
+    cli/cli_database_get_schema.cpp
+    cli/cli_database_set_account_status.cpp
+    cli/cli_database_updates.cpp
+    cli/cli_database_version.cpp
+    cli/cli_etl_get_settings.cpp
+    cli/cli_mercs_disable.cpp
+    cli/cli_mercs_enable.cpp
+    cli/cli_test.cpp
+    cli/cli_test_colors.cpp
+    cli/cli_test_expansion.cpp
+    cli/cli_test_repository.cpp
+    cli/cli_test_repository_2.cpp
+    cli/cli_test_string_benchmark.cpp
+    cli/cli_version.cpp
     client.cpp
     cliententry.cpp
     clientlist.cpp
     console.cpp
-    ../common/data_bucket.cpp
     dynamic_zone.cpp
     dynamic_zone_manager.cpp
-    eql_config.cpp
     eqemu_api_world_data_service.cpp
+    eql_config.cpp
     launcher_link.cpp
     launcher_list.cpp
     lfplist.cpp
@@ -25,17 +43,17 @@ SET(world_sources
     web_interface.cpp
     web_interface_eqw.cpp
     wguild_mgr.cpp
-    world_event_scheduler.cpp
+    world_boot.cpp
     world_config.cpp
     world_console_connection.cpp
+    world_event_scheduler.cpp
     world_server_cli.cpp
     worlddb.cpp
-    world_boot.cpp
     zonelist.cpp
     zoneserver.cpp
-    )
+)
 
-SET(world_headers
+set(world_headers
     adventure.h
     adventure_manager.h
     adventure_template.h
@@ -43,11 +61,10 @@ SET(world_headers
     cliententry.h
     clientlist.h
     console.h
-    ../common/data_bucket.h
     dynamic_zone.h
     dynamic_zone_manager.h
-    eql_config.h
     eqemu_api_world_data_service.h
+    eql_config.h
     launcher_link.h
     launcher_list.h
     lfplist.h
@@ -61,27 +78,29 @@ SET(world_headers
     web_interface.h
     web_interface_eqw.h
     wguild_mgr.h
+    world_boot.h
     world_config.h
     world_console_connection.h
-    world_tcp_connection.h
-    world_server_cli.h
-    worlddb.h
-    world_boot.h
     world_event_scheduler.h
+    world_server_cli.h
+    world_tcp_connection.h
+    worlddb.h
     zonelist.h
     zoneserver.h
-    )
+)
 
-ADD_EXECUTABLE(world ${world_sources} ${world_headers})
+source_group("cli" REGULAR_EXPRESSION "cli/.*")
 
-INSTALL(TARGETS world RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
+add_executable(world ${world_sources} ${world_headers})
 
-IF (WIN32 AND EQEMU_BUILD_PCH)
-    TARGET_PRECOMPILE_HEADERS(world PRIVATE ../common/pch/std-pch.h)
-ENDIF ()
+target_compile_definitions(world PRIVATE WORLD)
 
-ADD_DEFINITIONS(-DWORLD)
+target_link_libraries(world common)
 
-TARGET_LINK_LIBRARIES(world ${SERVER_LIBS})
+if(WIN32 AND EQEMU_BUILD_PCH)
+    target_precompile_headers(world PRIVATE ../common/pch/std-pch.h)
+endif()
 
-SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
+install(TARGETS world RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
+
+set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)

world/cli/cli_bots_disable.cpp

@@ -1,3 +1,4 @@
+#include "../world_server_cli.h"
 #include "../worlddb.h"
 #include "../../common/database_schema.h"
 

world/cli/cli_bots_enable.cpp

@@ -1,3 +1,4 @@
+#include "../world_server_cli.h"
 #include "../worlddb.h"
 #include "../../common/rulesys.h"
 

world/cli/cli_copy_character.cpp

@@ -1,3 +1,5 @@
+#include "../world_server_cli.h"
+#include "../../common/eqemu_logsys.h"
 #include "../../common/eqemu_logsys_log_aliases.h"
 #include "../worlddb.h"
 

world/cli/cli_database_concurrency.cpp

@@ -1,4 +1,5 @@
 #include <thread>
+#include "../world_server_cli.h"
 #include "../../common/repositories/zone_repository.h"
 #include "../../common/eqemu_config.h"
 #include <signal.h>

world/cli/cli_database_dump.cpp

@@ -1,3 +1,4 @@
+#include "../world_server_cli.h"
 #include "../../common/database/database_dump_service.h"
 
 void WorldserverCLI::DatabaseDump(int argc, char **argv, argh::parser &cmd, std::string &description)

world/cli/cli_database_get_schema.cpp

@@ -1,3 +1,4 @@
+#include "../world_server_cli.h"
 #include "../../common/database_schema.h"
 #include "../../common/json/json.h"
 

world/cli/cli_database_set_account_status.cpp

@@ -1,3 +1,4 @@
+#include "../world_server_cli.h"
 #include "../worlddb.h"
 
 void WorldserverCLI::DatabaseSetAccountStatus(int argc, char **argv, argh::parser &cmd, std::string &description)

world/cli/cli_database_updates.cpp

@@ -1,3 +1,5 @@
+#include "../world_server_cli.h"
+#include "../worlddb.h"
 #include "../../common/database/database_update.h"
 
 void WorldserverCLI::DatabaseUpdates(int argc, char **argv, argh::parser &cmd, std::string &description)

world/cli/cli_database_version.cpp

@@ -1,3 +1,4 @@
+#include "../world_server_cli.h"
 #include "../../common/version.h"
 #include "../../common/json/json.h"
 #include "../../common/rulesys.h"

world/cli/cli_etl_get_settings.cpp

@@ -1,3 +1,5 @@
+#include "../world_server_cli.h"
+#include "../worlddb.h"
 #include "../../common/events/player_event_logs.h"
 #include "../../common/json/json.h"
 

world/cli/cli_mercs_disable.cpp

@@ -1,3 +1,4 @@
+#include "../world_server_cli.h"
 #include "../worlddb.h"
 #include "../../common/database_schema.h"
 

world/cli/cli_mercs_enable.cpp

@@ -1,3 +1,4 @@
+#include "../world_server_cli.h"
 #include "../worlddb.h"
 #include "../../common/database_schema.h"
 

world/cli/cli_test.cpp

@@ -1,3 +1,4 @@
+#include "../world_server_cli.h"
 #include <cereal/archives/json.hpp>
 #include <cereal/types/vector.hpp>
 #include <iomanip>

world/cli/cli_test_colors.cpp

@@ -1,3 +1,4 @@
+#include "../world_server_cli.h"
 #include "../../common/zone_store.h"
 #include "../../common/termcolor/rang.hpp"
 

world/cli/cli_test_expansion.cpp

@@ -1,3 +1,4 @@
+#include "../world_server_cli.h"
 #include "../../common/rulesys.h"
 #include "../../common/repositories/content_flags_repository.h"
 #include "../../common/content/world_content_service.h"

world/cli/cli_test_repository.cpp

@@ -1,3 +1,4 @@
+#include "../world_server_cli.h"
 #include "../../common/repositories/instance_list_repository.h"
 #include "../worlddb.h"
 

world/cli/cli_test_repository_2.cpp

@@ -1,3 +1,5 @@
+#include "../world_server_cli.h"
+#include "../worlddb.h"
 #include "../../common/repositories/zone_repository.h"
 
 void WorldserverCLI::TestRepository2(int argc, char **argv, argh::parser &cmd, std::string &description)

world/cli/cli_test_string_benchmark.cpp

@@ -1,3 +1,4 @@
+#include "../world_server_cli.h"
 #include <cereal/archives/json.hpp>
 #include <cereal/types/vector.hpp>
 #include "../../common/events/player_events.h"

world/cli/cli_version.cpp

@@ -1,3 +1,4 @@
+#include "../world_server_cli.h"
 #include "../../common/json/json.h"
 #include "../../common/version.h"
 

world/client.cpp

@@ -2530,9 +2530,9 @@ void Client::SendUnsupportedClientPacket(const std::string& message)
 
 void Client::LoadDataBucketsCache()
 {
-	DataBucket::BulkLoadEntitiesToCache(DataBucketLoadType::Account, {GetAccountID()});
+	DataBucket::BulkLoadEntitiesToCache(&database, DataBucketLoadType::Account, {GetAccountID()});
 	const auto ids = CharacterDataRepository::GetCharacterIDsByAccountID(database, GetAccountID());
-	DataBucket::BulkLoadEntitiesToCache(DataBucketLoadType::Client, ids);
+	DataBucket::BulkLoadEntitiesToCache(&database, DataBucketLoadType::Client, ids);
 }
 
 void Client::ClearDataBucketsCache()

world/world_server_cli.cpp

@@ -39,22 +39,3 @@ void WorldserverCLI::CommandHandler(int argc, char **argv)
 	EQEmuCommand::HandleMenu(function_map, cmd, argc, argv);
 }
 
-#include "cli/database_concurrency.cpp"
-#include "cli/bots_enable.cpp"
-#include "cli/bots_disable.cpp"
-#include "cli/mercs_enable.cpp"
-#include "cli/mercs_disable.cpp"
-#include "cli/copy_character.cpp"
-#include "cli/database_updates.cpp"
-#include "cli/database_dump.cpp"
-#include "cli/database_get_schema.cpp"
-#include "cli/database_set_account_status.cpp"
-#include "cli/database_version.cpp"
-#include "cli/test.cpp"
-#include "cli/test_colors.cpp"
-#include "cli/test_expansion.cpp"
-#include "cli/test_repository.cpp"
-#include "cli/test_repository_2.cpp"
-#include "cli/test_string_benchmark.cpp"
-#include "cli/version.cpp"
-#include "cli/etl_get_settings.cpp"