Subject: [Boost-commit] svn:boost r79416 - in trunk/tools/build/v2: build tools
From: jurko.gospodnetic_at_[hidden]
Date: 2012-07-11 11:31:28
Author: jurko
Date: 2012-07-11 11:31:27 EDT (Wed, 11 Jul 2012)
New Revision: 79416
URL: http://svn.boost.org/trac/boost/changeset/79416
Log:
Boost Build code & comment cleanup - minor stylistic changes & comment typo corrections.
Text files modified:
trunk/tools/build/v2/build/targets.jam | 2
trunk/tools/build/v2/tools/stlport.jam | 52 ++++++++++++++++++++++-----------------
2 files changed, 30 insertions(+), 24 deletions(-)
Modified: trunk/tools/build/v2/build/targets.jam
==============================================================================
--- trunk/tools/build/v2/build/targets.jam (original)
+++ trunk/tools/build/v2/build/targets.jam 2012-07-11 11:31:27 EDT (Wed, 11 Jul 2012)
@@ -744,7 +744,7 @@
}
-# Abstract target refering to a source file. This is an artificial entity
+# Abstract target referring to a source file. This is an artificial entity
# allowing sources to a target to be represented using a list of abstract target
# instances.
#
Modified: trunk/tools/build/v2/tools/stlport.jam
==============================================================================
--- trunk/tools/build/v2/tools/stlport.jam (original)
+++ trunk/tools/build/v2/tools/stlport.jam 2012-07-11 11:31:27 EDT (Wed, 11 Jul 2012)
@@ -1,8 +1,8 @@
# Copyright Gennadiy Rozental
-# Copyright 2006 Rene Rivera
-# Copyright 2003, 2004, 2006 Vladimir Prus
-# Distributed under the Boost Software License, Version 1.0.
-# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt)
+# Copyright 2006 Rene Rivera
+# Copyright 2003, 2004, 2006 Vladimir Prus
+# Distributed under the Boost Software License, Version 1.0.
+# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt)
# The STLPort is usable by means of 'stdlib' feature. When
# stdlib=stlport is specified, default version of STLPort will be used,
@@ -86,7 +86,7 @@
self.libraries = $(libraries) ;
self.version = $(version) ;
self.version.5 = [ MATCH "^(5[.][0123456789]+).*" : $(version) ] ;
-
+
local requirements ;
requirements += <stdlib-stlport:version>$(self.version) ;
self.requirements = [ property-set.create $(requirements) ] ;
@@ -120,10 +120,10 @@
if $(self.version.5)
{
# Version 5.x
-
- # STLport host IO streams no longer supported. So we always
+
+ # STLport host IO streams no longer supported. So we always
# need libraries.
-
+
# name: stlport(stl)?[dg]?(_static)?.M.R
local name = stlport ;
if [ feature.get-values <runtime-debugging> : $(raw) ] = "on"
@@ -142,31 +142,35 @@
name += _static ;
}
- # Starting with version 5.2.0, the STLport static libraries no longer
- # include a version number in their name
+ # Starting with version 5.2.0, the STLport static libraries no
+ # longer include a version number in their name
local version.pre.5.2 = [ MATCH "^(5[.][01]+).*" : $(version) ] ;
- if $(version.pre.5.2) || [ feature.get-values <runtime-link> : $(raw) ] != "static"
+ if $(version.pre.5.2) || [ feature.get-values <runtime-link> :
+ $(raw) ] != "static"
{
name += .$(self.version.5) ;
}
-
+
name = $(name:J=) ;
-
+
if [ feature.get-values <install-dependencies> : $(raw) ] = "on"
{
#~ Allow explicitly asking to install the STLport lib by
- #~ refering to it directly: /stlport//stlport/<install-dependencies>on
- #~ This allows for install packaging of all libs one might need for
- #~ a standalone distribution.
+ #~ referring to it directly:
+ #~ /stlport//stlport/<install-dependencies>on
+ #~ This allows for install packaging of all libs one might need
+ #~ for a standalone distribution.
import path : make : path-make ;
local runtime-link
= [ feature.get-values <runtime-link> : $(raw) ] ;
local lib-file.props
= [ property-set.create $(raw) <link>$(runtime-link) ] ;
local lib-file.prefix
- = [ type.generated-target-prefix $(runtime-link:U)_LIB : $(lib-file.props) ] ;
+ = [ type.generated-target-prefix $(runtime-link:U)_LIB :
+ $(lib-file.props) ] ;
local lib-file.suffix
- = [ type.generated-target-suffix $(runtime-link:U)_LIB : $(lib-file.props) ] ;
+ = [ type.generated-target-suffix $(runtime-link:U)_LIB :
+ $(lib-file.props) ] ;
lib-file.prefix
?= "" "lib" ;
lib-file.suffix
@@ -175,18 +179,20 @@
= [ GLOB $(self.libraries) [ modules.peek : PATH ] :
$(lib-file.prefix)$(name).$(lib-file.suffix) ] ;
lib-file
- = [ new file-reference [ path-make $(lib-file[1]) ] : $(self.project) ] ;
+ = [ new file-reference [ path-make $(lib-file[1]) ] :
+ $(self.project) ] ;
lib-file
= [ $(lib-file).generate "" ] ;
local lib-file.requirements
= [ targets.main-target-requirements
[ $(lib-file.props).raw ] <file>$(lib-file[-1])
: $(self.project) ] ;
- return [ generators.construct $(self.project) $(name) : LIB : $(lib-file.requirements) ] ;
+ return [ generators.construct $(self.project) $(name) : LIB :
+ $(lib-file.requirements) ] ;
}
else
{
- #~ Otherwise, it's just a regular usage of the library.
+ #~ Otherwise, it is just regular library usage.
return [ generators.construct
$(self.project) $(name) : SEARCHED_LIB : $(property-set) ] ;
}
@@ -195,7 +201,7 @@
{
# We don't need libraries if host istreams are used. For
# msvc, automatic library selection will be used.
-
+
# name: stlport_<toolset>(_stldebug)?
local name = stlport ;
name = $(name)_$(toolset) ;
@@ -259,7 +265,7 @@
<define>_STLP_THREADS=1 ;
}
}
-
+
return [ property-set.create $(usage-requirements) ] ;
}
}