mirror of
https://github.com/boostorg/build.git
synced 2026-02-13 12:22:17 +00:00
Minor stylistic Boost Jam & Boost Build module changes.
[SVN r48301]
This commit is contained in:
@@ -305,7 +305,7 @@ local rule load-configuration-files
|
||||
if $(uq)
|
||||
{
|
||||
test-config = $(uq) ;
|
||||
}
|
||||
}
|
||||
if $(test-config)
|
||||
{
|
||||
local where =
|
||||
@@ -366,7 +366,8 @@ local rule load-configuration-files
|
||||
|
||||
if $(.debug-config)
|
||||
{
|
||||
ECHO "notice: Loading explicitly specified user configuration file:" ;
|
||||
ECHO "notice: Loading explicitly specified user"
|
||||
"configuration file:" ;
|
||||
ECHO " $(user-config)" ;
|
||||
}
|
||||
|
||||
@@ -414,7 +415,7 @@ local rule process-explicit-toolset-requests
|
||||
|
||||
# If the toolset is not known, configure it now.
|
||||
local known ;
|
||||
if $(toolset) in [ feature.values <toolset> ]
|
||||
if $(toolset) in [ feature.values <toolset> ]
|
||||
{
|
||||
known = true ;
|
||||
}
|
||||
@@ -423,6 +424,14 @@ local rule process-explicit-toolset-requests
|
||||
{
|
||||
known = ;
|
||||
}
|
||||
# TODO: we should do 'using $(toolset)' in case no version has been
|
||||
# specified and there are no versions defined for the given toolset to
|
||||
# allow the toolset to configure its default version. For this we need
|
||||
# to know how to detect whether a given toolset has any versions
|
||||
# defined. An alternative would be to do this whenever version is not
|
||||
# specified but that would require that toolsets correctly handle the
|
||||
# case when their default version is configured multiple times which
|
||||
# should be checked for all existing toolsets first.
|
||||
|
||||
if ! $(known)
|
||||
{
|
||||
@@ -616,7 +625,7 @@ local rule should-clean-project ( project )
|
||||
local virtual-targets ;
|
||||
local actual-targets ;
|
||||
|
||||
|
||||
|
||||
# Process each target specified on the command-line and convert it into
|
||||
# internal Boost Build target objects. Detect special clean target. If no
|
||||
# main Boost Build targets were explictly requested use the current project
|
||||
|
||||
@@ -54,7 +54,8 @@ class alias-target-class : basic-target
|
||||
|
||||
# Declares the 'alias' target. It will build sources, and return them unaltered.
|
||||
#
|
||||
rule alias ( name : sources * : requirements * : default-build * : usage-requirements * )
|
||||
rule alias ( name : sources * : requirements * : default-build * :
|
||||
usage-requirements * )
|
||||
{
|
||||
local project = [ project.current ] ;
|
||||
|
||||
|
||||
@@ -1509,10 +1509,10 @@ rule main-target-usage-requirements (
|
||||
{
|
||||
local project-usage-requirements = [ $(project).get usage-requirements ] ;
|
||||
|
||||
# We don't use 'refine-from-user-input' because:
|
||||
# - I'm not sure if removing of parent's usage requirements makes sense
|
||||
# - refining of usage requirements is not needed, since usage requirements
|
||||
# are always free.
|
||||
# We do not use 'refine-from-user-input' because:
|
||||
# - I am not sure if removing parent's usage requirements makes sense
|
||||
# - refining usage requirements is not needed, since usage requirements are
|
||||
# always free.
|
||||
local usage-requirements = [ property-set.create-from-user-input
|
||||
$(specification)
|
||||
: [ $(project).project-module ] [ $(project).get location ] ] ;
|
||||
|
||||
@@ -517,7 +517,7 @@ int execwait()
|
||||
rstat = EXEC_CMD_FAIL;
|
||||
else
|
||||
rstat = EXEC_CMD_OK;
|
||||
|
||||
|
||||
/* output the action block */
|
||||
out_action(
|
||||
cmdtab[i].action.size > 0 ? cmdtab[i].action.value : 0,
|
||||
|
||||
@@ -43,7 +43,7 @@ rule init ( version ? : command * : options * )
|
||||
version $(version) ] ;
|
||||
|
||||
command = [ common.get-invocation-command cw : mwcc.exe : $(command) :
|
||||
[ default-paths $(version) ] ] ;
|
||||
[ default-paths $(version) ] ] ;
|
||||
|
||||
common.handle-options cw : $(condition) : $(command) : $(options) ;
|
||||
|
||||
@@ -103,7 +103,8 @@ rule init ( version ? : command * : options * )
|
||||
}
|
||||
}
|
||||
|
||||
rule default-paths ( version ? ) # FIXME
|
||||
|
||||
local rule default-paths ( version ? ) # FIXME
|
||||
{
|
||||
local possible-paths ;
|
||||
local ProgramFiles = [ common.get-program-files-dir ] ;
|
||||
|
||||
Reference in New Issue
Block a user