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

perforce 2.4 integration

Browse Source 
[SVN r13390]
This commit is contained in:
Dave Abrahams
2002-04-07 00:18:37 +00:00
parent 4aa99f0d00
commit 168fceb804
3 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/util/doc.jam
View File

@@ -156,7 +156,7 @@ rule do-help ( )
# Is it a module?
local path-to-modules = [ modules.peek : BOOST_BUILD_PATH ] ;
path-to-modules ?= . ;
if $(help) && [ glob $(path-to-modules) : $(help)\\.jam ]
if $(help) && [ GLOB $(path-to-modules) : $(help)\\.jam ]
{
print-help-modules $(help) ;
did-help = true ;
@@ -260,7 +260,7 @@ rule print-help-modules ( modules * )
"detailed information."
;
local modules-to-list =
[ glob [ modules.peek : BOOST_BUILD_PATH ] : *.jam ] ;
[ GLOB [ modules.peek : BOOST_BUILD_PATH ] : *.jam ] ;
if $(modules-to-list)
{
print-list-start ;
@@ -558,29 +558,34 @@ rule echo-with-wordwrap ( text + : indent ? )
{
text = $(text:J=" ") ;
indent ?= "" ;
local use-indent = "" ;
local char-match =
".?.?.?.?.?.?.?.?.?.?.?.?.?.?.?.?.?.?.?.?.?.?.?.?.?.?.?.?.?.?.?.?.?.?.?.?.?.?.?.?.?.?.?.?.?.?.?.?.?.?.?.?.?.?.?.?.?.?.?.?.?.?.?.?.?.?.?.?.?.?.?.?.?.?.?.?.?.?" ;
while $(text)
{
local s = "" ;
local t = "" ;
s = [ MATCH "^($(char-match)).*" : $(text) ] ;
s += [ MATCH "^$(char-match)(.*)" : $(text) ] ;
# divide s into the first 78 characters and the rest
s = [ MATCH "^($(char-match))(.*)" : $(text) ] ;
if $(s[2])
{
t = [ MATCH "^(.*)[\\ ][^\\ ]*$" : $(s[1]) ] ;
t += [ MATCH "^.*[\\ ]([^\\ ]*)$" : $(s[1]) ] ;
# split the first half at a space
t = [ MATCH "^(.*)[\\ ]([^\\ ]*)$" : $(s[1]) ] ;
}
else
{
t = $(s) ;
}
if ! $(t[2])
{
t += "" ;
}
text = $(indent)$(t[2])$(s[2]) ;
ECHO $(t[1]) ;
text = $(t[2])$(s[2]) ;
ECHO $(use-indent)$(t[1]) ;
use-indent = $(indent) ;
}
}

2
src/util/sequence.jam
View File

@@ -197,6 +197,8 @@ local rule __test__ ( )
assert.result 1 : sequence.length a ;
assert.result 10 : sequence.length a b c d e f g h i j ;
assert.result 11 : sequence.length a b c d e f g h i j k ;
assert.result 12 : sequence.length a b c d e f g h i j k l ;
local p2 = x ;
for local i in 1 2 3 4 5 6 7 8

2
src/util/string.jam
View File

@@ -15,7 +15,7 @@ rule chars ( string )
}
# trim off empty strings
while $(result[1]) && ! $(result[-2])
while $(result[1]) && ! $(result[-1])
{
result = $(result[1--2]) ;
}