[Boost-commit] svn:boost r65163 - trunk/tools/build/v2

Subject: [Boost-commit] svn:boost r65163 - trunk/tools/build/v2
From: ghost_at_[hidden]
Date: 2010-09-01 04:40:20

Author: vladimir_prus
Date: 2010-09-01 04:40:17 EDT (Wed, 01 Sep 2010)
New Revision: 65163
URL: http://svn.boost.org/trac/boost/changeset/65163

Log:
Give a location to project-config.jam.

Fixes #4615.

Text files modified: 
   trunk/tools/build/v2/build-system.jam |     6 +++---                                  
   trunk/tools/build/v2/build_system.py  |     6 +++---                                  
   2 files changed, 6 insertions(+), 6 deletions(-)

Modified: trunk/tools/build/v2/build-system.jam
==============================================================================
--- trunk/tools/build/v2/build-system.jam	(original)
+++ trunk/tools/build/v2/build-system.jam	2010-09-01 04:40:17 EDT (Wed, 01 Sep 2010)
@@ -215,9 +215,9 @@
 
 # Initializes a new configuration module.
 #
-local rule initialize-config-module ( module-name )
+local rule initialize-config-module ( module-name : location ? )
 {
-    project.initialize $(module-name) ;
+    project.initialize $(module-name) : $(location) ;
     if USER_MODULE in [ RULENAMES ]
     {
         USER_MODULE $(module-name) ;
@@ -419,7 +419,7 @@
     }
     if $(file)
     {
-        initialize-config-module project-config ;
+        initialize-config-module project-config : $(file:D) ;
         load-config project-config : project-config.jam : $(file:D) ;        
     }   
 }

Modified: trunk/tools/build/v2/build_system.py
==============================================================================
--- trunk/tools/build/v2/build_system.py	(original)
+++ trunk/tools/build/v2/build_system.py	2010-09-01 04:40:17 EDT (Wed, 01 Sep 2010)
@@ -172,9 +172,9 @@
 
     return result
 
-def initialize_config_module(module_name):
+def initialize_config_module(module_name, location=None):
 
-    get_manager().projects().initialize(module_name)
+    get_manager().projects().initialize(module_name, location)
 
 # Helper rule used to load configuration files. Loads the first configuration
 # file with the given 'filename' at 'path' into module with name 'module-name'.
@@ -335,7 +335,7 @@
         file = b2.util.path.glob_in_parents(".", ["project-config.jam"])
 
     if file:
-        initialize_config_module('project-config')
+        initialize_config_module('project-config', os.path.dirname(file[0]))
         load_config('project-config', "project-config.jam", [os.path.dirname(file[0])], True)