From ba6c7df7f9d0c2d54b6b7e8b423b753cb7ccac31 Mon Sep 17 00:00:00 2001 From: Thomas Nagy Date: Fri, 26 Jun 2015 22:32:43 +0200 Subject: [PATCH] build:wafsamba: Use the Waf 1.8 API get_tgen_by_name instead of name_to_obj Signed-off-by: Thomas Nagy Reviewed-by: Michael Adam Reviewed-by: Andrew Bartlett Autobuild-User(master): Andrew Bartlett Autobuild-Date(master): Wed Sep 2 03:49:51 CEST 2015 on sn-devel-104 --- buildtools/wafsamba/samba_deps.py | 54 +++++++++++++++---------------- buildtools/wafsamba/samba_optimisation.py | 4 +-- buildtools/wafsamba/samba_pidl.py | 2 +- buildtools/wafsamba/samba_utils.py | 6 ++-- buildtools/wafsamba/symbols.py | 14 ++++---- 5 files changed, 40 insertions(+), 40 deletions(-) diff --git a/buildtools/wafsamba/samba_deps.py b/buildtools/wafsamba/samba_deps.py index beb366be88d..606de412022 100644 --- a/buildtools/wafsamba/samba_deps.py +++ b/buildtools/wafsamba/samba_deps.py @@ -47,7 +47,7 @@ def expand_subsystem_deps(bld): # module_name = rpc_epmapper (a module within the dcerpc_server subsystem) # module = rpc_epmapper (a module object within the dcerpc_server subsystem) - subsystem = bld.name_to_obj(subsystem_name, bld.env) + subsystem = bld.get_tgen_by_name(subsystem_name) bld.ASSERT(subsystem is not None, "Unable to find subsystem %s" % subsystem_name) for d in subsystem_list[subsystem_name]: module_name = d['TARGET'] @@ -101,7 +101,7 @@ def build_dependencies(self): self.uselib = list(self.final_syslibs) self.uselib.extend(list(self.direct_syslibs)) for lib in self.final_libs: - t = self.bld.name_to_obj(lib, self.bld.env) + t = self.bld.get_tgen_by_name(lib) self.uselib.extend(list(t.final_syslibs)) self.uselib = unique_list(self.uselib) @@ -150,7 +150,7 @@ def build_includes(self): inc_abs = [] for d in inc_deps: - t = bld.name_to_obj(d, bld.env) + t = bld.get_tgen_by_name(d) bld.ASSERT(t is not None, "Unable to find dependency %s for %s" % (d, self.sname)) inclist = getattr(t, 'samba_includes_extended', [])[:] if getattr(t, 'local_include', True): @@ -285,7 +285,7 @@ def check_duplicate_sources(bld, tgt_list): if not targets[t.sname] in [ 'LIBRARY', 'BINARY', 'PYTHON' ]: continue for obj in t.add_objects: - t2 = t.bld.name_to_obj(obj, bld.env) + t2 = t.bld.get_tgen_by_name(obj) source_set = getattr(t2, 'samba_source_set', set()) for s in source_set: if not s in subsystems: @@ -349,7 +349,7 @@ def check_group_ordering(bld, tgt_list): for t in tgt_list: tdeps = getattr(t, 'add_objects', []) + getattr(t, 'uselib_local', []) for d in tdeps: - t2 = bld.name_to_obj(d, bld.env) + t2 = bld.get_tgen_by_name(d) if t2 is None: continue map1 = grp_map[t.samba_group] @@ -432,7 +432,7 @@ def build_direct_deps(bld, tgt_list): global_deps = bld.env.GLOBAL_DEPENDENCIES global_deps_exclude = set() for dep in global_deps: - t = bld.name_to_obj(dep, bld.env) + t = bld.get_tgen_by_name(dep) for d in t.samba_deps: # prevent loops from the global dependencies list global_deps_exclude.add(d) @@ -472,7 +472,7 @@ def build_direct_deps(bld, tgt_list): implied, t.sname, targets[implied])) sys.exit(1) continue - t2 = bld.name_to_obj(d, bld.env) + t2 = bld.get_tgen_by_name(d) if t2 is None: Logs.error("no task %s of type %s in %s" % (d, targets[d], t.sname)) sys.exit(1) @@ -510,7 +510,7 @@ def indirect_libs(bld, t, chain, loops): dependency_loop(loops, t, obj) continue chain.add(obj) - t2 = bld.name_to_obj(obj, bld.env) + t2 = bld.get_tgen_by_name(obj) r2 = indirect_libs(bld, t2, chain, loops) chain.remove(obj) ret = ret.union(t2.direct_libs) @@ -521,7 +521,7 @@ def indirect_libs(bld, t, chain, loops): dependency_loop(loops, t, obj) continue chain.add(obj) - t2 = bld.name_to_obj(obj, bld.env) + t2 = bld.get_tgen_by_name(obj) r2 = indirect_libs(bld, t2, chain, loops) chain.remove(obj) ret = ret.union(t2.direct_libs) @@ -548,7 +548,7 @@ def indirect_objects(bld, t, chain, loops): dependency_loop(loops, t, lib) continue chain.add(lib) - t2 = bld.name_to_obj(lib, bld.env) + t2 = bld.get_tgen_by_name(lib) r2 = indirect_objects(bld, t2, chain, loops) chain.remove(lib) ret = ret.union(t2.direct_objects) @@ -576,7 +576,7 @@ def extended_objects(bld, t, chain): for lib in t.final_libs: if lib in chain: continue - t2 = bld.name_to_obj(lib, bld.env) + t2 = bld.get_tgen_by_name(lib) chain.add(lib) r2 = extended_objects(bld, t2, chain) chain.remove(lib) @@ -604,7 +604,7 @@ def includes_objects(bld, t, chain, inc_loops): dependency_loop(inc_loops, t, obj) continue chain.add(obj) - t2 = bld.name_to_obj(obj, bld.env) + t2 = bld.get_tgen_by_name(obj) r2 = includes_objects(bld, t2, chain, inc_loops) chain.remove(obj) ret = ret.union(t2.direct_objects) @@ -615,7 +615,7 @@ def includes_objects(bld, t, chain, inc_loops): dependency_loop(inc_loops, t, lib) continue chain.add(lib) - t2 = bld.name_to_obj(lib, bld.env) + t2 = bld.get_tgen_by_name(lib) if t2 is None: targets = LOCAL_CACHE(bld, 'TARGET_TYPE') Logs.error('Target %s of type %s not found in direct_libs for %s' % ( @@ -668,7 +668,7 @@ def break_dependency_loops(bld, tgt_list): # expand indirect subsystem and library loops for loop in loops.copy(): - t = bld.name_to_obj(loop, bld.env) + t = bld.get_tgen_by_name(loop) if t.samba_type in ['SUBSYSTEM']: loops[loop] = loops[loop].union(t.indirect_objects) loops[loop] = loops[loop].union(t.direct_objects) @@ -680,7 +680,7 @@ def break_dependency_loops(bld, tgt_list): # expand indirect includes loops for loop in inc_loops.copy(): - t = bld.name_to_obj(loop, bld.env) + t = bld.get_tgen_by_name(loop) inc_loops[loop] = inc_loops[loop].union(t.includes_objects) if loop in inc_loops[loop]: inc_loops[loop].remove(loop) @@ -726,7 +726,7 @@ def reduce_objects(bld, tgt_list): # if we will indirectly link to a target then we don't need it new = t.final_objects.copy() for l in t.final_libs: - t2 = bld.name_to_obj(l, bld.env) + t2 = bld.get_tgen_by_name(l) t2_obj = extended_objects(bld, t2, set()) dup = new.intersection(t2_obj) if t.sname in rely_on: @@ -746,7 +746,7 @@ def reduce_objects(bld, tgt_list): # add back in any objects that were relied upon by the reduction rules for r in rely_on: - t = bld.name_to_obj(r, bld.env) + t = bld.get_tgen_by_name(r) t.final_objects = t.final_objects.union(rely_on[r]) return True @@ -755,7 +755,7 @@ def reduce_objects(bld, tgt_list): def show_library_loop(bld, lib1, lib2, path, seen): '''show the detailed path of a library loop between lib1 and lib2''' - t = bld.name_to_obj(lib1, bld.env) + t = bld.get_tgen_by_name(lib1) if not lib2 in getattr(t, 'final_libs', set()): return @@ -794,7 +794,7 @@ def calculate_final_deps(bld, tgt_list, loops): # replace lib deps with objlist deps for l in t.final_libs: objname = l + '.objlist' - t2 = bld.name_to_obj(objname, bld.env) + t2 = bld.get_tgen_by_name(objname) if t2 is None: Logs.error('ERROR: subsystem %s not found' % objname) sys.exit(1) @@ -810,7 +810,7 @@ def calculate_final_deps(bld, tgt_list, loops): objname = module_name else: continue - t2 = bld.name_to_obj(objname, bld.env) + t2 = bld.get_tgen_by_name(objname) if t2 is None: Logs.error('ERROR: subsystem %s not found' % objname) sys.exit(1) @@ -822,7 +822,7 @@ def calculate_final_deps(bld, tgt_list, loops): for t in tgt_list: if t.samba_type in ['LIBRARY', 'PYTHON']: for l in t.final_libs.copy(): - t2 = bld.name_to_obj(l, bld.env) + t2 = bld.get_tgen_by_name(l) if t.sname in t2.final_libs: if getattr(bld.env, "ALLOW_CIRCULAR_LIB_DEPENDENCIES", False): # we could break this in either direction. If one of the libraries @@ -856,7 +856,7 @@ def calculate_final_deps(bld, tgt_list, loops): diff.remove(t.sname) # make sure we don't recreate the loop again! for d in diff.copy(): - t2 = bld.name_to_obj(d, bld.env) + t2 = bld.get_tgen_by_name(d) if t2.samba_type == 'LIBRARY': if t.sname in t2.final_libs: debug('deps: removing expansion %s from %s', d, t.sname) @@ -881,12 +881,12 @@ def calculate_final_deps(bld, tgt_list, loops): continue syslibs = set() for d in t.final_objects: - t2 = bld.name_to_obj(d, bld.env) + t2 = bld.get_tgen_by_name(d) syslibs = syslibs.union(t2.direct_syslibs) # this adds the indirect syslibs as well, which may not be needed # depending on the linker flags for d in t.final_libs: - t2 = bld.name_to_obj(d, bld.env) + t2 = bld.get_tgen_by_name(d) syslibs = syslibs.union(t2.direct_syslibs) t.final_syslibs = syslibs @@ -896,7 +896,7 @@ def calculate_final_deps(bld, tgt_list, loops): for t in tgt_list: if t.samba_type in ['LIBRARY', 'PYTHON']: for l in t.final_libs.copy(): - t2 = bld.name_to_obj(l, bld.env) + t2 = bld.get_tgen_by_name(l) if t.sname in t2.final_libs: Logs.error('ERROR: Unresolved library loop %s from %s' % (t.sname, t2.sname)) lib_loop_error = True @@ -912,7 +912,7 @@ def show_dependencies(bld, target, seen): if target in seen: return - t = bld.name_to_obj(target, bld.env) + t = bld.get_tgen_by_name(target) if t is None: Logs.error("ERROR: Unable to find target '%s'" % target) sys.exit(1) @@ -941,7 +941,7 @@ def show_object_duplicates(bld, tgt_list): if not targets[t.sname] in [ 'LIBRARY', 'PYTHON' ]: continue for n in getattr(t, 'final_objects', set()): - t2 = bld.name_to_obj(n, bld.env) + t2 = bld.get_tgen_by_name(n) if not n in used_by: used_by[n] = set() used_by[n].add(t.sname) diff --git a/buildtools/wafsamba/samba_optimisation.py b/buildtools/wafsamba/samba_optimisation.py index 51d514ec75a..43b12a2019d 100644 --- a/buildtools/wafsamba/samba_optimisation.py +++ b/buildtools/wafsamba/samba_optimisation.py @@ -165,7 +165,7 @@ def is_this_a_static_lib(self, name): try: return cache[name] except KeyError: - ret = cache[name] = 'cstaticlib' in self.bld.name_to_obj(name, self.env).features + ret = cache[name] = 'cstaticlib' in self.bld.get_tgen_by_name(name).features return ret TaskGen.task_gen.is_this_a_static_lib = is_this_a_static_lib @@ -215,7 +215,7 @@ def apply_lib_vars(self): if lib_name in seen: continue - y = self.name_to_obj(lib_name) + y = self.get_tgen_by_name(lib_name) if not y: raise Utils.WafError('object %r was not found in uselib_local (required by %r)' % (lib_name, self.name)) y.post() diff --git a/buildtools/wafsamba/samba_pidl.py b/buildtools/wafsamba/samba_pidl.py index 110b15e98fe..abf6e9c0fa3 100644 --- a/buildtools/wafsamba/samba_pidl.py +++ b/buildtools/wafsamba/samba_pidl.py @@ -118,7 +118,7 @@ from TaskGen import feature, before def collect(self): pidl_headers = LOCAL_CACHE(self.bld, 'PIDL_HEADERS') for (name, hd) in pidl_headers.items(): - y = self.bld.name_to_obj(name, self.env) + y = self.bld.get_tgen_by_name(name) self.bld.ASSERT(y is not None, 'Failed to find PIDL header %s' % name) y.post() for node in hd: diff --git a/buildtools/wafsamba/samba_utils.py b/buildtools/wafsamba/samba_utils.py index 540fe447942..9bbe6ac33a4 100644 --- a/buildtools/wafsamba/samba_utils.py +++ b/buildtools/wafsamba/samba_utils.py @@ -66,7 +66,7 @@ def ADD_LD_LIBRARY_PATH(path): def needs_private_lib(bld, target): '''return True if a target links to a private library''' for lib in getattr(target, "final_libs", []): - t = bld.name_to_obj(lib, bld.env) + t = bld.get_tgen_by_name(lib) if t and getattr(t, 'private_library', False): return True return False @@ -173,7 +173,7 @@ def process_depends_on(self): if getattr(self , 'depends_on', None): lst = self.to_list(self.depends_on) for x in lst: - y = self.bld.name_to_obj(x, self.env) + y = self.bld.get_tgen_by_name(x) self.bld.ASSERT(y is not None, "Failed to find dependency %s of %s" % (x, self.name)) y.post() if getattr(y, 'more_includes', None): @@ -644,7 +644,7 @@ def get_tgt_list(bld): type = targets[tgt] if not type in ['SUBSYSTEM', 'MODULE', 'BINARY', 'LIBRARY', 'ASN1', 'PYTHON']: continue - t = bld.name_to_obj(tgt, bld.env) + t = bld.get_tgen_by_name(tgt) if t is None: Logs.error("Target %s of type %s has no task generator" % (tgt, type)) sys.exit(1) diff --git a/buildtools/wafsamba/symbols.py b/buildtools/wafsamba/symbols.py index daa18b95cdc..d37cce23a01 100644 --- a/buildtools/wafsamba/symbols.py +++ b/buildtools/wafsamba/symbols.py @@ -251,7 +251,7 @@ def build_symbol_sets(bld, tgt_list): bld.env.public_symbols[name] = t.public_symbols if t.samba_type == 'LIBRARY': for dep in t.add_objects: - t2 = bld.name_to_obj(dep, bld.env) + t2 = bld.get_tgen_by_name(dep) bld.ASSERT(t2 is not None, "Library '%s' has unknown dependency '%s'" % (name, dep)) bld.env.public_symbols[name] = bld.env.public_symbols[name].union(t2.public_symbols) @@ -264,7 +264,7 @@ def build_symbol_sets(bld, tgt_list): bld.env.used_symbols[name] = t.used_symbols if t.samba_type == 'LIBRARY': for dep in t.add_objects: - t2 = bld.name_to_obj(dep, bld.env) + t2 = bld.get_tgen_by_name(dep) bld.ASSERT(t2 is not None, "Library '%s' has unknown dependency '%s'" % (name, dep)) bld.env.used_symbols[name] = bld.env.used_symbols[name].union(t2.used_symbols) @@ -362,7 +362,7 @@ def build_autodeps(bld, t): if targets[depname[0]] in [ 'SYSLIB' ]: deps.add(depname[0]) continue - t2 = bld.name_to_obj(depname[0], bld.env) + t2 = bld.get_tgen_by_name(depname[0]) if len(t2.in_library) != 1: deps.add(depname[0]) continue @@ -385,7 +385,7 @@ def build_library_names(bld, tgt_list): for t in tgt_list: if t.samba_type in [ 'LIBRARY' ]: for obj in t.samba_deps_extended: - t2 = bld.name_to_obj(obj, bld.env) + t2 = bld.get_tgen_by_name(obj) if t2 and t2.samba_type in [ 'SUBSYSTEM', 'ASN1' ]: if not t.sname in t2.in_library: t2.in_library.append(t.sname) @@ -402,7 +402,7 @@ def check_library_deps(bld, t): Logs.warn("WARNING: Target '%s' in multiple libraries: %s" % (t.sname, t.in_library)) for dep in t.autodeps: - t2 = bld.name_to_obj(dep, bld.env) + t2 = bld.get_tgen_by_name(dep) if t2 is None: continue for dep2 in t2.autodeps: @@ -435,7 +435,7 @@ def check_syslib_collisions(bld, tgt_list): def check_dependencies(bld, t): '''check for depenencies that should be changed''' - if bld.name_to_obj(t.sname + ".objlist", bld.env): + if bld.get_tgen_by_name(t.sname + ".objlist"): return targets = LOCAL_CACHE(bld, 'TARGET_TYPE') @@ -475,7 +475,7 @@ def check_dependencies(bld, t): def check_syslib_dependencies(bld, t): '''check for syslib depenencies''' - if bld.name_to_obj(t.sname + ".objlist", bld.env): + if bld.get_tgen_by_name(t.sname + ".objlist"): return sname = real_name(t.sname) -- 2.11.4.GIT