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

Don't require Jamfile referred by 'use-project' to declare id equal to

Browse Source 
the one specified in 'use-project', or any id at all.


[SVN r26844]
This commit is contained in:
Vladimir Prus
2005-01-25 15:48:52 +00:00
parent eb721f529f
commit aafe55b1ff
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
v2/build/project.jam
View File

@@ -616,14 +616,18 @@ rule use ( id : location )
local saved-project = $(.current-project) ;
local project-module = [ project.load $(location) ] ;
local declared-id = [ project.attribute $(project-module) id ] ;
if ! $(declared-id)
if ! $(declared-id) || $(declared-id) != $(id)
{
error "project loaded by 'use-project' has no project-id." ;
}
if $(declared-id) != $(id)
{
error project \"$(declared-id)\" at \"$(location)\" redeclared with id \"$(id)\". ;
# The project at 'location' either have no id or
# that id is not equal to the 'id' parameter.
if $($(id).jamfile-module)
&& $($(id).jamfile-module) != $(project-module)
{
errors.user-error
"Attempt to redeclare already existing project id" ;
}
$(id).jamfile-module = $(project-module) ;
}
.current-project = $(saved-project) ;
}