|
|
Boost-Build : |
From: Rene Rivera (grafik.list_at_[hidden])
Date: 2004-10-10 20:29:55
Aleksey Gurtovoy wrote:
> Update of /cvsroot/boost/boost/tools/build/v1
> In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21794/tools/build/v1
>
> Modified Files:
> boost-base.jam intel-win32-tools.html
[slice]
> Log Message:
> remove dots from toolset names (see http://thread.gmane.org/gmane.comp.lib.boost.build/6603)
[dice]
> Index: boost-base.jam
> ===================================================================
> RCS file: /cvsroot/boost/boost/tools/build/v1/boost-base.jam,v
> retrieving revision 1.139
> retrieving revision 1.140
> diff -u -d -r1.139 -r1.140
> --- boost-base.jam 2 Oct 2004 19:00:25 -0000 1.139
> +++ boost-base.jam 10 Oct 2004 18:50:29 -0000 1.140
> @@ -74,7 +74,7 @@
>
> if $(NT)
> {
> - TOOLS ?= vc7.1 ;
> + TOOLS ?= vc-7_1 ;
> }
> else
> {
> @@ -2607,10 +2607,10 @@
> case sunpro* : toolset-tag += sw ;
> case tru64cxx* : toolset-tag += tru ;
> case vacpp* : toolset-tag += xlc ;
> - case vc[678][.]* :
> + case vc[-][678][-]* :
> {
> toolset-tag += vc ;
> - toolset-tag += [ MATCH "vc([678])[.]([0123456789]*)" : $(toolset) ] ;
> + toolset-tag += [ MATCH "vc[-]([678])[-]([0123456789]*)" : $(toolset) ] ;
That won't work... You really wanted "." for "_" replacement. The above
was handling vc7-*, vc7.1, etc. But now it only handles vc-7-*, but
misses vc-7_1-*
> }
> case vc[678]* :
> {
> @@ -2620,7 +2620,7 @@
> case * :
> toolset-tag += [ MATCH "^([^-]*)" : $(toolset) ] ;
> }
> - toolset-tag += [ MATCH "[-]([0123456789]+).([0123456789]*)" : $(toolset) ] ;
> + toolset-tag += [ MATCH "[-]([0123456789]+)[-]([0123456789]*)" : $(toolset) ] ;
Similar problem here. Used to handle *-1.1-* and *-1-*, but now it only
handles *-1-*, and *-1-1-*.
> }
>
> local version-tag = ;
> @@ -2628,7 +2628,7 @@
> {
> local version-number = [ get-values <version> : $(properties) ] ;
> version-number ?= $(BOOST_VERSION) ;
> - version-tag = [ MATCH "^([^.]+).([^.]+)" : $(version-number[1]) ] ;
> + version-tag = [ MATCH "^([^-]+)[-]([^-]+)" : $(version-number[1]) ] ;
And you did not need to touch this one at all as it only handle the
Boost version "1.32.0", which is not part of any filename.
> version-tag = $(version-tag:J="_") ;
> }
Anyway; I fixed it :-)
--grafik
Boost-Build list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk