Re: [jamboost] Replacing GNU make's VPATH with bjam's SEARCH?

From: Vladimir Prus (ghost_at_[hidden])
Date: 2005-04-08 06:52:38

Hi Jürgen,

> On Friday, 8. April 2005 13:42, Vladimir Prus wrote:
> > > e:/libraries/boost_cvs/tools/build/v2/build\project.jam:261: in
> > > find-jamfile from module project
> > > error: Unable to load Jamfile.
> > > error: Could not find a Jamfile in directory
> > > '/e:/libraries/boost_cvs'.
> >
> > I believe I've fixed this now. Can you test again?
>
> As soon as anon CVS is up-to-date. This means monday ...

Ouch!

> Or you sent me a patch ...

Here it goes.

Thanks!

-- 
Vladimir Prus
http://vladimir_prus.blogspot.com
Boost.Build V2: http://boost.org/boost-build2
 --Boundary-00=_GCnVCMv0HFZXqIt Content-Type: text/x-diff;
charset="iso-8859-15";
name="path.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
filename="path.diff"
Index: path.jam
=================================RCS file: /cvsroot/boost/boost/tools/build/v2/util/path.jam,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- path.jam	6 Apr 2005 15:27:41 -0000	1.22
+++ path.jam	8 Apr 2005 11:41:47 -0000	1.23
@@ -209,18 +209,18 @@
for local p in $(patterns)
{
local pattern = [ path.root $(p) $(d) ] ;
- result += [ glob-really $(pattern) ] ;
+ result += [ glob-really [ path.native $(pattern) ] ] ;
} 
} 
# Windows is not case-sensitive, so if you're globbing
# for Jamroot and jamroot, the result will include 'Jamroot'
# twice. Remove duplicates.
- return [ sequence.unique $(result) ] ;
+ return [ sequence.transform path.make : [ sequence.unique $(result) ] ] ;
} 
# Looks for file matching 'pattern' in 'directory'.
-# Does not recurse.
+# Does not recurse. Directory is in the native format.
rule glob-one ( dir : p )
{
local result ;
@@ -241,17 +241,17 @@
if $(p) != ".."
{ 
- result += [ sequence.transform make 
- : [ GLOB [ native $(dir) ] : $(p) ] ] ;
+ result += [ GLOB $(dir) : $(p) ] ;
} 
else
{
result += [ path.join $(dir) .. ] ;
} 
+ return $(result) ;
}
-
-
+# Searches for a single pattern and returns matches.
+# Both pattern and result are in native format.
rule glob-really ( pattern )
{
local result ;
@@ -264,7 +264,6 @@
# First glob for directory part.
local globbed-dirs = [ glob-really $(pattern:D) ] ;
- 
for local dir in $(globbed-dirs)
{
local x = [ glob-one $(dir) : $(pattern:D="") ] ;
@@ -272,7 +271,7 @@
}
}
else
- { 
+ { 
if $(pattern:D) = $(pattern)
{
# Just return the result.
 --Boundary-00=_GCnVCMv0HFZXqIt--