From 8422292313fc40c7f15ec02e08db5bda2df1ebff Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Mon, 11 Oct 2004 01:29:11 +0000 Subject: [PATCH] Fix detection of long toolset names in translation to short names. [SVN r25652] --- v1/boost-base.jam | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/v1/boost-base.jam b/v1/boost-base.jam index 8501c0e8b..e9e1b9c57 100644 --- a/v1/boost-base.jam +++ b/v1/boost-base.jam @@ -2607,10 +2607,10 @@ rule common-variant-tag ( toolset variant : properties * ) 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) ] ; } case vc[678]* : { @@ -2620,7 +2620,7 @@ rule common-variant-tag ( toolset variant : properties * ) case * : toolset-tag += [ MATCH "^([^-]*)" : $(toolset) ] ; } - toolset-tag += [ MATCH "[-]([0123456789]+)[-]([0123456789]*)" : $(toolset) ] ; + toolset-tag += [ MATCH "[-]([0123456789]+)[_]([0123456789]*)" : $(toolset) ] ; } local version-tag = ; @@ -2628,7 +2628,7 @@ rule common-variant-tag ( toolset variant : properties * ) { local version-number = [ get-values : $(properties) ] ; version-number ?= $(BOOST_VERSION) ; - version-tag = [ MATCH "^([^-]+)[-]([^-]+)" : $(version-number[1]) ] ; + version-tag = [ MATCH "^([^-]+)[.]([^-]+)" : $(version-number[1]) ] ; version-tag = $(version-tag:J="_") ; }