Subject: [Boost-commit] svn:boost r59581 - trunk/tools/build/v2/build
From: ghost_at_[hidden]
Date: 2010-02-08 10:18:58
Author: vladimir_prus
Date: 2010-02-08 10:18:57 EST (Mon, 08 Feb 2010)
New Revision: 59581
URL: http://svn.boost.org/trac/boost/changeset/59581
Log:
Make sure we use the same name of project module everywhere.
In particular, this fixes problems on windows where project.load
may be passed a path from Jamfile, and then load-jamfile may use
a path using the exact case as stored in the file system -- different
from the path passed to project.load.
Text files modified:
trunk/tools/build/v2/build/project.jam | 7 ++-----
1 files changed, 2 insertions(+), 5 deletions(-)
Modified: trunk/tools/build/v2/build/project.jam
==============================================================================
--- trunk/tools/build/v2/build/project.jam (original)
+++ trunk/tools/build/v2/build/project.jam 2010-02-08 10:18:57 EST (Mon, 08 Feb 2010)
@@ -59,7 +59,7 @@
# If Jamfile is already loaded, don't try again.
if ! $(module-name) in $(.jamfile-modules)
{
- load-jamfile $(jamfile-location) ;
+ load-jamfile $(jamfile-location) : $(module-name) ;
# We want to make sure that child project are loaded only after parent
# projects. In particular, because parent projects define attributes
@@ -277,6 +277,7 @@
#
local rule load-jamfile (
dir # The directory of the project Jamfile.
+ : jamfile-module
)
{
# See if the Jamfile is where it should be.
@@ -293,10 +294,6 @@
: "Filenames are: " $(jamfile-to-load:D=) ;
}
- # The module of the Jamfile.
- #
- local jamfile-module = [ module-name [ path.parent $(jamfile-to-load) ] ] ;
-
# Initialize the Jamfile module before loading.
#
initialize $(jamfile-module) : [ path.parent $(jamfile-to-load) ]