Fix creation of unversioned symlinks when build id is specified.

Previously, the presense of buildid would make the regexp for removing
the version fail, and that caused a name of 'exact' to be used for all
targets.

Thanks to Daniel Kruegler for the bug report.


[SVN r49560]
This commit is contained in:
Vladimir Prus 2008-11-03 15:30:06 +00:00
parent 45d2130f97
commit fc3d799098

10
Jamroot
View file

@ -444,15 +444,15 @@ if $(layout-versioned) && ( [ modules.peek : NT ] || [ modules.peek : UNIX ] )
local noversion-file ;
if $(nt)
{
noversion-file = [ MATCH "(.*)-[0-9_]+([.]lib)" : $(name) ] ;
noversion-file = [ MATCH "(.*)-[0-9_]+(.*[.]lib)" : $(name) ] ;
}
else
{
noversion-file =
[ MATCH "(.*)-[0-9_]+([.]so)[.0-9]*" : $(name) ]
[ MATCH "(.*)-[0-9_]+([.]dylib)" : $(name) ]
[ MATCH "(.*)-[0-9_]+([.]a)" : $(name) ]
[ MATCH "(.*)-[0-9_]+([.]dll[.]a)" : $(name) ] ;
[ MATCH "(.*)-[0-9_]+(.*[.]so)[.0-9]*" : $(name) ]
[ MATCH "(.*)-[0-9_]+(.*[.]dylib)" : $(name) ]
[ MATCH "(.*)-[0-9_]+(.*[.]a)" : $(name) ]
[ MATCH "(.*)-[0-9_]+(.*[.]dll[.]a)" : $(name) ] ;
}
local new-name =