From d962588078d75e3395bcc61373050b0b2c8ca3a6 Mon Sep 17 00:00:00 2001 From: Vladimir Prus Date: Mon, 8 Feb 2010 15:18:57 +0000 Subject: [PATCH] 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. [SVN r59581] --- src/build/project.jam | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/build/project.jam b/src/build/project.jam index 8b6a75c05..b4d2227e6 100644 --- a/src/build/project.jam +++ b/src/build/project.jam @@ -59,7 +59,7 @@ rule load ( jamfile-location ) # 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 @@ rule find-jamfile ( # 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 @@ local rule load-jamfile ( : "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) ]