aboutsummaryrefslogtreecommitdiff
path: root/src/zenstore
diff options
context:
space:
mode:
authorStefan Boberg <[email protected]>2025-11-07 14:49:13 +0100
committerGitHub Enterprise <[email protected]>2025-11-07 14:49:13 +0100
commit24e43a913f29ac3b314354e8ce5175f135bcc64f (patch)
treeca442937ceeb63461012b33a4576e9835099f106 /src/zenstore
parentget oplog attachments (#622) (diff)
downloadzen-24e43a913f29ac3b314354e8ce5175f135bcc64f.tar.xz
zen-24e43a913f29ac3b314354e8ce5175f135bcc64f.zip
switch to xmake for package management (#611)
This change removes our dependency on vcpkg for package management, in favour of bringing some code in-tree in the `thirdparty` folder as well as using the xmake build-in package management feature. For the latter, all the package definitions are maintained in the zen repo itself, in the `repo` folder. It should now also be easier to build the project as it will no longer depend on having the right version of vcpkg installed, which has been a common problem for new people coming in to the codebase. Now you should only need xmake to build. * Bumps xmake requirement on github runners to 2.9.9 to resolve an issue where xmake on Windows invokes cmake with `v144` toolchain which does not exist * BLAKE3 is now in-tree at `thirdparty/blake3` * cpr is now in-tree at `thirdparty/cpr` * cxxopts is now in-tree at `thirdparty/cxxopts` * fmt is now in-tree at `thirdparty/fmt` * robin-map is now in-tree at `thirdparty/robin-map` * ryml is now in-tree at `thirdparty/ryml` * sol2 is now in-tree at `thirdparty/sol2` * spdlog is now in-tree at `thirdparty/spdlog` * utfcpp is now in-tree at `thirdparty/utfcpp` * xmake package repo definitions is in `repo` * implemented support for sanitizers. ASAN is supported on windows, TSAN, UBSAN, MSAN etc are supported on Linux/MacOS though I have not yet tested it extensively on MacOS * the zencore encryption implementation also now supports using mbedTLS which is used on MacOS, though for now we still use openssl on Linux * crashpad * bumps libcurl to 8.11.0 (from 8.8.0) which should address a rare build upload bug
Diffstat (limited to 'src/zenstore')
-rw-r--r--src/zenstore/gc.cpp2
-rw-r--r--src/zenstore/xmake.lua4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/zenstore/gc.cpp b/src/zenstore/gc.cpp
index e58bbb6e2..ba1bce974 100644
--- a/src/zenstore/gc.cpp
+++ b/src/zenstore/gc.cpp
@@ -636,7 +636,7 @@ KeepUnusedReferences(std::span<const IoHash> SortedUsedReferences, std::span<IoH
{
if (ReferencesRead != ReferencesWrite)
{
- memcpy(ReferencesWrite, ReferencesRead, sizeof(IoHash::Hash) * Remaining);
+ memmove(ReferencesWrite, ReferencesRead, sizeof(IoHash::Hash) * Remaining);
}
ReferencesWrite += Remaining;
}
diff --git a/src/zenstore/xmake.lua b/src/zenstore/xmake.lua
index cf5f30d09..31289a573 100644
--- a/src/zenstore/xmake.lua
+++ b/src/zenstore/xmake.lua
@@ -7,5 +7,5 @@ target('zenstore')
add_files("**.cpp")
add_includedirs("include", {public=true})
add_deps("zencore", "zenutil", "zenvfs")
- add_packages("vcpkg::robin-map")
- add_packages("vcpkg::eastl", {public=true});
+ add_deps("robin-map")
+ add_packages("eastl", {public=true});