From 9f7106f2ec77782722a79109afcb88198497f0ce Mon Sep 17 00:00:00 2001 From: Facebook Community Bot Date: Tue, 9 Jan 2024 11:17:04 -0800 Subject: [PATCH] Re-sync with internal repository (#153) The internal and external repositories are out of sync. This Pull Request attempts to brings them back in sync by patching the GitHub repository. Please carefully review this patch. You must disable ShipIt for your project in order to merge this pull request. DO NOT IMPORT this pull request. Instead, merge it directly on GitHub using the MERGE BUTTON. Re-enable ShipIt after merging. --- build/fbcode_builder/CMake/FBPythonBinary.cmake | 4 ++-- build/fbcode_builder/CMake/FBThriftCppLibrary.cmake | 2 ++ build/fbcode_builder/CMake/fb_py_test_main.py | 2 +- build/fbcode_builder/getdeps.py | 2 +- build/fbcode_builder/getdeps/builder.py | 2 +- build/fbcode_builder/getdeps/cargo.py | 4 ++-- build/fbcode_builder/getdeps/envfuncs.py | 2 +- build/fbcode_builder/manifests/fbthrift | 1 + 8 files changed, 11 insertions(+), 8 deletions(-) diff --git a/build/fbcode_builder/CMake/FBPythonBinary.cmake b/build/fbcode_builder/CMake/FBPythonBinary.cmake index 99c33fb8c95..f91ebaf3264 100644 --- a/build/fbcode_builder/CMake/FBPythonBinary.cmake +++ b/build/fbcode_builder/CMake/FBPythonBinary.cmake @@ -32,7 +32,7 @@ if(NOT TARGET Python3::Interpreter) # We find with QUIET here, since otherwise this generates some noisy warnings # on versions of CMake before 3.12 if (WIN32) - # On Windows we need both the Intepreter as well as the Development + # On Windows we need both the Interpreter as well as the Development # libraries. find_package(Python3 COMPONENTS Interpreter Development QUIET) else() @@ -487,7 +487,7 @@ function(add_fb_python_library LIB_NAME) # won't complain if one of the dependencies doesn't exist (since it is # intended to allow passing in file names for plain library files rather # than just targets). - # - It ensures that sources for our depencencies are built before any + # - It ensures that sources for our dependencies are built before any # executable that depends on us. Note that we depend on "${dep}.py_lib" # rather than "${dep}.py_sources_built" for this purpose because the # ".py_sources_built" target won't be available for imported targets. diff --git a/build/fbcode_builder/CMake/FBThriftCppLibrary.cmake b/build/fbcode_builder/CMake/FBThriftCppLibrary.cmake index 745053cacea..7688d80960d 100644 --- a/build/fbcode_builder/CMake/FBThriftCppLibrary.cmake +++ b/build/fbcode_builder/CMake/FBThriftCppLibrary.cmake @@ -151,6 +151,8 @@ function(add_fbthrift_cpp_library LIB_NAME THRIFT_FILE) ${ARG_DEPENDS} FBThrift::thriftcpp2 Folly::folly + mvfst::mvfst_server_async_tran + mvfst::mvfst_server ) # Add ${generated_headers} to the PUBLIC_HEADER property for ${LIB_NAME} diff --git a/build/fbcode_builder/CMake/fb_py_test_main.py b/build/fbcode_builder/CMake/fb_py_test_main.py index e9ae5dd028a..41626181b1e 100644 --- a/build/fbcode_builder/CMake/fb_py_test_main.py +++ b/build/fbcode_builder/CMake/fb_py_test_main.py @@ -262,7 +262,7 @@ def stopTest(self, test): super(BuckTestResult, self).stopTest(test) - # If a failure occured during module/class setup, then this "test" may + # If a failure occurred during module/class setup, then this "test" may # actually be a `_ErrorHolder`, which doesn't contain explicit info # about the upcoming test. Since we really only care about the test # name field (i.e. `_testMethodName`), we use that to detect an actual diff --git a/build/fbcode_builder/getdeps.py b/build/fbcode_builder/getdeps.py index 565ef99135e..9358c425e4a 100755 --- a/build/fbcode_builder/getdeps.py +++ b/build/fbcode_builder/getdeps.py @@ -626,7 +626,7 @@ def run_project_cmd(self, args, loader, manifest): ) builder.build(install_dirs, reconfigure=reconfigure) - # If we are building the project (not depdendency) and a specific + # If we are building the project (not dependency) and a specific # cmake_target (not 'install') has been requested, then we don't # set the built_marker. This allows subsequent runs of getdeps.py # for the project to run with different cmake_targets to trigger diff --git a/build/fbcode_builder/getdeps/builder.py b/build/fbcode_builder/getdeps/builder.py index 4f0c809092f..aa1b0f99601 100644 --- a/build/fbcode_builder/getdeps/builder.py +++ b/build/fbcode_builder/getdeps/builder.py @@ -346,7 +346,7 @@ def _build(self, install_dirs, reconfigure) -> None: class Iproute2Builder(BuilderBase): # ./configure --prefix does not work for iproute2. - # Thus, explicitly copy sources from src_dir to build_dir, bulid, + # Thus, explicitly copy sources from src_dir to build_dir, build, # and then install to inst_dir using DESTDIR # lastly, also copy include from build_dir to inst_dir def __init__(self, build_opts, ctx, manifest, src_dir, build_dir, inst_dir) -> None: diff --git a/build/fbcode_builder/getdeps/cargo.py b/build/fbcode_builder/getdeps/cargo.py index 64a4e577b33..09e00a39cf9 100644 --- a/build/fbcode_builder/getdeps/cargo.py +++ b/build/fbcode_builder/getdeps/cargo.py @@ -194,7 +194,7 @@ def _patchup_workspace(self, dep_to_git) -> None: my-rename-of-crate = { package = "crate", git = "..." } they can count themselves lucky because the code will raise an - Exception. There migh be more cases where the code will silently pass + Exception. There might be more cases where the code will silently pass producing bad results. """ workspace_dir = self.workspace_dir() @@ -362,7 +362,7 @@ def _resolve_dep_to_crates(self, build_source_dir, dep_to_git): dep_to_crates = {} - # First populate explicit crate paths from depedencies + # First populate explicit crate paths from dependencies for name, git_conf in dep_to_git.items(): crates = git_conf["crate_source_map"].keys() if crates: diff --git a/build/fbcode_builder/getdeps/envfuncs.py b/build/fbcode_builder/getdeps/envfuncs.py index 6072a69ec4d..60de6b23143 100644 --- a/build/fbcode_builder/getdeps/envfuncs.py +++ b/build/fbcode_builder/getdeps/envfuncs.py @@ -32,7 +32,7 @@ def _key(self, key): # project uses `unicode_literals`. `subprocess` will raise an error # if the environment that it is passed has a mixture of byte and # unicode strings. - # It is simplest to force everthing to be `str` for the sake of + # It is simplest to force everything to be `str` for the sake of # consistency. key = str(key) if sys.platform.startswith("win"): diff --git a/build/fbcode_builder/manifests/fbthrift b/build/fbcode_builder/manifests/fbthrift index b4ca88315cc..6b761f127fc 100644 --- a/build/fbcode_builder/manifests/fbthrift +++ b/build/fbcode_builder/manifests/fbthrift @@ -26,6 +26,7 @@ libsodium python-six wangle zstd +mvfst # Thrift also depends on openssl but since the latter requires a platform- # specific configuration we rely on the folly manifest to provide this # dependency to avoid duplication.