move projectstore to zenstore (#541)

11 files changed, 10 insertions, 12 deletions

diff --git a/src/zenserver/projectstore/httpprojectstore.cpp b/src/zenserver/projectstore/httpprojectstore.cpp
index 175d131e1..c227c0f9e 100644
--- a/src/zenserver/projectstore/httpprojectstore.cpp
+++ b/src/zenserver/projectstore/httpprojectstore.cpp
@@ -2,8 +2,6 @@
 
 #include "httpprojectstore.h"
 
-#include "oplogreferencedset.h"
-#include "projectstore.h"
 #include "remoteprojectstore.h"
 
 #include <zencore/compactbinarybuilder.h>
@@ -18,6 +16,8 @@
 #include <zencore/stream.h>
 #include <zencore/trace.h>
 #include <zenhttp/packageformat.h>
+#include <zenstore/oplogreferencedset.h>
+#include <zenstore/projectstore.h>
 #include <zenstore/zenstore.h>
 #include <zenutil/openprocesscache.h>
 #include <zenutil/workerpools.h>
diff --git a/src/zenserver/projectstore/remoteprojectstore.h b/src/zenserver/projectstore/remoteprojectstore.h
index 488656d8b..11cc58e4d 100644
--- a/src/zenserver/projectstore/remoteprojectstore.h
+++ b/src/zenserver/projectstore/remoteprojectstore.h
@@ -3,7 +3,7 @@
 #pragma once
 
 #include <zencore/jobqueue.h>
-#include "projectstore.h"
+#include <zenstore/projectstore.h>
 
 #include <zenutil/chunkblock.h>
 
diff --git a/src/zenserver/vfs/vfsimpl.cpp b/src/zenserver/vfs/vfsimpl.cpp
index e698d6d19..d22738827 100644
--- a/src/zenserver/vfs/vfsimpl.cpp
+++ b/src/zenserver/vfs/vfsimpl.cpp
@@ -3,8 +3,6 @@
 #include "vfsimpl.h"
 #include "vfsservice.h"
 
-#include "projectstore/projectstore.h"
-
 #include <zencore/fmtutils.h>
 #include <zencore/logging.h>
 #include <zenstore/cache/structuredcachestore.h>
diff --git a/src/zenserver/vfs/vfsimpl.h b/src/zenserver/vfs/vfsimpl.h
index c33df100b..0dabf2c67 100644
--- a/src/zenserver/vfs/vfsimpl.h
+++ b/src/zenserver/vfs/vfsimpl.h
@@ -4,9 +4,8 @@
 
 #include "vfsservice.h"
 
-#include "projectstore/projectstore.h"
-
 #include <zencore/logging.h>
+#include <zenstore/projectstore.h>
 #include <zenvfs/vfs.h>
 
 #if ZEN_WITH_VFS
diff --git a/src/zenserver/zenserver.cpp b/src/zenserver/zenserver.cpp
index b4a4279ae..e52c0f506 100644
--- a/src/zenserver/zenserver.cpp
+++ b/src/zenserver/zenserver.cpp
@@ -1128,7 +1128,6 @@ ZenServer::ToString(ServerState Value)
 void
 zenserver_forcelinktests()
 {
-	zen::prj_forcelink();
 	zen::remoteprojectstore_forcelink();
 }
 
diff --git a/src/zenserver/zenserver.h b/src/zenserver/zenserver.h
index bcb02d336..8b786ed22 100644
--- a/src/zenserver/zenserver.h
+++ b/src/zenserver/zenserver.h
@@ -24,6 +24,7 @@ ZEN_THIRD_PARTY_INCLUDES_END
 #include <zenhttp/httptest.h>
 #include <zenstore/cache/structuredcachestore.h>
 #include <zenstore/gc.h>
+#include <zenstore/projectstore.h>
 #include "admin/admin.h"
 #include "buildstore/httpbuildstore.h"
 #include "cache/httpstructuredcache.h"
@@ -31,7 +32,6 @@ ZEN_THIRD_PARTY_INCLUDES_END
 #include "frontend/frontend.h"
 #include "objectstore/objectstore.h"
 #include "projectstore/httpprojectstore.h"
-#include "projectstore/projectstore.h"
 #include "stats/statsreporter.h"
 #include "upstream/upstream.h"
 #include "vfs/vfsservice.h"
diff --git a/src/zenserver/projectstore/oplogreferencedset.h b/src/zenstore/include/zenstore/oplogreferencedset.h
index dcc156060..dcc156060 100644
--- a/src/zenserver/projectstore/oplogreferencedset.h
+++ b/src/zenstore/include/zenstore/oplogreferencedset.h
diff --git a/src/zenserver/projectstore/projectstore.h b/src/zenstore/include/zenstore/projectstore.h
index 258be5930..258be5930 100644
--- a/src/zenserver/projectstore/projectstore.h
+++ b/src/zenstore/include/zenstore/projectstore.h
diff --git a/src/zenserver/projectstore/oplogreferencedset.cpp b/src/zenstore/oplogreferencedset.cpp
index b5cbc6f4b..f34b80b1a 100644
--- a/src/zenserver/projectstore/oplogreferencedset.cpp
+++ b/src/zenstore/oplogreferencedset.cpp
@@ -1,8 +1,8 @@
 // Copyright Epic Games, Inc. All Rights Reserved.
 
-#include "oplogreferencedset.h"
+#include <zenstore/oplogreferencedset.h>
 
-#include "projectstore.h"
+#include <zenstore/projectstore.h>
 
 #include <zencore/iobuffer.h>
 #include <zencore/logging.h>
diff --git a/src/zenserver/projectstore/projectstore.cpp b/src/zenstore/projectstore.cpp
index 5034a250a..9a02cc7f0 100644
--- a/src/zenserver/projectstore/projectstore.cpp
+++ b/src/zenstore/projectstore.cpp
@@ -1,6 +1,6 @@
 // Copyright Epic Games, Inc. All Rights Reserved.
 
-#include "projectstore.h"
+#include <zenstore/projectstore.h>
 
 #include <zencore/assertfmt.h>
 #include <zencore/compactbinaryutil.h>
diff --git a/src/zenstore/zenstore.cpp b/src/zenstore/zenstore.cpp
index 654fb3510..85b50f03d 100644
--- a/src/zenstore/zenstore.cpp
+++ b/src/zenstore/zenstore.cpp
@@ -7,6 +7,7 @@
 #	include <zenstore/blockstore.h>
 #	include <zenstore/buildstore/buildstore.h>
 #	include <zenstore/cache/structuredcachestore.h>
+#	include <zenstore/projectstore.h>
 #	include <zenstore/workspaces.h>
 #	include <zenstore/gc.h>
 #	include <zenstore/hashkeyset.h>
@@ -29,6 +30,7 @@ zenstore_forcelinktests()
 	gc_forcelink();
 	hashkeyset_forcelink();
 	structured_cachestore_forcelink();
+	prj_forcelink();
 }
 
 }  // namespace zen