Move backingstore/c_api into include and src directories

Summary: cxx.rs provides a more ergonomic and opinionated interop layer between Rust and C++ that we would like to leverage for future API chages. Before we get started, some preliminary changes to simplify the backingstore crate will make things easier down the line. Differential Revision: D50998929
jdelliot · Nov 10, 2023 · f2b0c8b · f2b0c8b
1 parent 290a5d8
commit f2b0c8b
Show file tree

Hide file tree

Showing 12 changed files with 45 additions and 38 deletions.
diff --git a/eden/fs/store/hg/HgDatapackStore.h b/eden/fs/store/hg/HgDatapackStore.h
@@ -16,7 +16,7 @@
 #include "eden/fs/model/TreeFwd.h"
 #include "eden/fs/telemetry/RequestMetricsScope.h"
 #include "eden/fs/utils/PathFuncs.h"
-#include "eden/scm/lib/backingstore/c_api/SaplingNativeBackingStore.h"
+#include "eden/scm/lib/backingstore/include/SaplingNativeBackingStore.h"
 
 namespace facebook::eden {
 

diff --git a/eden/fs/store/hg/TARGETS b/eden/fs/store/hg/TARGETS
@@ -197,7 +197,8 @@ cpp_library(
         "//eden/fs/model:model-fwd",
         "//eden/fs/telemetry:telemetry",
         "//eden/fs/utils:path",
-        "//eden/scm/lib/backingstore/c_api:c_api",
+        "//eden/scm/lib/backingstore:sapling_native_backingstore",  # @manual
+        "//eden/scm/lib/backingstore:sapling_native_backingstore-include",
         "//folly:range",
         "//folly/futures:core",
     ],

diff --git a/eden/scm/lib/backingstore/CMakeLists.txt b/eden/scm/lib/backingstore/CMakeLists.txt
@@ -15,13 +15,14 @@ install_rust_static_library(
   INSTALL_DIR lib
 )
 
-file(GLOB C_API_SRCS "c_api/*.cpp")
+file(GLOB C_API_SRCS "src/*.cpp")
+file(GLOB C_API_HDRS "include/*.h")
 add_library(backingstore "${C_API_SRCS}")
 set_target_properties(
   backingstore
   PROPERTIES
   PUBLIC_HEADER
-  "c_api/SaplingNativeBackingStore.h;c_api/BackingStoreBindings.h"
+  "${C_API_HDRS}"
 )
 target_include_directories(backingstore PUBLIC
   $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
@@ -68,5 +69,5 @@ install(
   TARGETS backingstore
   EXPORT mercurial
   LIBRARY DESTINATION ${LIB_INSTALL_DIR}
-  PUBLIC_HEADER DESTINATION "include/eden/scm/lib/backingstore/c_api"
+  PUBLIC_HEADER DESTINATION "include/eden/scm/lib/backingstore/include"
 )
diff --git a/eden/scm/lib/backingstore/TARGETS b/eden/scm/lib/backingstore/TARGETS
@@ -1,7 +1,35 @@
+load("@fbcode_macros//build_defs:cpp_library.bzl", "cpp_library")
 load("@fbcode_macros//build_defs:rust_library.bzl", "rust_library")
 
 oncall("mercurial_release")
 
+cpp_library(
+    name = "sapling_native_backingstore-include",
+    srcs = [],
+    headers = glob(["include/**/*.h"]),
+    exported_deps = [
+        ":backingstore",
+        "//folly:function",
+        "//folly:range",
+        "//folly:try",
+    ],
+)
+
+cpp_library(
+    name = "sapling_native_backingstore",
+    srcs = glob(["src/**/*.cpp"]),
+    headers = [],
+    preferred_linkage = "static",
+    undefined_symbols = True,
+    deps = [
+        ":sapling_native_backingstore-include",
+        "//folly:range",
+        "//folly:string",
+        "//folly/io:iobuf",
+        "//folly/logging:logging",
+    ],
+)
+
 rust_library(
     name = "backingstore",
     srcs = glob(["src/**/*.rs"]),

diff --git a/eden/scm/lib/backingstore/c_api/TARGETS b/eden/scm/lib/backingstore/c_api/TARGETS
diff --git a/...backingstore/c_api/BackingStoreBindings.h → ...ckingstore/include/BackingStoreBindings.h b/...backingstore/c_api/BackingStoreBindings.h → ...ckingstore/include/BackingStoreBindings.h
diff --git a/...ngstore/c_api/SaplingNativeBackingStore.h → ...store/include/SaplingNativeBackingStore.h b/...ngstore/c_api/SaplingNativeBackingStore.h → ...store/include/SaplingNativeBackingStore.h
@@ -14,7 +14,7 @@
 #include <optional>
 #include <string_view>
 
-#include "eden/scm/lib/backingstore/c_api/BackingStoreBindings.h"
+#include "eden/scm/lib/backingstore/include/BackingStoreBindings.h"
 
 namespace folly {
 class IOBuf;

diff --git a/...store/c_api/SaplingNativeBackingStore.cpp → ...ngstore/src/SaplingNativeBackingStore.cpp b/...store/c_api/SaplingNativeBackingStore.cpp → ...ngstore/src/SaplingNativeBackingStore.cpp
@@ -5,7 +5,7 @@
  * GNU General Public License version 2.
  */
 
-#include "eden/scm/lib/backingstore/c_api/SaplingNativeBackingStore.h"
+#include "eden/scm/lib/backingstore/include/SaplingNativeBackingStore.h"
 
 #include <folly/Range.h>
 #include <folly/String.h>

diff --git a/eden/scm/lib/backingstore/test/CBytesTest.cpp b/eden/scm/lib/backingstore/test/CBytesTest.cpp
@@ -6,10 +6,10 @@
  */
 
 #include <folly/Range.h>
-#include <gtest/gtest.h>
+#include <folly/portability/GTest.h>
 #include <cstring>
 
-#include "eden/scm/lib/backingstore/c_api/BackingStoreBindings.h"
+#include "eden/scm/lib/backingstore/include/BackingStoreBindings.h"
 
 namespace {
 

diff --git a/eden/scm/lib/backingstore/test/CFallibleTest.cpp b/eden/scm/lib/backingstore/test/CFallibleTest.cpp
@@ -5,10 +5,10 @@
  * GNU General Public License version 2.
  */
 
-#include <gtest/gtest.h>
+#include <folly/portability/GTest.h>
 #include <cstdio>
 
-#include "eden/scm/lib/backingstore/c_api/BackingStoreBindings.h"
+#include "eden/scm/lib/backingstore/include/BackingStoreBindings.h"
 
 namespace {
 

diff --git a/eden/scm/lib/backingstore/test/TARGETS b/eden/scm/lib/backingstore/test/TARGETS
@@ -7,7 +7,9 @@ cpp_unittest(
     srcs = glob(["*Test.cpp"]),
     supports_static_listing = False,
     deps = [
-        "//eden/scm/lib/backingstore/c_api:c_api",
+        "//eden/scm/lib/backingstore:sapling_native_backingstore",  # @manual
+        "//eden/scm/lib/backingstore:sapling_native_backingstore-include",
         "//folly:range",
+        "//folly/portability:gtest",
     ],
 )
diff --git a/eden/scm/lib/backingstore/tools/cbindgen.sh b/eden/scm/lib/backingstore/tools/cbindgen.sh
@@ -15,7 +15,7 @@ cd "$(dirname "$0")"/..
 set -e
 
 CONFIG="cbindgen.toml"
-OUTPUT="c_api/BackingStoreBindings.h"
+OUTPUT="include/BackingStoreBindings.h"
 
 main() {
   cbindgen --config "$CONFIG" --output "$OUTPUT"