From 627ef555f64d6fdf1bf8f87683c0e97f1e08cfe7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jurko=20Gospodneti=C4=87?= Date: Wed, 3 Sep 2008 21:06:58 +0000 Subject: [PATCH] Minor stylistic changes in the Boost Build tools/common.jam module. [SVN r48569] --- v2/tools/common.jam | 47 +++++++++++++++++++++++---------------------- 1 file changed, 24 insertions(+), 23 deletions(-) diff --git a/v2/tools/common.jam b/v2/tools/common.jam index 7021891c7..32344df3f 100644 --- a/v2/tools/common.jam +++ b/v2/tools/common.jam @@ -722,13 +722,13 @@ actions hard-link # [joiner] # :: Collective tag of the build runtime. # [joiner] -# :: Short version tag taken from the given "version-feature" -# in the build properties. Or if not present, the literal -# value as the version number. +# :: Short version tag taken from the given "version-feature" in the +# build properties. Or if not present, the literal value as the +# version number. # [joiner] -# :: Direct lookup of the given property-name value in the -# build properties. /property-name/ is a regular expression. -# e.g. will match every toolset. +# :: Direct lookup of the given property-name value in the build +# properties. /property-name/ is a regular expression. E.g. + will match every toolset. # /otherwise/ # :: The literal value of the format argument. # @@ -757,29 +757,30 @@ rule format-name ( format * : name : type ? : property-set ) result += $(name:B) ; case : - result += [ join-tag $(f:G=) : - [ toolset-tag $(name) : $(type) : $(property-set) ] ] ; + result += [ join-tag $(f:G=) : [ toolset-tag $(name) : $(type) : + $(property-set) ] ] ; case : - result += [ join-tag $(f:G=) : - [ threading-tag $(name) : $(type) : $(property-set) ] ] ; + result += [ join-tag $(f:G=) : [ threading-tag $(name) : $(type) + : $(property-set) ] ] ; case : - result += [ join-tag $(f:G=) : - [ runtime-tag $(name) : $(type) : $(property-set) ] ] ; + result += [ join-tag $(f:G=) : [ runtime-tag $(name) : $(type) : + $(property-set) ] ] ; case : local key = [ MATCH : $(f:G) ] ; local version = [ $(property-set).get <$(key)> ] ; version ?= $(key) ; - version = [ MATCH "^([^.]+)[.]([^.]+)[.]?([^.]*)" - : $(version) ] ; + version = [ MATCH "^([^.]+)[.]([^.]+)[.]?([^.]*)" : $(version) ] + ; result += [ join-tag $(f:G=) : $(version[1])_$(version[2]) ] ; case : local key = [ MATCH : $(f:G) ] ; local p0 = [ MATCH <($(key))> : [ $(property-set).raw ] ] ; - if $(p0) { + if $(p0) + { local p = [ $(property-set).get <$(p0)> ] ; if $(p) { @@ -791,8 +792,8 @@ rule format-name ( format * : name : type ? : property-set ) result += $(f:G=) ; } } - result = [ virtual-target.add-prefix-and-suffix - $(result:J=) : $(type) : $(property-set) ] ; + result = [ virtual-target.add-prefix-and-suffix $(result:J=) : $(type) : + $(property-set) ] ; return $(result) ; } } @@ -896,14 +897,14 @@ local rule runtime-tag ( name : type ? : property-set ) local properties = [ $(property-set).raw ] ; if static in $(properties) { tag += s ; } - # This is an ugly thing. In V1, there's a code to automatically detect which + # This is an ugly thing. In V1, there is code to automatically detect which # properties affect a target. So, if does not affect gcc - # toolset, the tag rules won't even see . Similar + # toolset, the tag rules will not even see . Similar # functionality in V2 is not implemented yet, so we just check for toolsets - # which are known to care about runtime debug. - if msvc in $(properties) - || stlport in $(properties) - || win in $(properties) + # known to care about runtime debugging. + if ( msvc in $(properties) ) || + ( stlport in $(properties) ) || + ( win in $(properties) ) { if on in $(properties) { tag += g ; } }