Subject: [Boost-commit] svn:boost r83824 - trunk/tools/build/v2/build
From: steven_at_[hidden]
Date: 2013-04-09 16:13:02
Author: steven_watanabe
Date: 2013-04-09 16:13:00 EDT (Tue, 09 Apr 2013)
New Revision: 83824
URL: http://svn.boost.org/trac/boost/changeset/83824
Log:
Anchor matches
Text files modified:
trunk/tools/build/v2/build/project.jam | 10 +++++-----
trunk/tools/build/v2/build/targets.jam | 4 ++--
2 files changed, 7 insertions(+), 7 deletions(-)
Modified: trunk/tools/build/v2/build/project.jam
==============================================================================
--- trunk/tools/build/v2/build/project.jam (original)
+++ trunk/tools/build/v2/build/project.jam 2013-04-09 16:13:00 EDT (Tue, 09 Apr 2013)
@@ -234,7 +234,7 @@
#
if $(jamfile-to-load[2-])
{
- local v2-jamfiles = [ MATCH (.*[Jj]amfile\\.v2)|(.*[Bb]uild\\.jam) :
+ local v2-jamfiles = [ MATCH ^(.*[Jj]amfile\\.v2)|(.*[Bb]uild\\.jam)$ :
$(jamfile-to-load) ] ;
if $(v2-jamfiles) && ! $(v2-jamfiles[2])
@@ -309,7 +309,7 @@
mark-as-user $(jamfile-module) ;
modules.load $(jamfile-module) : [ path.native $(jamfile-to-load) ]
: . ;
- if [ MATCH ($(JAMROOT)) : $(jamfile-to-load:BS) ]
+ if [ MATCH ^($(JAMROOT))$ : $(jamfile-to-load:BS) ]
{
jamfile = [ find-jamfile $(dir) : no-errors ] ;
if $(jamfile)
@@ -401,7 +401,7 @@
}
-.global-build-dir = [ MATCH --build-dir=(.*) : [ modules.peek : ARGV ] ] ;
+.global-build-dir = [ MATCH ^--build-dir=(.*)$ : [ modules.peek : ARGV ] ] ;
if $(.global-build-dir)
{
# If the option is specified several times, take the last value.
@@ -442,7 +442,7 @@
{
parent-module = user-config ;
}
- else if $(location) && ! [ MATCH ($(JAMROOT)) : $(basename) ]
+ else if $(location) && ! [ MATCH ^($(JAMROOT))$ : $(basename) ]
{
# We search for parent/jamroot only if this is a jamfile project, i.e.
# if is not a standalone or a jamroot project.
@@ -1087,7 +1087,7 @@
combine that with the --build-dir option. ;
}
# Strip the leading slash from id.
- local rid = [ MATCH /(.*) : $(id) ] ;
+ local rid = [ MATCH ^/(.*) : $(id) ] ;
local p = [ path.join $(global-build-dir) $(rid)
$(explicit-build-dir) ] ;
Modified: trunk/tools/build/v2/build/targets.jam
==============================================================================
--- trunk/tools/build/v2/build/targets.jam (original)
+++ trunk/tools/build/v2/build/targets.jam 2013-04-09 16:13:00 EDT (Tue, 09 Apr 2013)
@@ -239,7 +239,7 @@
local id = [ get id ] ;
if $(id)
{
- local rid = [ MATCH /(.*) : $(id) ] ;
+ local rid = [ MATCH ^/(.*) : $(id) ] ;
self.build-dir = [ path.join [ project.standalone-build-dir ] $(rid) ] ;
}
else
@@ -372,7 +372,7 @@
local result ;
local current-location = [ get location ] ;
- local split = [ MATCH (.*)//(.*) : $(id) ] ;
+ local split = [ MATCH ^(.*)//(.*)$ : $(id) ] ;
local project-part = $(split[1]) ;
local target-part = $(split[2]) ;