prjfs: move win/mount into prjfs

Summary:
Now that the win directory only contains the mount directory, we can rename it
to be more faithful to its intent. Since this is about ProjectedFS, let's
rename it "prjfs".

Reviewed By: chadaustin

Differential Revision: D23828561

fbshipit-source-id: cb31fe4652fd4356dc2579028d3ae2c7935371a7

eden/fs/CMakeLists.txt

@@ -65,8 +65,4 @@ add_subdirectory(py)
 add_subdirectory(cli)
 add_subdirectory(notifications)
 add_subdirectory(takeover)
-
-# Platform specific code
-if (WIN32)
-  add_subdirectory(win)
-endif()
+add_subdirectory(prjfs)

eden/fs/inodes/CMakeLists.txt

@@ -44,7 +44,7 @@ if (WIN32)
   target_link_libraries(
     eden_inodes
     PUBLIC
-      eden_win
+      eden_prjfs
   )
 else()
   target_link_libraries(

eden/fs/inodes/EdenMount.cpp

@@ -50,8 +50,8 @@
 #include "eden/fs/utils/UnboundedQueueExecutor.h"
 
 #ifdef _WIN32
-#include "eden/fs/win/mount/EdenDispatcher.h" // @manual
-#include "eden/fs/win/mount/PrjfsChannel.h" // @manual
+#include "eden/fs/prjfs/EdenDispatcher.h" // @manual
+#include "eden/fs/prjfs/PrjfsChannel.h" // @manual
 #else
 #include <folly/File.h>
 #include "eden/fs/fuse/FuseChannel.h"

eden/fs/inodes/EdenMount.h

@@ -37,7 +37,7 @@
 #include "eden/fs/fuse/FuseChannel.h"
 #include "eden/fs/inodes/OverlayFileAccess.h"
 #else
-#include "eden/fs/win/mount/FsChannel.h" // @manual
+#include "eden/fs/prjfs/FsChannel.h" // @manual
 #endif
 
 DECLARE_string(edenfsctlPath);

eden/fs/inodes/TreeInode.cpp

@@ -45,7 +45,7 @@
 #include "eden/fs/utils/UnboundedQueueExecutor.h"
 
 #ifdef _WIN32
-#include "eden/fs/win/mount/Enumerator.h" // @manual
+#include "eden/fs/prjfs/Enumerator.h" // @manual
 #else
 #include <folly/FileUtil.h>
 #include "eden/fs/fuse/DirList.h"

eden/fs/inodes/test/TreeInodeTest.cpp

@@ -14,7 +14,7 @@
 #include <folly/test/TestUtils.h>
 #include <gflags/gflags.h>
 #ifdef _WIN32
-#include "eden/fs/win/mount/Enumerator.h" // @manual
+#include "eden/fs/prjfs/Enumerator.h" // @manual
 #else
 #include "eden/fs/fuse/DirList.h"
 #endif // _WIN32

eden/fs/prjfs/CMakeLists.txt

@@ -0,0 +1,29 @@
+# Copyright (c) Facebook, Inc. and its affiliates.
+#
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2.
+
+if (WIN32)
+  file(GLOB PRJFS_SRCS "*.cpp" "*.h")
+
+  add_library(
+    eden_prjfs STATIC
+      ${PRJFS_SRCS}
+  )
+
+  target_link_libraries(
+    eden_prjfs
+    PUBLIC
+      eden_request_context
+      eden_inodes
+      eden_journal
+      eden_model
+      eden_store
+      eden_telemetry
+      eden_utils
+      eden_service_thrift_util
+      Folly::folly
+      ProjectedFS
+      cpptoml
+  )
+endif()

eden/fs/prjfs/EdenDispatcher.cpp

@@ -18,14 +18,14 @@
 #include "eden/fs/inodes/InodePtr.h"
 #include "eden/fs/inodes/ServerState.h"
 #include "eden/fs/inodes/TreeInode.h"
+#include "eden/fs/prjfs/EdenDispatcher.h"
+#include "eden/fs/prjfs/PrjfsRequestContext.h"
 #include "eden/fs/service/EdenError.h"
 #include "eden/fs/store/ObjectFetchContext.h"
 #include "eden/fs/utils/Guid.h"
 #include "eden/fs/utils/StringConv.h"
 #include "eden/fs/utils/SystemError.h"
 #include "eden/fs/utils/WinError.h"
-#include "eden/fs/win/mount/EdenDispatcher.h"
-#include "eden/fs/win/mount/PrjfsRequestContext.h"
 
 namespace facebook {
 namespace eden {

eden/fs/prjfs/EdenDispatcher.h

@@ -15,8 +15,8 @@
 #include <cstdint>
 #include <cstring>
 #include <string>
+#include "eden/fs/prjfs/Enumerator.h"
 #include "eden/fs/utils/Guid.h"
-#include "eden/fs/win/mount/Enumerator.h"
 
 namespace facebook {
 namespace eden {

eden/fs/prjfs/Enumerator.cpp

@@ -8,7 +8,7 @@
 #include "folly/portability/Windows.h"
 
 #include <ProjectedFSLib.h>
-#include "eden/fs/win/mount/Enumerator.h"
+#include "eden/fs/prjfs/Enumerator.h"
 
 namespace facebook {
 namespace eden {

eden/fs/prjfs/FsChannel.h

@@ -8,6 +8,7 @@
 #pragma once
 
 #include <folly/futures/Future.h>
+#include "eden/fs/utils/PathFuncs.h"
 
 namespace facebook {
 namespace eden {

eden/fs/prjfs/PrjfsChannel.cpp

@@ -5,15 +5,15 @@
  * GNU General Public License version 2.
  */
 
-#include "eden/fs/win/mount/PrjfsChannel.h"
+#include "eden/fs/prjfs/PrjfsChannel.h"
 #include <folly/logging/xlog.h>
 #include "eden/fs/inodes/EdenMount.h"
+#include "eden/fs/prjfs/EdenDispatcher.h"
+#include "eden/fs/prjfs/PrjfsRequestContext.h"
 #include "eden/fs/utils/Guid.h"
 #include "eden/fs/utils/NotImplemented.h"
 #include "eden/fs/utils/PathFuncs.h"
 #include "eden/fs/utils/WinError.h"
-#include "eden/fs/win/mount/EdenDispatcher.h"
-#include "eden/fs/win/mount/PrjfsRequestContext.h"
 
 using folly::sformat;
 

eden/fs/prjfs/PrjfsChannel.h

@@ -10,10 +10,10 @@
 #include "folly/portability/Windows.h"
 
 #include <ProjectedFSLib.h>
+#include "eden/fs/prjfs/FsChannel.h"
 #include "eden/fs/utils/Guid.h"
 #include "eden/fs/utils/PathFuncs.h"
 #include "eden/fs/utils/ProcessAccessLog.h"
-#include "eden/fs/win/mount/FsChannel.h"
 
 namespace facebook {
 namespace eden {

eden/fs/prjfs/PrjfsRequestContext.h

@@ -9,8 +9,8 @@
 
 #include <ProjectedFSLib.h>
 #include "eden/fs/inodes/RequestContext.h"
+#include "eden/fs/prjfs/PrjfsChannel.h"
 #include "eden/fs/utils/PathFuncs.h"
-#include "eden/fs/win/mount/PrjfsChannel.h"
 
 namespace facebook::eden {
 

eden/fs/service/EdenServer.cpp

@@ -67,9 +67,7 @@
 #include "eden/fs/utils/ProcessNameCache.h"
 #include "eden/fs/utils/UserInfo.h"
 
-#ifdef _WIN32
-#include "eden/fs/win/mount/PrjfsChannel.h" // @manual
-#else
+#ifndef _WIN32
 #include "eden/fs/fuse/FuseChannel.h"
 #include "eden/fs/inodes/EdenDispatcher.h"
 #include "eden/fs/inodes/Overlay.h"

eden/fs/win/CMakeLists.txt

@@ -1,25 +0,0 @@
-# Copyright (c) Facebook, Inc. and its affiliates.
-#
-# This software may be used and distributed according to the terms of the
-# GNU General Public License version 2.
-
-file(GLOB CONFIG_SRCS "mount/*.cpp" "mount/*.h")
-add_library(
-  eden_win STATIC
-    ${CONFIG_SRCS}
-)
-target_link_libraries(
-  eden_win
-  PUBLIC
-    eden_request_context
-    eden_inodes
-    eden_journal
-    eden_model
-    eden_store
-    eden_telemetry
-    eden_utils
-    eden_service_thrift_util
-    Folly::folly
-    ProjectedFS
-    cpptoml
-)