From cec57950575fb75dae4f958155e5536a0a2eabc0 Mon Sep 17 00:00:00 2001 From: Juraj Ivancic Date: Wed, 7 Dec 2011 10:38:40 +0100 Subject: [PATCH] Fix tag rule for searched libs. --- src/tools/builtin.py | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/src/tools/builtin.py b/src/tools/builtin.py index 35c1a40d8..8825f5d7b 100644 --- a/src/tools/builtin.py +++ b/src/tools/builtin.py @@ -66,7 +66,7 @@ def variant (name, parents_or_properties, explicit_properties = []): p = parents[0] # TODO: the check may be stricter if not feature.is_implicit_value (p): - raise BaseException ("Invalid base varaint '%s'" % p) + raise BaseException ("Invalid base variant '%s'" % p) inherited = __variant_explicit_properties[p] @@ -325,21 +325,15 @@ reset () register_globals () class SearchedLibTarget (virtual_target.AbstractFileTarget): - def __init__ (self, name, project, shared, real_name, search, action): + def __init__ (self, name, project, shared, search, action): virtual_target.AbstractFileTarget.__init__ (self, name, 'SEARCHED_LIB', project, action) self.shared_ = shared - self.real_name_ = real_name - if not self.real_name_: - self.real_name_ = name self.search_ = search def shared (self): return self.shared_ - def real_name (self): - return self.real_name_ - def search (self): return self.search_ @@ -506,10 +500,10 @@ class SearchedLibGenerator (generators.Generator): if real_name: real_name = real_name[0] else: - real_nake = name + real_name = name search = feature.get_values('', properties) usage_requirements = property_set.create(['' + p for p in search]) - t = SearchedLibTarget(name, project, shared, real_name, search, a) + t = SearchedLibTarget(real_name, project, shared, search, a) # We return sources for a simple reason. If there's # lib png : z : png ; @@ -669,7 +663,7 @@ class LinkingGenerator (generators.Generator): fst = [] for s in sources: if type.is_derived(s.type(), 'SEARCHED_LIB'): - n = s.real_name() + n = s.name() if s.shared(): fsa.append(n)