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

A small simplification

Browse Source 
[SVN r13639]
This commit is contained in:
Dave Abrahams
2002-05-03 14:15:13 +00:00
parent ba15bfb488
commit ee5fa7e874
2 changed files with 32 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
new/project.jam
View File

@@ -83,31 +83,27 @@ rule lookup ( id : current-location )
}
else
{
if $(location)
if ! $(location)
{
local module-name = [ module-name $(location) ] ;
local base-id = [ $(module-name).id ] ;
error Jamfile location must be specified for relative project-id $(id) ;
}
local module-name = [ module-name $(location) ] ;
local base-id = [ $(module-name).id ] ;
if $(base-id)
{
if $(project-id)
{
local rooted-id = $(base-id)/$(project-id) ;
return $($(rooted-id).jamfile-location) ;
}
else
{
return $($(base-id).jamfile-location) ;
}
}
else
{
error "Project in $(location) has no project id" ;
}
if ! $(base-id)
{
error "Project in $(location) has no project id" ;
}
if $(project-id)
{
local rooted-id = $(base-id)/$(project-id) ;
return $($(rooted-id).jamfile-location) ;
}
else
{
error "Jamfile location must be specified for relative project-id" ;
return $($(base-id).jamfile-location) ;
}
}
}

36
v2/build/project.jam
View File

@@ -83,31 +83,27 @@ rule lookup ( id : current-location )
}
else
{
if $(location)
if ! $(location)
{
local module-name = [ module-name $(location) ] ;
local base-id = [ $(module-name).id ] ;
error Jamfile location must be specified for relative project-id $(id) ;
}
local module-name = [ module-name $(location) ] ;
local base-id = [ $(module-name).id ] ;
if $(base-id)
{
if $(project-id)
{
local rooted-id = $(base-id)/$(project-id) ;
return $($(rooted-id).jamfile-location) ;
}
else
{
return $($(base-id).jamfile-location) ;
}
}
else
{
error "Project in $(location) has no project id" ;
}
if ! $(base-id)
{
error "Project in $(location) has no project id" ;
}
if $(project-id)
{
local rooted-id = $(base-id)/$(project-id) ;
return $($(rooted-id).jamfile-location) ;
}
else
{
error "Jamfile location must be specified for relative project-id" ;
return $($(base-id).jamfile-location) ;
}
}
}