lib/proxygen
1
0
Fork 0
mirror of https://github.com/facebook/proxygen.git synced 2025-08-07 07:02:53 +03:00
Code Activity

add a new ManifestLoader class

Browse Source 
Summary:
Add a new ManifestLoader class to handle loading manifests and computing
dependencies.

For now the main thing this class does is maintain the `manifest_by_name`
mapping.  In subsequent diffs we should be able to move some additional logic
into this class, which will help clean up the code and eliminate some redudant
work.  In particular, we can have this class cache project hashes, which will
avoid re-computing hashes over and over again for the same projects as we do
in many cases today.  We should also be able to save and re-use some of the
project dependency ordering computation in some cases as well.

Reviewed By: strager

Differential Revision: D16477400

fbshipit-source-id: f06f62f77d8443fccaa69fe4c1306e39c395b325
This commit is contained in:
Adam Simpkins
2019-07-31 20:53:07 -07:00
committed by Facebook Github Bot
parent bc2a5ae634
commit b361d8c2f9
2 changed files with 135 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
build/fbcode_builder/getdeps.py
View File

@@ -18,7 +18,7 @@ import sys
from getdeps.buildopts import setup_build_options
from getdeps.dyndeps import create_dyn_dep_munger
from getdeps.errors import TransientFailure
from getdeps.load import load_project, manifests_in_dependency_order
from getdeps.load import ManifestLoader
from getdeps.manifest import ManifestParser
from getdeps.platform import HostType
from getdeps.subcmd import SubCmd, add_subcommands, cmd
@@ -84,14 +84,14 @@ class FetchCmd(SubCmd):
def run(self, args):
opts = setup_build_options(args)
ctx_gen = opts.get_context_generator()
manifest = load_project(opts, args.project)
loader = ManifestLoader(opts)
manifest = loader.load_manifest(args.project)
if args.recursive:
projects = manifests_in_dependency_order(opts, manifest, ctx_gen)
projects = loader.manifests_in_dependency_order()
else:
projects = [manifest]
for m in projects:
fetcher = m.create_fetcher(opts, ctx_gen.get_context(m.name))
fetcher = m.create_fetcher(opts, loader.ctx_gen.get_context(m.name))
fetcher.update()
@@ -99,10 +99,10 @@ class FetchCmd(SubCmd):
class ListDepsCmd(SubCmd):
def run(self, args):
opts = setup_build_options(args)
ctx_gen = opts.get_context_generator()
ctx_gen.set_value_for_project(args.project, "test", "on")
manifest = load_project(opts, args.project)
for m in manifests_in_dependency_order(opts, manifest, ctx_gen):
loader = ManifestLoader(opts)
loader.ctx_gen.set_value_for_project(args.project, "test", "on")
loader.load_manifest(args.project)
for m in loader.manifests_in_dependency_order():
print(m.name)
return 0
@@ -142,11 +142,10 @@ class CleanCmd(SubCmd):
class ShowInstDirCmd(SubCmd):
def run(self, args):
opts = setup_build_options(args)
ctx_gen = opts.get_context_generator()
ctx_gen.set_value_for_project(args.project, "test", "on")
manifest = load_project(opts, args.project)
projects = manifests_in_dependency_order(opts, manifest, ctx_gen)
manifests_by_name = {m.name: m for m in projects}
loader = ManifestLoader(opts)
loader.ctx_gen.set_value_for_project(args.project, "test", "on")
manifest = loader.load_manifest(args.project)
projects = loader.manifests_in_dependency_order()
if args.recursive:
manifests = projects
@@ -154,9 +153,11 @@ class ShowInstDirCmd(SubCmd):
manifests = [manifest]
for m in manifests:
ctx = ctx_gen.get_context(m.name)
ctx = loader.ctx_gen.get_context(m.name)
fetcher = m.create_fetcher(opts, ctx)
dirs = opts.compute_dirs(m, fetcher, manifests_by_name, ctx_gen)
dirs = opts.compute_dirs(
m, fetcher, loader.manifests_by_name, loader.ctx_gen
)
inst_dir = dirs["inst_dir"]
print(inst_dir)
@@ -180,17 +181,17 @@ class ShowInstDirCmd(SubCmd):
class ShowSourceDirCmd(SubCmd):
def run(self, args):
opts = setup_build_options(args)
ctx_gen = opts.get_context_generator()
ctx_gen.set_value_for_project(args.project, "test", "on")
manifest = load_project(opts, args.project)
loader = ManifestLoader(opts)
loader.ctx_gen.set_value_for_project(args.project, "test", "on")
manifest = loader.load_manifest(args.project)
if args.recursive:
manifests = manifests_in_dependency_order(opts, manifest, ctx_gen)
manifests = loader.manifests_in_dependency_order()
else:
manifests = [manifest]
for m in manifests:
fetcher = m.create_fetcher(opts, ctx_gen.get_context(m.name))
fetcher = m.create_fetcher(opts, loader.ctx_gen.get_context(m.name))
print(fetcher.get_src_dir())
def setup_parser(self, parser):
@@ -213,17 +214,18 @@ class ShowSourceDirCmd(SubCmd):
class BuildCmd(SubCmd):
def run(self, args):
opts = setup_build_options(args)
if args.clean:
clean_dirs(opts)
ctx_gen = opts.get_context_generator(facebook_internal=args.facebook_internal)
if args.enable_tests:
ctx_gen.set_value_for_project(args.project, "test", "on")
manifest = load_project(opts, args.project)
loader = ManifestLoader(opts, ctx_gen)
if args.clean:
clean_dirs(opts)
manifest = loader.load_manifest(args.project)
print("Building on %s" % ctx_gen.get_context(args.project))
projects = manifests_in_dependency_order(opts, manifest, ctx_gen)
manifests_by_name = {m.name: m for m in projects}
projects = loader.manifests_in_dependency_order()
# Accumulate the install directories so that the build steps
# can find their dep installation
@@ -236,7 +238,7 @@ class BuildCmd(SubCmd):
if args.clean:
fetcher.clean()
dirs = opts.compute_dirs(m, fetcher, manifests_by_name, ctx_gen)
dirs = opts.compute_dirs(m, fetcher, loader.manifests_by_name, ctx_gen)
build_dir = dirs["build_dir"]
inst_dir = dirs["inst_dir"]
@@ -318,10 +320,10 @@ class FixupDeps(SubCmd):
if args.enable_tests:
ctx_gen.set_value_for_project(args.project, "test", "on")
manifest = load_project(opts, args.project)
loader = ManifestLoader(opts, ctx_gen)
manifest = loader.load_manifest(args.project)
projects = manifests_in_dependency_order(opts, manifest, ctx_gen)
manifests_by_name = {m.name: m for m in projects}
projects = loader.manifests_in_dependency_order()
# Accumulate the install directories so that the build steps
# can find their dep installation
@@ -331,7 +333,7 @@ class FixupDeps(SubCmd):
ctx = ctx_gen.get_context(m.name)
fetcher = m.create_fetcher(opts, ctx)
dirs = opts.compute_dirs(m, fetcher, manifests_by_name, ctx_gen)
dirs = opts.compute_dirs(m, fetcher, loader.manifests_by_name, ctx_gen)
inst_dir = dirs["inst_dir"]
install_dirs.append(inst_dir)
@@ -376,9 +378,9 @@ class TestCmd(SubCmd):
else:
ctx_gen.set_value_for_project(args.project, "test", "on")
manifest = load_project(opts, args.project)
projects = manifests_in_dependency_order(opts, manifest, ctx_gen)
manifests_by_name = {m.name: m for m in projects}
loader = ManifestLoader(opts, ctx_gen)
manifest = loader.load_manifest(args.project)
projects = loader.manifests_in_dependency_order()
# Accumulate the install directories so that the test steps
# can find their dep installation
@@ -388,7 +390,7 @@ class TestCmd(SubCmd):
ctx = ctx_gen.get_context(m.name)
fetcher = m.create_fetcher(opts, ctx)
dirs = opts.compute_dirs(m, fetcher, manifests_by_name, ctx_gen)
dirs = opts.compute_dirs(m, fetcher, loader.manifests_by_name, ctx_gen)
build_dir = dirs["build_dir"]
inst_dir = dirs["inst_dir"]