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

Merge

Browse Source 
[SVN r36451]
This commit is contained in:
Vladimir Prus
2006-12-18 13:30:44 +00:00
parent 9e9d8c2dcc
commit aea3109a77
1 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
v2/build-system.jam
View File

@@ -45,6 +45,8 @@ rule location ( )
# Check if we can load 'test-config.jam'. If we can, load it and
# ignore user configs.
local argv = [ modules.peek : ARGV ] ;
local test-config = [ GLOB [ os.environ BOOST_BUILD_PATH ] : test-config.jam ] ;
local debug-config = [ MATCH ^(--debug-configuration)$ : [ modules.peek : ARGV ] ] ;
@@ -121,14 +123,30 @@ module user-config
initialize user-config ;
}
load-config user-config : $(user-path) ;
local user-config-path = [ MATCH ^--user-config=(.*) : $(argv) ] ;
if $(user-config-path)
{
if $(debug-config)
{
ECHO "Loading explicitly specifier user configuration file:" ;
ECHO " $(user-config-path)" ;
}
modules.load user-config : $(user-config-path:BS) : $(user-config-path:D) ;
project.load-used-projects user-config ;
}
else
{
load-config user-config : $(user-path) ;
}
#
# Autoconfigure toolsets based on any instances of --toolset=xx,yy,...zz or
# toolset=xx,yy,...zz in the command line
#
local argv = [ modules.peek : ARGV ] ;
local option-toolsets = [ regex.split-list [ MATCH ^--toolset=(.*) : $(argv) ] : "," ] ;
local feature-toolsets = [ regex.split-list [ MATCH ^toolset=(.*) : $(argv) ] : "," ] ;