From 49ce62dc4b0df49f761d2d0fb99e8b0dd82b3130 Mon Sep 17 00:00:00 2001 From: Facebook Community Bot Date: Thu, 3 Aug 2023 15:49:10 -0700 Subject: [PATCH] Re-sync with internal repository (#218) Co-authored-by: Facebook Community Bot <6422482+facebook-github-bot@users.noreply.github.com> --- 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 + wangle/AUTODEPS | 0 wangle/VERSION | 1 - 10 files changed, 11 insertions(+), 9 deletions(-) delete mode 100644 wangle/AUTODEPS delete mode 100644 wangle/VERSION diff --git a/build/fbcode_builder/CMake/FBPythonBinary.cmake b/build/fbcode_builder/CMake/FBPythonBinary.cmake index 99c33fb8c..f91ebaf32 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 745053cac..7688d8096 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 e9ae5dd02..41626181b 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 565ef9913..9358c425e 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 4f0c80909..aa1b0f996 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 64a4e577b..09e00a39c 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 6072a69ec..60de6b231 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 b4ca88315..6b761f127 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. diff --git a/wangle/AUTODEPS b/wangle/AUTODEPS deleted file mode 100644 index e69de29bb..000000000 diff --git a/wangle/VERSION b/wangle/VERSION deleted file mode 100644 index 1fa30d8cf..000000000 --- a/wangle/VERSION +++ /dev/null @@ -1 +0,0 @@ -13:0