janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-27 15:33:55 +01:00
Code Activity

build.py: Eliminate another global variable

Browse source 
Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2018-03-07 09:56:48 +00:00
commit f996726bae
2 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
scripts/build.py
View file

@ -87,7 +87,7 @@ def build_read_deps(cur, prereq_type):
def build_read_deps_cached(cur, prereq_type): def build_read_deps_cached(cur, prereq_type):
return build_cache_func(build_read_deps, [ 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) debug("adding prerequisites " + ' '.join(prereq_types) + " of module " + cur)
if cur in all_deps: if cur in all_deps:
debug('already handled module ' + cur) debug('already handled module ' + cur)
@ -99,14 +99,15 @@ def build_add_tree(cur, prereq_types, all_deps):
debug("checking prereqisites of type " + t) debug("checking prereqisites of type " + t)
deps.update(build_read_deps_cached(cur, t)) deps.update(build_read_deps_cached(cur, t))
for d in deps: for d in deps:
build_add_tree(d, prereq_types, all_deps) build_add_dep_tree(d, prereq_types, tree, all_deps)
dep_tree[cur] = deps tree[cur] = deps
return len(deps) return len(deps)
def build_calculate_order(order, modules, prereq_types, all_deps): def build_calculate_order(order, modules, prereq_types, all_deps):
dep_tree = {}
for m in modules: for m in modules:
debug("--- adding dependency tree of module " + m) 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): while len(all_deps):
for d in all_deps: for d in all_deps:
if not len(dep_tree[d]): if not len(dep_tree[d]):
@ -266,7 +267,6 @@ build_cache = {}
dep_cache = {} dep_cache = {}
my_dir=os.path.dirname(os.path.realpath(__file__)) 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', "") 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 = getattr(sys.modules[__name__], 'cmd_' + args.cmd.replace('-', '_'))
cmd(sys.argv[(len(global_args) + 1)::]) cmd(sys.argv[(len(global_args) + 1)::])

1
scripts/projects.py
View file

@ -644,4 +644,3 @@ if args.topdir:
cmd = getattr(sys.modules[__name__], 'cmd_' + args.cmd.replace('-', '_')) cmd = getattr(sys.modules[__name__], 'cmd_' + args.cmd.replace('-', '_'))
cmd(sys.argv[(len(global_args) + 1)::]) cmd(sys.argv[(len(global_args) + 1)::])