boost/build
2
0
Fork 0
mirror of https://github.com/boostorg/build.git synced 2026-02-16 01:12:13 +00:00
Code Issues Projects Releases Wiki Activity

Give a location to project-config.jam.

Browse Source 
Fixes #4615.


[SVN r65163]
This commit is contained in:
Vladimir Prus
2010-09-01 08:40:17 +00:00
parent dbafd0c39d
commit fd8f8b0ffe
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
v2/build-system.jam
View File

@@ -215,9 +215,9 @@ local rule find-target ( target-id )
# 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 @@ local rule load-configuration-files
}
if $(file)
{
initialize-config-module project-config ;
initialize-config-module project-config : $(file:D) ;
load-config project-config : project-config.jam : $(file:D) ;
}
}

6
v2/build_system.py
View File

@@ -172,9 +172,9 @@ def find_target(target_id):
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 @@ def load_configuration_files():
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)