[Boost-commit] svn:boost r45473 - branches/build/python_port/python/boost/build

From: ghost_at_[hidden]
Date: 2008-05-18 00:44:24

Author: vladimir_prus
Date: 2008-05-18 00:44:23 EDT (Sun, 18 May 2008)
New Revision: 45473
URL: http://svn.boost.org/trac/boost/changeset/45473

Log:
Various fixes
Text files modified: 
   branches/build/python_port/python/boost/build/build_system.py |    10 +++++++---                              
   1 files changed, 7 insertions(+), 3 deletions(-)

Modified: branches/build/python_port/python/boost/build/build_system.py
==============================================================================
--- branches/build/python_port/python/boost/build/build_system.py	(original)
+++ branches/build/python_port/python/boost/build/build_system.py	2008-05-18 00:44:23 EDT (Sun, 18 May 2008)
@@ -13,10 +13,9 @@
 import boost.build.build.virtual_target
 from boost.build.build.targets import ProjectTarget
 from boost.build.util.sequence import unique
-import boost.build.tools.common
-import boost.build.tools.builtin
 import boost.build.build.build_request
 from boost.build.build.errors import ExceptionWithUserContext
+import boost.build.tools.common
 
 import bjam
 
@@ -112,6 +111,11 @@
     
     manager = Manager(engine, global_build_dir)
 
+    # This module defines types and generator and what not,
+    # and depends on manager's existence
+    import boost.build.tools.builtin
+
+
     # Check if we can load 'test-config.jam'. If we can, load it and
     # ignore user configs.
     
@@ -347,7 +351,7 @@
                 g = t.generate(p)
                 if not isinstance(t, ProjectTarget):
                     results_of_main_targets.extend(g.targets())
-                    virtual_targets.extend(g.targets())
+                virtual_targets.extend(g.targets())
             except ExceptionWithUserContext, e:
                 e.report()
             except Exception: