move zenutil builds code to zenremotestore (#543)

* move buildstorage implementations to zenremotestore lib
* move builds storage to zenremotelib

14 files changed, 20 insertions, 14 deletions

diff --git a/src/zen/cmds/builds_cmd.cpp b/src/zen/cmds/builds_cmd.cpp
index 508fbe8b4..9eb94f024 100644
--- a/src/zen/cmds/builds_cmd.cpp
+++ b/src/zen/cmds/builds_cmd.cpp
@@ -23,14 +23,14 @@
 #include <zenhttp/httpclient.h>
 #include <zenhttp/httpclientauth.h>
 #include <zenhttp/httpcommon.h>
+#include <zenremotestore/builds/buildstoragecache.h>
+#include <zenremotestore/builds/filebuildstorage.h>
+#include <zenremotestore/builds/jupiterbuildstorage.h>
 #include <zenutil/bufferedwritefilecache.h>
-#include <zenutil/buildstoragecache.h>
 #include <zenutil/chunkblock.h>
 #include <zenutil/chunkedcontent.h>
 #include <zenutil/chunkedfile.h>
 #include <zenutil/chunkingcontroller.h>
-#include <zenutil/filebuildstorage.h>
-#include <zenutil/jupiter/jupiterbuildstorage.h>
 #include <zenutil/jupiter/jupiterhost.h>
 #include <zenutil/jupiter/jupitersession.h>
 #include <zenutil/parallelwork.h>
diff --git a/src/zen/cmds/projectstore_cmd.cpp b/src/zen/cmds/projectstore_cmd.cpp
index 2346cacc4..8cfd340e9 100644
--- a/src/zen/cmds/projectstore_cmd.cpp
+++ b/src/zen/cmds/projectstore_cmd.cpp
@@ -21,7 +21,7 @@
 #include <zenhttp/httpclientauth.h>
 #include <zenhttp/httpcommon.h>
 
-#include <zenutil/jupiter/jupiterbuildstorage.h>
+#include <zenremotestore/builds/jupiterbuildstorage.h>
 #include <zenutil/jupiter/jupiterhost.h>
 
 ZEN_THIRD_PARTY_INCLUDES_START
diff --git a/src/zen/xmake.lua b/src/zen/xmake.lua
index dadda32dd..f36573d62 100644
--- a/src/zen/xmake.lua
+++ b/src/zen/xmake.lua
@@ -5,7 +5,7 @@ target("zen")
     add_headerfiles("**.h")
     add_files("**.cpp")
     add_files("zen.cpp", {unity_ignored  = true })
-    add_deps("zencore", "zenhttp", "zenstore", "zenutil")
+    add_deps("zencore", "zenhttp", "zenremotestore", "zenstore", "zenutil")
     add_includedirs(".")
     set_symbols("debug")
 
diff --git a/src/zenutil/buildstoragecache.cpp b/src/zenremotestore/builds/buildstoragecache.cpp
index 376d967d1..694e364ea 100644
--- a/src/zenutil/buildstoragecache.cpp
+++ b/src/zenremotestore/builds/buildstoragecache.cpp
@@ -1,6 +1,6 @@
 // Copyright Epic Games, Inc. All Rights Reserved.
 
-#include <zenutil/buildstoragecache.h>
+#include <zenremotestore/builds/buildstoragecache.h>
 
 #include <zencore/compactbinarybuilder.h>
 #include <zencore/compactbinaryvalidation.h>
diff --git a/src/zenutil/filebuildstorage.cpp b/src/zenremotestore/builds/filebuildstorage.cpp
index f75fe403f..5cfd80666 100644
--- a/src/zenutil/filebuildstorage.cpp
+++ b/src/zenremotestore/builds/filebuildstorage.cpp
@@ -1,6 +1,6 @@
 // Copyright Epic Games, Inc. All Rights Reserved.
 
-#include <zenutil/filebuildstorage.h>
+#include <zenremotestore/builds/filebuildstorage.h>
 
 #include <zencore/basicfile.h>
 #include <zencore/compactbinarybuilder.h>
diff --git a/src/zenutil/jupiter/jupiterbuildstorage.cpp b/src/zenremotestore/builds/jupiterbuildstorage.cpp
index 6eb3489dc..f1f9b3555 100644
--- a/src/zenutil/jupiter/jupiterbuildstorage.cpp
+++ b/src/zenremotestore/builds/jupiterbuildstorage.cpp
@@ -1,6 +1,6 @@
 // Copyright Epic Games, Inc. All Rights Reserved.
 
-#include <zenutil/jupiter/jupiterbuildstorage.h>
+#include <zenremotestore/builds/jupiterbuildstorage.h>
 
 #include <zencore/compactbinarybuilder.h>
 #include <zencore/compactbinaryutil.h>
diff --git a/src/zenutil/include/zenutil/buildstorage.h b/src/zenremotestore/include/zenremotestore/builds/buildstorage.h
index 46ecd0a11..46ecd0a11 100644
--- a/src/zenutil/include/zenutil/buildstorage.h
+++ b/src/zenremotestore/include/zenremotestore/builds/buildstorage.h
diff --git a/src/zenutil/include/zenutil/buildstoragecache.h b/src/zenremotestore/include/zenremotestore/builds/buildstoragecache.h
index e6ca2c5e4..e6ca2c5e4 100644
--- a/src/zenutil/include/zenutil/buildstoragecache.h
+++ b/src/zenremotestore/include/zenremotestore/builds/buildstoragecache.h
diff --git a/src/zenutil/include/zenutil/filebuildstorage.h b/src/zenremotestore/include/zenremotestore/builds/filebuildstorage.h
index c95fb32e6..8c1e3c5df 100644
--- a/src/zenutil/include/zenutil/filebuildstorage.h
+++ b/src/zenremotestore/include/zenremotestore/builds/filebuildstorage.h
@@ -3,7 +3,7 @@
 #pragma once
 
 #include <zencore/logging.h>
-#include <zenutil/buildstorage.h>
+#include <zenremotestore/builds/buildstorage.h>
 
 namespace zen {
 class HttpClient;
diff --git a/src/zenutil/include/zenutil/jupiter/jupiterbuildstorage.h b/src/zenremotestore/include/zenremotestore/builds/jupiterbuildstorage.h
index f25d8933b..9e25ead7a 100644
--- a/src/zenutil/include/zenutil/jupiter/jupiterbuildstorage.h
+++ b/src/zenremotestore/include/zenremotestore/builds/jupiterbuildstorage.h
@@ -3,7 +3,7 @@
 #pragma once
 
 #include <zencore/logging.h>
-#include <zenutil/buildstorage.h>
+#include <zenremotestore/builds/buildstorage.h>
 
 namespace zen {
 class HttpClient;
diff --git a/src/zenremotestore/projectstore/buildsremoteprojectstore.cpp b/src/zenremotestore/projectstore/buildsremoteprojectstore.cpp
index ff20c034c..cb01ac955 100644
--- a/src/zenremotestore/projectstore/buildsremoteprojectstore.cpp
+++ b/src/zenremotestore/projectstore/buildsremoteprojectstore.cpp
@@ -8,7 +8,7 @@
 #include <zencore/scopeguard.h>
 
 #include <zenhttp/httpclientauth.h>
-#include <zenutil/jupiter/jupiterbuildstorage.h>
+#include <zenremotestore/builds/jupiterbuildstorage.h>
 
 namespace zen {
 
diff --git a/src/zenserver-test/buildstore-tests.cpp b/src/zenserver-test/buildstore-tests.cpp
index 86255b15c..1368b5909 100644
--- a/src/zenserver-test/buildstore-tests.cpp
+++ b/src/zenserver-test/buildstore-tests.cpp
@@ -11,14 +11,17 @@
 #	include <zencore/filesystem.h>
 #	include <zencore/stream.h>
 #	include <zencore/string.h>
-#	include <tsl/robin_set.h>
 #	include <zencore/fmtutils.h>
 #	include <zencore/scopeguard.h>
 #	include <zenhttp/packageformat.h>
-#	include <zenutil/buildstoragecache.h>
+#	include <zenremotestore/builds/buildstoragecache.h>
 #	include <zenutil/zenserverprocess.h>
 #	include <zenhttp/httpclient.h>
 
+ZEN_THIRD_PARTY_INCLUDES_START
+#	include <tsl/robin_set.h>
+ZEN_THIRD_PARTY_INCLUDES_END
+
 namespace zen::tests {
 
 using namespace std::literals;
diff --git a/src/zenserver-test/projectstore-tests.cpp b/src/zenserver-test/projectstore-tests.cpp
index 6b70a3c15..c8c96dbbb 100644
--- a/src/zenserver-test/projectstore-tests.cpp
+++ b/src/zenserver-test/projectstore-tests.cpp
@@ -17,7 +17,10 @@
 #	include <zenutil/zenserverprocess.h>
 #	include <zenhttp/httpclient.h>
 
+ZEN_THIRD_PARTY_INCLUDES_START
 #	include <tsl/robin_set.h>
+ZEN_THIRD_PARTY_INCLUDES_END
+
 #	include <random>
 
 namespace zen::tests {
diff --git a/src/zenserver-test/xmake.lua b/src/zenserver-test/xmake.lua
index 17d0a3cb7..49891b27d 100644
--- a/src/zenserver-test/xmake.lua
+++ b/src/zenserver-test/xmake.lua
@@ -6,7 +6,7 @@ target("zenserver-test")
     add_headerfiles("**.h")
     add_files("*.cpp")
     add_files("zenserver-test.cpp", {unity_ignored  = true })
-    add_deps("zencore", "zenutil", "zenhttp")
+    add_deps("zencore", "zenremotestore", "zenutil", "zenhttp")
     add_deps("zenserver", {inherit=false})
     add_packages("vcpkg::cpr", "vcpkg::http-parser", "vcpkg::mimalloc")