mirror of
https://github.com/facebook/proxygen.git
synced 2025-08-07 07:02:53 +03:00
extract get_dependencies method
Summary: A number of places were extracting dependencies from manifests, but only one was adding in the implicit dependencies for build tools. Extract the logic to one place and use so that a change in a tool like cmake will now correctly affect all tools using cmake, as it will be taken into account as a dependency hash when the manifest's hash is computed. Tests for this change revealed that install_dirs needed to be populated in reverse order from the manifest topo-sort, so have also addressed that Reviewed By: wittgenst Differential Revision: D32730717 fbshipit-source-id: 1b2a25e460de6085d274c99acfd391b3bd259264
This commit is contained in:
committed by
Facebook GitHub Bot
parent
c62be75fd3
commit
88f96e63cb
@@ -192,19 +192,7 @@ class ManifestLoader(object):
|
||||
# to produce the same order regardless of how they are listed
|
||||
# in the project manifest files.
|
||||
ctx = self.ctx_gen.get_context(m.name)
|
||||
dep_list = sorted(m.get_section_as_dict("dependencies", ctx).keys())
|
||||
builder = m.get("build", "builder", ctx=ctx)
|
||||
if builder in ("cmake", "python-wheel"):
|
||||
dep_list.append("cmake")
|
||||
elif builder == "autoconf" and m.name not in (
|
||||
"autoconf",
|
||||
"libtool",
|
||||
"automake",
|
||||
):
|
||||
# they need libtool and its deps (automake, autoconf) so add
|
||||
# those as deps (but obviously not if we're building those
|
||||
# projects themselves)
|
||||
dep_list.append("libtool")
|
||||
dep_list = m.get_dependencies(ctx)
|
||||
|
||||
dep_count = 0
|
||||
for dep_name in dep_list:
|
||||
@@ -303,7 +291,7 @@ class ManifestLoader(object):
|
||||
|
||||
manifest.update_hash(hasher, ctx)
|
||||
|
||||
dep_list = sorted(manifest.get_section_as_dict("dependencies", ctx).keys())
|
||||
dep_list = manifest.get_dependencies(ctx)
|
||||
for dep in dep_list:
|
||||
dep_manifest = self.load_manifest(dep)
|
||||
dep_hash = self.get_project_hash(dep_manifest)
|
||||
|
Reference in New Issue
Block a user