From 58682505caf13120fc7ba02849f555f4e293a84d Mon Sep 17 00:00:00 2001 From: Srikrishna Gopu Date: Fri, 28 Jul 2023 10:40:59 -0700 Subject: [PATCH] kill openNSA builder Summary: X-link: https://github.com/facebook/fb303/pull/38 As titled, kill open NSA buidler from sandcastle getdeps Reviewed By: shri-khare Differential Revision: D47541677 fbshipit-source-id: 4621150a8accd04a9c8bef77b3d0cdaf9b5c3d0a --- build/fbcode_builder/getdeps/builder.py | 20 -------------------- build/fbcode_builder/getdeps/manifest.py | 4 ---- 2 files changed, 24 deletions(-) diff --git a/build/fbcode_builder/getdeps/builder.py b/build/fbcode_builder/getdeps/builder.py index aa1b0f996..e1fae8e0f 100644 --- a/build/fbcode_builder/getdeps/builder.py +++ b/build/fbcode_builder/getdeps/builder.py @@ -1125,26 +1125,6 @@ class NopBuilder(BuilderBase): shutil.copytree(self.src_dir, self.inst_dir) -class OpenNSABuilder(NopBuilder): - # OpenNSA libraries are stored with git LFS. As a result, fetcher fetches - # LFS pointers and not the contents. Use git-lfs to pull the real contents - # before copying to install dir using NoopBuilder. - # In future, if more builders require git-lfs, we would consider installing - # git-lfs as part of the sandcastle infra as against repeating similar - # logic for each builder that requires git-lfs. - def __init__(self, build_opts, ctx, manifest, src_dir, inst_dir) -> None: - super(OpenNSABuilder, self).__init__( - build_opts, ctx, manifest, src_dir, inst_dir - ) - - def build(self, install_dirs, reconfigure: bool) -> None: - env = self._compute_env(install_dirs) - self._run_cmd(["git", "lfs", "install", "--local"], cwd=self.src_dir, env=env) - self._run_cmd(["git", "lfs", "pull"], cwd=self.src_dir, env=env) - - super(OpenNSABuilder, self).build(install_dirs, reconfigure) - - class SqliteBuilder(BuilderBase): def __init__(self, build_opts, ctx, manifest, src_dir, build_dir, inst_dir) -> None: super(SqliteBuilder, self).__init__( diff --git a/build/fbcode_builder/getdeps/manifest.py b/build/fbcode_builder/getdeps/manifest.py index 4c0e191b5..7ef984b33 100644 --- a/build/fbcode_builder/getdeps/manifest.py +++ b/build/fbcode_builder/getdeps/manifest.py @@ -17,7 +17,6 @@ from .builder import ( MakeBuilder, NinjaBootstrap, NopBuilder, - OpenNSABuilder, OpenSSLBuilder, SqliteBuilder, ) @@ -581,9 +580,6 @@ class ManifestParser(object): build_options, ctx, src_dir, build_dir, inst_dir, loader ) - if builder == "OpenNSA": - return OpenNSABuilder(build_options, ctx, self, src_dir, inst_dir) - raise KeyError("project %s has no known builder" % (self.name)) def create_prepare_builders(