move remoteproject to remotestorelib (#542)

* move remoteproject code to remotestorelib

14 files changed, 18 insertions, 23 deletions

diff --git a/src/zenremotestore-test/zenremotestore-test.cpp b/src/zenremotestore-test/zenremotestore-test.cpp
index 98d7ed541..7c15e20d9 100644
--- a/src/zenremotestore-test/zenremotestore-test.cpp
+++ b/src/zenremotestore-test/zenremotestore-test.cpp
@@ -3,6 +3,7 @@
 #include <zencore/filesystem.h>
 #include <zencore/logging.h>
 #include <zencore/trace.h>
+#include <zenremotestore/projectstore/remoteprojectstore.h>
 #include <zenremotestore/zenremotestore.h>
 
 #include <zencore/memory/newdelete.h>
@@ -18,6 +19,7 @@ main([[maybe_unused]] int argc, [[maybe_unused]] char* argv[])
 {
 #if ZEN_WITH_TESTS
 	zen::zenremotestore_forcelinktests();
+	zen::remoteprojectstore_forcelink();
 
 #	if ZEN_PLATFORM_LINUX
 	zen::IgnoreChildSignals();
diff --git a/src/zenserver/projectstore/buildsremoteprojectstore.h b/src/zenremotestore/include/zenremotestore/projectstore/buildsremoteprojectstore.h
index 24ab9678d..fc59e41f4 100644
--- a/src/zenserver/projectstore/buildsremoteprojectstore.h
+++ b/src/zenremotestore/include/zenremotestore/projectstore/buildsremoteprojectstore.h
@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include "remoteprojectstore.h"
+#include <zenremotestore/projectstore/remoteprojectstore.h>
 
 namespace zen {
 
diff --git a/src/zenserver/projectstore/fileremoteprojectstore.h b/src/zenremotestore/include/zenremotestore/projectstore/fileremoteprojectstore.h
index 8da9692d5..ff2ecb405 100644
--- a/src/zenserver/projectstore/fileremoteprojectstore.h
+++ b/src/zenremotestore/include/zenremotestore/projectstore/fileremoteprojectstore.h
@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include "remoteprojectstore.h"
+#include <zenremotestore/projectstore/remoteprojectstore.h>
 
 namespace zen {
 
diff --git a/src/zenserver/projectstore/jupiterremoteprojectstore.h b/src/zenremotestore/include/zenremotestore/projectstore/jupiterremoteprojectstore.h
index d7a22700a..d800005a9 100644
--- a/src/zenserver/projectstore/jupiterremoteprojectstore.h
+++ b/src/zenremotestore/include/zenremotestore/projectstore/jupiterremoteprojectstore.h
@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include "remoteprojectstore.h"
+#include <zenremotestore/projectstore/remoteprojectstore.h>
 
 namespace zen {
 
diff --git a/src/zenserver/projectstore/remoteprojectstore.h b/src/zenremotestore/include/zenremotestore/projectstore/remoteprojectstore.h
index 11cc58e4d..11cc58e4d 100644
--- a/src/zenserver/projectstore/remoteprojectstore.h
+++ b/src/zenremotestore/include/zenremotestore/projectstore/remoteprojectstore.h
diff --git a/src/zenserver/projectstore/zenremoteprojectstore.h b/src/zenremotestore/include/zenremotestore/projectstore/zenremoteprojectstore.h
index 7c81a597d..d6b62c563 100644
--- a/src/zenserver/projectstore/zenremoteprojectstore.h
+++ b/src/zenremotestore/include/zenremotestore/projectstore/zenremoteprojectstore.h
@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include "remoteprojectstore.h"
+#include <zenremotestore/projectstore/remoteprojectstore.h>
 
 namespace zen {
 
diff --git a/src/zenserver/projectstore/buildsremoteprojectstore.cpp b/src/zenremotestore/projectstore/buildsremoteprojectstore.cpp
index b8b499f7f..ff20c034c 100644
--- a/src/zenserver/projectstore/buildsremoteprojectstore.cpp
+++ b/src/zenremotestore/projectstore/buildsremoteprojectstore.cpp
@@ -1,6 +1,6 @@
 // Copyright Epic Games, Inc. All Rights Reserved.
 
-#include "buildsremoteprojectstore.h"
+#include <zenremotestore/projectstore/buildsremoteprojectstore.h>
 
 #include <zencore/compactbinarybuilder.h>
 #include <zencore/compress.h>
diff --git a/src/zenserver/projectstore/fileremoteprojectstore.cpp b/src/zenremotestore/projectstore/fileremoteprojectstore.cpp
index 348f5fb8a..d6e6944f4 100644
--- a/src/zenserver/projectstore/fileremoteprojectstore.cpp
+++ b/src/zenremotestore/projectstore/fileremoteprojectstore.cpp
@@ -1,6 +1,6 @@
 // Copyright Epic Games, Inc. All Rights Reserved.
 
-#include "fileremoteprojectstore.h"
+#include <zenremotestore/projectstore/fileremoteprojectstore.h>
 
 #include <zencore/compactbinaryutil.h>
 #include <zencore/compress.h>
diff --git a/src/zenserver/projectstore/jupiterremoteprojectstore.cpp b/src/zenremotestore/projectstore/jupiterremoteprojectstore.cpp
index da3f92353..bfd4e433c 100644
--- a/src/zenserver/projectstore/jupiterremoteprojectstore.cpp
+++ b/src/zenremotestore/projectstore/jupiterremoteprojectstore.cpp
@@ -1,6 +1,6 @@
 // Copyright Epic Games, Inc. All Rights Reserved.
 
-#include "jupiterremoteprojectstore.h"
+#include <zenremotestore/projectstore/jupiterremoteprojectstore.h>
 
 #include <zencore/compactbinaryutil.h>
 #include <zencore/compress.h>
diff --git a/src/zenserver/projectstore/remoteprojectstore.cpp b/src/zenremotestore/projectstore/remoteprojectstore.cpp
index c31c2297e..822f0b29e 100644
--- a/src/zenserver/projectstore/remoteprojectstore.cpp
+++ b/src/zenremotestore/projectstore/remoteprojectstore.cpp
@@ -1,6 +1,6 @@
 // Copyright Epic Games, Inc. All Rights Reserved.
 
-#include "remoteprojectstore.h"
+#include <zenremotestore/projectstore/remoteprojectstore.h>
 
 #include <zencore/compactbinarybuilder.h>
 #include <zencore/compactbinaryutil.h>
@@ -22,7 +22,7 @@
 #if ZEN_WITH_TESTS
 #	include <zencore/testing.h>
 #	include <zencore/testutils.h>
-#	include "fileremoteprojectstore.h"
+#	include <zenremotestore/projectstore/fileremoteprojectstore.h>
 #endif	// ZEN_WITH_TESTS
 
 namespace zen {
diff --git a/src/zenserver/projectstore/zenremoteprojectstore.cpp b/src/zenremotestore/projectstore/zenremoteprojectstore.cpp
index 21ddd6cff..000901e45 100644
--- a/src/zenserver/projectstore/zenremoteprojectstore.cpp
+++ b/src/zenremotestore/projectstore/zenremoteprojectstore.cpp
@@ -1,6 +1,6 @@
 // Copyright Epic Games, Inc. All Rights Reserved.
 
-#include "zenremoteprojectstore.h"
+#include <zenremotestore/projectstore/zenremoteprojectstore.h>
 
 #include <zencore/compactbinarybuilder.h>
 #include <zencore/compactbinarypackage.h>
diff --git a/src/zenserver/projectstore/httpprojectstore.cpp b/src/zenserver/projectstore/httpprojectstore.cpp
index c227c0f9e..9fc9e4605 100644
--- a/src/zenserver/projectstore/httpprojectstore.cpp
+++ b/src/zenserver/projectstore/httpprojectstore.cpp
@@ -2,8 +2,6 @@
 
 #include "httpprojectstore.h"
 
-#include "remoteprojectstore.h"
-
 #include <zencore/compactbinarybuilder.h>
 #include <zencore/compactbinarypackage.h>
 #include <zencore/compactbinaryutil.h>
@@ -16,18 +14,17 @@
 #include <zencore/stream.h>
 #include <zencore/trace.h>
 #include <zenhttp/packageformat.h>
+#include <zenremotestore/projectstore/buildsremoteprojectstore.h>
+#include <zenremotestore/projectstore/fileremoteprojectstore.h>
+#include <zenremotestore/projectstore/jupiterremoteprojectstore.h>
+#include <zenremotestore/projectstore/remoteprojectstore.h>
+#include <zenremotestore/projectstore/zenremoteprojectstore.h>
 #include <zenstore/oplogreferencedset.h>
 #include <zenstore/projectstore.h>
 #include <zenstore/zenstore.h>
 #include <zenutil/openprocesscache.h>
 #include <zenutil/workerpools.h>
 
-#include "buildsremoteprojectstore.h"
-#include "fileremoteprojectstore.h"
-#include "jupiterremoteprojectstore.h"
-#include "remoteprojectstore.h"
-#include "zenremoteprojectstore.h"
-
 namespace zen {
 
 const FLLMTag&
diff --git a/src/zenserver/xmake.lua b/src/zenserver/xmake.lua
index 470fbd24e..57105045d 100644
--- a/src/zenserver/xmake.lua
+++ b/src/zenserver/xmake.lua
@@ -5,6 +5,7 @@ target("zenserver")
     add_deps("zencore",
              "zenhttp",
              "zennet",
+             "zenremotestore",
              "zenstore",
              "zenutil",
              "zenvfs")
diff --git a/src/zenserver/zenserver.cpp b/src/zenserver/zenserver.cpp
index e52c0f506..6ef78a7a4 100644
--- a/src/zenserver/zenserver.cpp
+++ b/src/zenserver/zenserver.cpp
@@ -30,10 +30,6 @@
 #include <zenutil/workerpools.h>
 #include <zenutil/zenserverprocess.h>
 
-#if ZEN_WITH_TESTS
-#	include "projectstore/remoteprojectstore.h"
-#endif	// ZEN_WITH_TESTS
-
 #if ZEN_PLATFORM_WINDOWS
 #	include <zencore/windows.h>
 #endif
@@ -1128,7 +1124,6 @@ ZenServer::ToString(ServerState Value)
 void
 zenserver_forcelinktests()
 {
-	zen::remoteprojectstore_forcelink();
 }
 
 #endif