From: steven_at_[hidden]
Date: 2008-07-08 00:18:47
Author: steven_watanabe
Date: 2008-07-08 00:18:45 EDT (Tue, 08 Jul 2008)
New Revision: 47208
URL: http://svn.boost.org/trac/boost/changeset/47208
Log:
Fix generator inheritance and remove the "multiple" argument from the archive generators
Text files modified:
branches/build/python_port/python/boost/build/build/generators.py | 2 +-
branches/build/python_port/python/boost/build/build/toolset.py | 2 +-
branches/build/python_port/python/boost/build/tools/builtin.py | 4 ++--
branches/build/python_port/python/boost/build/tools/unix.py | 6 +++---
4 files changed, 7 insertions(+), 7 deletions(-)
Modified: branches/build/python_port/python/boost/build/build/generators.py
==============================================================================
--- branches/build/python_port/python/boost/build/build/generators.py (original)
+++ branches/build/python_port/python/boost/build/build/generators.py 2008-07-08 00:18:45 EDT (Tue, 08 Jul 2008)
@@ -574,7 +574,7 @@
# See also inherit-generators in module toolset
base = id.split ('.', 100) [0]
- __generators_for_toolset.get(base, []).append(g)
+ __generators_for_toolset.setdefault(base, []).append(g)
def register_standard (id, source_types, target_types, requirements = []):
""" Creates new instance of the 'generator' class and registers it.
Modified: branches/build/python_port/python/boost/build/build/toolset.py
==============================================================================
--- branches/build/python_port/python/boost/build/build/toolset.py (original)
+++ branches/build/python_port/python/boost/build/build/toolset.py 2008-07-08 00:18:45 EDT (Tue, 08 Jul 2008)
@@ -397,6 +397,6 @@
def inherit(toolset, base):
get_manager().projects().load_module(base, []);
- inherit_generators(toolset, base)
+ inherit_generators(toolset, [], base)
inherit_flags(toolset, base)
inherit_rules(toolset, base)
Modified: branches/build/python_port/python/boost/build/tools/builtin.py
==============================================================================
--- branches/build/python_port/python/boost/build/tools/builtin.py (original)
+++ branches/build/python_port/python/boost/build/tools/builtin.py 2008-07-08 00:18:45 EDT (Tue, 08 Jul 2008)
@@ -699,10 +699,10 @@
def __init__ (self, id, composing, source_types, target_types_and_names, requirements):
generators.Generator.__init__ (self, id, composing, source_types, target_types_and_names, requirements)
- def run (self, project, name, prop_set, sources, multiple):
+ def run (self, project, name, prop_set, sources):
sources += prop_set.get ('<library>')
- result = generators.Generator.run (self, project, name, prop_set, sources, multiple)
+ result = generators.Generator.run (self, project, name, prop_set, sources)
return result
Modified: branches/build/python_port/python/boost/build/tools/unix.py
==============================================================================
--- branches/build/python_port/python/boost/build/tools/unix.py (original)
+++ branches/build/python_port/python/boost/build/tools/unix.py 2008-07-08 00:18:45 EDT (Tue, 08 Jul 2008)
@@ -45,9 +45,9 @@
def __init__ (self, id, composing, source_types, target_types_and_names, requirements):
builtin.ArchiveGenerator.__init__ (self, id, composing, source_types, target_types_and_names, requirements)
- def run (self, project, name, prop_set, sources, multiple):
- result = builtin.ArchiveGenerator.run (self, project, name, prop_set, sources, multiple)
- set_library_order (sources, prop_set, result)
+ def run (self, project, name, prop_set, sources):
+ result = builtin.ArchiveGenerator.run(self, project, name, prop_set, sources)
+ set_library_order(project.manager(), sources, prop_set, result)
return result
class UnixSearchedLibGenerator (builtin.SearchedLibGenerator):