mirror of
https://github.com/EQEmu/Server.git
synced 2026-06-02 23:40:26 +00:00
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>
This commit is contained in:
+8
-8
@@ -8161,7 +8161,7 @@ void Mob::DeleteBucket(std::string bucket_name)
|
||||
DataBucketKey k = GetScopedBucketKeys();
|
||||
k.key = bucket_name;
|
||||
|
||||
DataBucket::DeleteData(k);
|
||||
DataBucket::DeleteData(&database, k);
|
||||
}
|
||||
|
||||
std::string Mob::GetBucket(std::string bucket_name)
|
||||
@@ -8169,7 +8169,7 @@ std::string Mob::GetBucket(std::string bucket_name)
|
||||
DataBucketKey k = GetScopedBucketKeys();
|
||||
k.key = bucket_name;
|
||||
|
||||
auto b = DataBucket::GetData(k);
|
||||
auto b = DataBucket::GetData(&database, k);
|
||||
if (!b.value.empty()) {
|
||||
return b.value;
|
||||
}
|
||||
@@ -8181,7 +8181,7 @@ std::string Mob::GetBucketExpires(std::string bucket_name)
|
||||
DataBucketKey k = GetScopedBucketKeys();
|
||||
k.key = bucket_name;
|
||||
|
||||
std::string bucket_expiration = DataBucket::GetDataExpires(k);
|
||||
std::string bucket_expiration = DataBucket::GetDataExpires(&database, k);
|
||||
if (!bucket_expiration.empty()) {
|
||||
return bucket_expiration;
|
||||
}
|
||||
@@ -8194,7 +8194,7 @@ std::string Mob::GetBucketRemaining(std::string bucket_name)
|
||||
DataBucketKey k = GetScopedBucketKeys();
|
||||
k.key = bucket_name;
|
||||
|
||||
std::string bucket_remaining = DataBucket::GetDataRemaining(k);
|
||||
std::string bucket_remaining = DataBucket::GetDataRemaining(&database, k);
|
||||
if (!bucket_remaining.empty() && Strings::ToInt(bucket_remaining) > 0) {
|
||||
return bucket_remaining;
|
||||
}
|
||||
@@ -8212,7 +8212,7 @@ void Mob::SetBucket(std::string bucket_name, std::string bucket_value, std::stri
|
||||
k.expires = expiration;
|
||||
k.value = bucket_value;
|
||||
|
||||
DataBucket::SetData(k);
|
||||
DataBucket::SetData(&database, k);
|
||||
}
|
||||
|
||||
std::string Mob::GetMobDescription()
|
||||
@@ -8783,12 +8783,12 @@ bool Mob::LoadDataBucketsCache()
|
||||
}
|
||||
|
||||
if (IsBot()) {
|
||||
DataBucket::BulkLoadEntitiesToCache(DataBucketLoadType::Bot, {id});
|
||||
DataBucket::BulkLoadEntitiesToCache(&database, DataBucketLoadType::Bot, {id});
|
||||
}
|
||||
else if (IsClient()) {
|
||||
uint32 account_id = CastToClient()->AccountID();
|
||||
DataBucket::BulkLoadEntitiesToCache(DataBucketLoadType::Account, {account_id});
|
||||
DataBucket::BulkLoadEntitiesToCache(DataBucketLoadType::Client, {id});
|
||||
DataBucket::BulkLoadEntitiesToCache(&database, DataBucketLoadType::Account, {account_id});
|
||||
DataBucket::BulkLoadEntitiesToCache(&database, DataBucketLoadType::Client, {id});
|
||||
}
|
||||
|
||||
return true;
|
||||
|
||||
Reference in New Issue
Block a user