Update of /cvsroot/boost/boost/tools/build/v2/util
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv5929/util
Modified Files:
path.jam
Log Message:
Revert the path for preserving relative names of sources, since it breaks
UBLAS tests. Will reconsider later.
Index: path.jam
===================================================================
RCS file: /cvsroot/boost/boost/tools/build/v2/util/path.jam,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- path.jam 23 May 2006 14:21:58 -0000 1.30
+++ path.jam 8 Jun 2006 05:31:39 -0000 1.31
@@ -306,9 +306,8 @@
# Assuming 'child' is a subdirectory of 'parent', return the relative
# path from 'parent' to 'child'
#
-rule relative ( child parent : no-error ? )
+rule relative ( child parent )
{
- local not-a-child ;
if $(parent) = "."
{
return $(child) ;
@@ -327,26 +326,10 @@
}
else
{
- not-a-child = true ;
- split1 = ;
+ errors.error $(child) is not a subdir of $(parent) ;
}
}
-
- if $(not-a-child)
- {
- if $(no-error)
- {
- return not-a-child ;
- }
- else
- {
- errors.error $(child) is not a subdir of $(parent) ;
- }
- }
- else
- {
- return [ join $(split2) ] ;
- }
+ return [ join $(split2) ] ;
}
}
_______________________________________________
Boost-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/boost-cvs
