boost/build
2
0
Fork 0
mirror of https://github.com/boostorg/build.git synced 2026-02-15 00:52:16 +00:00
Code Issues Projects Releases Wiki Activity

Make sure we use the same name of project module everywhere.

Browse Source 
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]
This commit is contained in:
Vladimir Prus
2010-02-08 15:18:57 +00:00
parent 9f841047f1
commit d962588078
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/build/project.jam
View File

@@ -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) ]