From: jurko.gospodnetic_at_[hidden]
Date: 2008-08-22 23:12:28
Author: jurko
Date: 2008-08-22 23:12:27 EDT (Fri, 22 Aug 2008)
New Revision: 48301
URL: http://svn.boost.org/trac/boost/changeset/48301
Log:
Minor stylistic Boost Jam & Boost Build module changes.
Text files modified:
trunk/tools/build/v2/build-system.jam | 17 +++++++++++++----
trunk/tools/build/v2/build/alias.jam | 3 ++-
trunk/tools/build/v2/build/targets.jam | 8 ++++----
trunk/tools/build/v2/tools/cw.jam | 5 +++--
trunk/tools/jam/src/execnt.c | 2 +-
5 files changed, 23 insertions(+), 12 deletions(-)
Modified: trunk/tools/build/v2/build-system.jam
==============================================================================
--- trunk/tools/build/v2/build-system.jam (original)
+++ trunk/tools/build/v2/build-system.jam 2008-08-22 23:12:27 EDT (Fri, 22 Aug 2008)
@@ -305,7 +305,7 @@
if $(uq)
{
test-config = $(uq) ;
- }
+ }
if $(test-config)
{
local where =
@@ -366,7 +366,8 @@
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 @@
# 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 @@
{
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 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
Modified: trunk/tools/build/v2/build/alias.jam
==============================================================================
--- trunk/tools/build/v2/build/alias.jam (original)
+++ trunk/tools/build/v2/build/alias.jam 2008-08-22 23:12:27 EDT (Fri, 22 Aug 2008)
@@ -54,7 +54,8 @@
# 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 ] ;
Modified: trunk/tools/build/v2/build/targets.jam
==============================================================================
--- trunk/tools/build/v2/build/targets.jam (original)
+++ trunk/tools/build/v2/build/targets.jam 2008-08-22 23:12:27 EDT (Fri, 22 Aug 2008)
@@ -1509,10 +1509,10 @@
{
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 ] ] ;
Modified: trunk/tools/build/v2/tools/cw.jam
==============================================================================
--- trunk/tools/build/v2/tools/cw.jam (original)
+++ trunk/tools/build/v2/tools/cw.jam 2008-08-22 23:12:27 EDT (Fri, 22 Aug 2008)
@@ -43,7 +43,7 @@
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 default-paths ( version ? ) # FIXME
+
+local rule default-paths ( version ? ) # FIXME
{
local possible-paths ;
local ProgramFiles = [ common.get-program-files-dir ] ;
Modified: trunk/tools/jam/src/execnt.c
==============================================================================
--- trunk/tools/jam/src/execnt.c (original)
+++ trunk/tools/jam/src/execnt.c 2008-08-22 23:12:27 EDT (Fri, 22 Aug 2008)
@@ -517,7 +517,7 @@
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,