Re: [jamboost] Re: [Boost-build] CVS: boost/tools/build/v1 borland-5_5_1-tools.jam,NONE,1.1 borland-5_6_4-tools.jam,NONE,1.1 como-4_3_3-vc7-tools.jam,NONE,1.1 como-4_3_3-vc7_1-tools.jam,NONE,1.1 cw-8_3-tools.jam,NONE,1.1 cw-9_2-tools.jam,NONE,1.1 cw-9_3-to

From: Aleksey Gurtovoy (alexy_at_[hidden])
Date: 2004-10-11 09:35:06

Rene Rivera writes:
> Aleksey Gurtovoy wrote:
===================================================================
> > 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
> > @@ -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-*

You're right, my bad!

> 
> > }
> > 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-*.

And here too...

> 
> > }
> > 
> > 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 :-)

Thanks! I suspected I'm going to mess something up in this one.

--
Aleksey Gurtovoy
MetaCommunications Engineering