diff options
| author | Dan Engelbrecht <[email protected]> | 2022-11-17 13:13:46 +0100 |
|---|---|---|
| committer | GitHub <[email protected]> | 2022-11-17 04:13:46 -0800 |
| commit | 4c95b15f90bf99104c8b528ef0ac2da05c86c612 (patch) | |
| tree | 1f46ad87e58fb4f7a5cb44df59f6ecbec41835e6 | |
| parent | actions/[email protected] -> actions/checkout@v3 (diff) | |
| download | zen-4c95b15f90bf99104c8b528ef0ac2da05c86c612.tar.xz zen-4c95b15f90bf99104c8b528ef0ac2da05c86c612.zip | |
move BasicFile to zenutil to remove zenstore dependency from zen command (#190)
| -rw-r--r-- | zen/xmake.lua | 2 | ||||
| -rw-r--r-- | zenserver/cache/structuredcachestore.h | 1 | ||||
| -rw-r--r-- | zenserver/projectstore.cpp | 2 | ||||
| -rw-r--r-- | zenserver/zenserver.cpp | 2 | ||||
| -rw-r--r-- | zenstore/filecas.cpp | 2 | ||||
| -rw-r--r-- | zenstore/include/zenstore/blockstore.h | 2 | ||||
| -rw-r--r-- | zenstore/include/zenstore/caslog.h | 2 | ||||
| -rw-r--r-- | zenstore/xmake.lua | 2 | ||||
| -rw-r--r-- | zenstore/zenstore.cpp | 2 | ||||
| -rw-r--r-- | zenutil/basicfile.cpp (renamed from zenstore/basicfile.cpp) | 2 | ||||
| -rw-r--r-- | zenutil/include/zenutil/basicfile.h (renamed from zenstore/include/zenstore/basicfile.h) | 2 |
11 files changed, 9 insertions, 12 deletions
diff --git a/zen/xmake.lua b/zen/xmake.lua index 3bf643cb2..6f4d74f0e 100644 --- a/zen/xmake.lua +++ b/zen/xmake.lua @@ -4,7 +4,7 @@ target("zen") set_kind("binary") add_headerfiles("**.h") add_files("**.cpp") - add_deps("zencore", "zenstore", "zenhttp", "zenutil") + add_deps("zencore", "zenhttp", "zenutil") add_includedirs(".") set_symbols("debug") diff --git a/zenserver/cache/structuredcachestore.h b/zenserver/cache/structuredcachestore.h index 8812556c1..79684be94 100644 --- a/zenserver/cache/structuredcachestore.h +++ b/zenserver/cache/structuredcachestore.h @@ -7,7 +7,6 @@ #include <zencore/iohash.h> #include <zencore/thread.h> #include <zencore/uid.h> -#include <zenstore/basicfile.h> #include <zenstore/blockstore.h> #include <zenstore/caslog.h> #include <zenstore/gc.h> diff --git a/zenserver/projectstore.cpp b/zenserver/projectstore.cpp index ef235557c..d46b312d3 100644 --- a/zenserver/projectstore.cpp +++ b/zenserver/projectstore.cpp @@ -15,9 +15,9 @@ #include <zencore/testutils.h> #include <zencore/timer.h> #include <zencore/trace.h> -#include <zenstore/basicfile.h> #include <zenstore/caslog.h> #include <zenstore/scrubcontext.h> +#include <zenutil/basicfile.h> #include "config.h" diff --git a/zenserver/zenserver.cpp b/zenserver/zenserver.cpp index 97cddabf0..cabff7389 100644 --- a/zenserver/zenserver.cpp +++ b/zenserver/zenserver.cpp @@ -16,9 +16,9 @@ #include <zencore/trace.h> #include <zenhttp/httpserver.h> #include <zenhttp/websocket.h> -#include <zenstore/basicfile.h> #include <zenstore/cidstore.h> #include <zenstore/scrubcontext.h> +#include <zenutil/basicfile.h> #include <zenutil/zenserverprocess.h> #if ZEN_PLATFORM_WINDOWS diff --git a/zenstore/filecas.cpp b/zenstore/filecas.cpp index 79867dcfa..d0a8ad849 100644 --- a/zenstore/filecas.cpp +++ b/zenstore/filecas.cpp @@ -15,9 +15,9 @@ #include <zencore/thread.h> #include <zencore/timer.h> #include <zencore/uid.h> -#include <zenstore/basicfile.h> #include <zenstore/gc.h> #include <zenstore/scrubcontext.h> +#include <zenutil/basicfile.h> #if ZEN_WITH_TESTS # include <zencore/compactbinarybuilder.h> diff --git a/zenstore/include/zenstore/blockstore.h b/zenstore/include/zenstore/blockstore.h index db32efb9f..9f16063a0 100644 --- a/zenstore/include/zenstore/blockstore.h +++ b/zenstore/include/zenstore/blockstore.h @@ -4,7 +4,7 @@ #include <zencore/filesystem.h> #include <zencore/zencore.h> -#include <zenstore/basicfile.h> +#include <zenutil/basicfile.h> #include <unordered_map> #include <unordered_set> diff --git a/zenstore/include/zenstore/caslog.h b/zenstore/include/zenstore/caslog.h index c56b653fc..1aeb50d05 100644 --- a/zenstore/include/zenstore/caslog.h +++ b/zenstore/include/zenstore/caslog.h @@ -3,7 +3,7 @@ #pragma once #include <zencore/uid.h> -#include <zenstore/basicfile.h> +#include <zenutil/basicfile.h> namespace zen { diff --git a/zenstore/xmake.lua b/zenstore/xmake.lua index ab0b8e113..4469c5650 100644 --- a/zenstore/xmake.lua +++ b/zenstore/xmake.lua @@ -5,5 +5,5 @@ target('zenstore') add_headerfiles("**.h") add_files("**.cpp") add_includedirs("include", {public=true}) - add_deps("zencore") + add_deps("zencore", "zenutil") add_packages("vcpkg::robin-map") diff --git a/zenstore/zenstore.cpp b/zenstore/zenstore.cpp index 836cdf691..d8e05a334 100644 --- a/zenstore/zenstore.cpp +++ b/zenstore/zenstore.cpp @@ -2,10 +2,10 @@ #include "zenstore/zenstore.h" -#include <zenstore/basicfile.h> #include <zenstore/blockstore.h> #include <zenstore/gc.h> #include <zenstore/hashkeyset.h> +#include <zenutil/basicfile.h> #include "cas.h" #include "compactcas.h" diff --git a/zenstore/basicfile.cpp b/zenutil/basicfile.cpp index e5a2adc41..fb77f4bd1 100644 --- a/zenstore/basicfile.cpp +++ b/zenutil/basicfile.cpp @@ -1,6 +1,6 @@ // Copyright Epic Games, Inc. All Rights Reserved. -#include "zenstore/basicfile.h" +#include "zenutil/basicfile.h" #include <zencore/compactbinary.h> #include <zencore/except.h> diff --git a/zenstore/include/zenstore/basicfile.h b/zenutil/include/zenutil/basicfile.h index ce9988776..877df0f92 100644 --- a/zenstore/include/zenstore/basicfile.h +++ b/zenutil/include/zenutil/basicfile.h @@ -2,8 +2,6 @@ #pragma once -#include "zenstore.h" - #include <zencore/iobuffer.h> #include <filesystem> |