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

Bugfixes.

Browse Source 
* new/targets.jam (project-target.generate): Treat names of
        other projects to build relatively to this project.
      (basic-target.generate): Generate dependency use-requirements.


[SVN r16130]
This commit is contained in:
Vladimir Prus
2002-11-06 11:41:59 +00:00
parent 24d1722d55
commit fb0fdecc80
2 changed files with 34 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
new/targets.jam
View File

@@ -133,9 +133,10 @@ rule project-target ( name : project : requirements * : default-build * )
local t = [ main-target $(name) ] ;
result += [ $(t).generate $(properties) ] ;
}
local self-location = [ project.attribute $(self.project) location ] ;
for local pn in [ project.attribute $(self.project) projects-to-build ]
{
local p = [ project.module-name $(pn) ] ;
local p = [ project.module-name [ path.join $(self-location) $(pn) ] ] ;
local t = [ project.target [ project.attribute $(p) location ] ] ;
result += [ $(t).generate $(properties) ] ;
}
@@ -420,9 +421,23 @@ rule basic-target ( name : project
}
self.generated.$(property-path) =
[ construct $(source-targets) : $(xproperties) ] ;
local xuse-requirements ;
for local p in $(self.use-requirements)
{
if dependency in [ feature.attributes $(p:G) ]
{
local g = [ generate-source $(p:G=) : $(rproperties) ] ;
xuse-requirements += $(p:G)$(g) [ $(g).use-requirements ] ;
}
else
{
xuse-requirements += $(p) ;
}
}
for local e in $(self.generated.$(property-path))
{
$(e).set-use-requirements $(self.use-requirements) ;
$(e).set-use-requirements $(xuse-requirements) ;
}
}
else

19
v2/build/targets.jam
View File

@@ -133,9 +133,10 @@ rule project-target ( name : project : requirements * : default-build * )
local t = [ main-target $(name) ] ;
result += [ $(t).generate $(properties) ] ;
}
local self-location = [ project.attribute $(self.project) location ] ;
for local pn in [ project.attribute $(self.project) projects-to-build ]
{
local p = [ project.module-name $(pn) ] ;
local p = [ project.module-name [ path.join $(self-location) $(pn) ] ] ;
local t = [ project.target [ project.attribute $(p) location ] ] ;
result += [ $(t).generate $(properties) ] ;
}
@@ -420,9 +421,23 @@ rule basic-target ( name : project
}
self.generated.$(property-path) =
[ construct $(source-targets) : $(xproperties) ] ;
local xuse-requirements ;
for local p in $(self.use-requirements)
{
if dependency in [ feature.attributes $(p:G) ]
{
local g = [ generate-source $(p:G=) : $(rproperties) ] ;
xuse-requirements += $(p:G)$(g) [ $(g).use-requirements ] ;
}
else
{
xuse-requirements += $(p) ;
}
}
for local e in $(self.generated.$(property-path))
{
$(e).set-use-requirements $(self.use-requirements) ;
$(e).set-use-requirements $(xuse-requirements) ;
}
}
else