diff --git a/src/build/version.jam b/src/build/version.jam index 3092a5d99..fa34d32d2 100644 --- a/src/build/version.jam +++ b/src/build/version.jam @@ -99,12 +99,6 @@ rule version-less ( lhs + : rhs + ) return $(result) ; } -# Splits a version in its form of n[.n][.n] into n n n etc. -# -rule version-split ( v ) -{ -return [ SPLIT_BY_CHARACTERS $(v) : . ] ; -} # Returns "true" if the current JAM version version is at least the given # version. @@ -148,8 +142,6 @@ rule __test__ ( ) assert.true check-jam-version $(jam-version) ; assert.false check-jam-version $(future-version) ; - assert.result 8 4 2 : version-split 8.4.2 ; - assert.true version-less 0 : 1 ; assert.false version-less 0 : 0 ; assert.true version-less 1 : 2 ; diff --git a/src/tools/borland.jam b/src/tools/borland.jam index 59d6faab3..ab2756e9c 100644 --- a/src/tools/borland.jam +++ b/src/tools/borland.jam @@ -93,7 +93,7 @@ rule init ( version ? : command * : options * ) { jv = [ MATCH "^([0-9.]+)" : $(version) ] ; } - if ! $(jv) || [ version.version-less [ version.version-split $(jv) ] : 6 30 ] + if ! $(jv) || [ version.version-less [ version-split $(jv) ] : 6 30 ] { init-earlier-releases $(condition) ; } @@ -108,6 +108,13 @@ rule init ( version ? : command * : options * ) } } +# Splits a version in its form of n[.n][.n] into n n n etc. +# +local rule version-split ( v ) +{ +return [ SPLIT_BY_CHARACTERS $(v) : . ] ; +} + local rule init-earlier-releases ( condition ) {