From f996726bae4fb605f03694effa03537244af0f94 Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Wed, 7 Mar 2018 09:56:48 +0000 Subject: [PATCH] build.py: Eliminate another global variable Signed-off-by: Jan Lindemann --- scripts/build.py | 10 +++++----- scripts/projects.py | 1 - 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/scripts/build.py b/scripts/build.py index c502be36..5faa1a91 100644 --- a/scripts/build.py +++ b/scripts/build.py @@ -87,7 +87,7 @@ def build_read_deps(cur, prereq_type): def build_read_deps_cached(cur, prereq_type): return build_cache_func(build_read_deps, [ cur, prereq_type ]) -def build_add_tree(cur, prereq_types, all_deps): +def build_add_dep_tree(cur, prereq_types, tree, all_deps): debug("adding prerequisites " + ' '.join(prereq_types) + " of module " + cur) if cur in all_deps: debug('already handled module ' + cur) @@ -99,14 +99,15 @@ def build_add_tree(cur, prereq_types, all_deps): debug("checking prereqisites of type " + t) deps.update(build_read_deps_cached(cur, t)) for d in deps: - build_add_tree(d, prereq_types, all_deps) - dep_tree[cur] = deps + build_add_dep_tree(d, prereq_types, tree, all_deps) + tree[cur] = deps return len(deps) def build_calculate_order(order, modules, prereq_types, all_deps): + dep_tree = {} for m in modules: debug("--- adding dependency tree of module " + m) - build_add_tree(m, prereq_types, all_deps) + build_add_dep_tree(m, prereq_types, dep_tree, all_deps) while len(all_deps): for d in all_deps: if not len(dep_tree[d]): @@ -266,7 +267,6 @@ build_cache = {} dep_cache = {} my_dir=os.path.dirname(os.path.realpath(__file__)) projects_py="/usr/bin/python2 " + my_dir + "/projects.py --prefix " + projs_root + " " + os.getenv('PROJECTS_PY_EXTRA_ARGS', "") -dep_tree = {} cmd = getattr(sys.modules[__name__], 'cmd_' + args.cmd.replace('-', '_')) cmd(sys.argv[(len(global_args) + 1)::]) diff --git a/scripts/projects.py b/scripts/projects.py index 75028d4d..7fd6ccbb 100644 --- a/scripts/projects.py +++ b/scripts/projects.py @@ -644,4 +644,3 @@ if args.topdir: cmd = getattr(sys.modules[__name__], 'cmd_' + args.cmd.replace('-', '_')) cmd(sys.argv[(len(global_args) + 1)::]) -