Update of /cvsroot/boost/boost/tools/build/v2/build
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv5929/build
Modified Files:
generators.jam project.jam
Log Message:
Revert the path for preserving relative names of sources, since it breaks
UBLAS tests. Will reconsider later.
Index: generators.jam
===================================================================
RCS file: /cvsroot/boost/boost/tools/build/v2/build/generators.jam,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -d -r1.99 -r1.100
--- generators.jam 23 May 2006 14:21:58 -0000 1.99
+++ generators.jam 8 Jun 2006 05:31:39 -0000 1.100
@@ -105,7 +105,6 @@
import virtual-target ;
import "class" : new ;
import property ;
- import path ;
EXPORT [EMAIL PROTECTED] : indent increase-indent decrease-indent
generators.dout ;
@@ -415,20 +414,8 @@
}
}
- # See if we need to add directory to the target name.
- local dir = [ $(sources[1]).name ] ;
- dir = $(dir:D) ;
- if $(dir) &&
- # Never append '..' to target path.
- ! [ MATCH .*(\\.\\.).* : $(dir) ]
- &&
- ! [ path.is-rooted $(dir) ]
- {
- # Relative path is always relative to the source
- # directory. Retain it, so that users can have files
- # with the same in two different subdirectories.
- name = $(dir)/$(name) ;
- }
+ # Names of sources might include directory. We should strip it.
+ name = $(name:D=) ;
}
# Assign an action for each target
Index: project.jam
===================================================================
RCS file: /cvsroot/boost/boost/tools/build/v2/build/project.jam,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -d -r1.120 -r1.121
--- project.jam 23 May 2006 14:21:58 -0000 1.120
+++ project.jam 8 Jun 2006 05:31:39 -0000 1.121
@@ -924,17 +924,7 @@
# prject. So, just make the name absolute.
for local p in $(paths)
{
- # If the path is below source location, use relative path.
- # Otherwise, use full path just to avoid any ambiguities.
- local rel = [ path.relative $(p) $(location) : no-error ] ;
- if $(rel) = not-a-child
- {
- result += [ path.root $(p) [ path.pwd ] ] ;
- }
- else
- {
- result += $(rel) ;
- }
+ result += [ path.root $(p) [ path.pwd ] ] ;
}
}
else
_______________________________________________
Boost-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/boost-cvs
