Update of /cvsroot/boost/boost/tools/build/v2/build
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv30303/build
Modified Files:
project.jam
Log Message:
Make 'use-project' in user-config work.
* build/project.jam (load-used-projects): New, extracted from 'load'.
(load): Call 'load-used-projects'
* build-system.jam: Call 'load-used-projects' for site-config and
user-config.
Thanks to Andrei Melnikov for the bug report.
Index: project.jam
===================================================================
RCS file: /cvsroot/boost/boost/tools/build/v2/build/project.jam,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -d -r1.121 -r1.122
--- project.jam 8 Jun 2006 05:31:39 -0000 1.121
+++ project.jam 7 Jul 2006 06:47:20 -0000 1.122
@@ -76,22 +76,28 @@
# to child projects from parent projects, we don't immediately
# loading child projects when seing those attributes. Instead,
# we record the minimal information that will be used only later.
-
- local used = [ modules.peek $(module-name) : .used-projects ] ;
- import project ;
- while $(used)
- {
- local id = $(used[1]) ;
- local where = $(used[2]) ;
-
- project.use $(id) : [ path.root
- [ path.make $(where) ] $(jamfile-location) ] ;
- used = $(used[3-]) ;
- }
+ load-used-projects $(module-name) ;
}
return $(module-name) ;
}
+rule load-used-projects ( module-name )
+{
+ local used = [ modules.peek $(module-name) : .used-projects ] ;
+ local location = [ attribute $(module-name) location ] ;
+ import project ;
+ while $(used)
+ {
+ local id = $(used[1]) ;
+ local where = $(used[2]) ;
+
+ project.use $(id) : [ path.root
+ [ path.make $(where) ] $(location) ] ;
+ used = $(used[3-]) ;
+ }
+}
+
+
# Note the use of character groups, as opposed to listing
# 'Jamroot' and 'jamroot'. With the latter, we'd get duplicate
# matches on windows and would have to eliminate duplicates.
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Boost-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/boost-cvs