Skip to content

Commit

Permalink
Skip targets with <build>no in usage requirements (#81)
Browse files Browse the repository at this point in the history
  • Loading branch information
@grisumbras
grisumbras committed Sep 3, 2021
1 parent ac2cf96 commit 7402029
Show file tree
Hide file tree
Showing 3 changed files with 115 additions and 82 deletions.
166 changes: 84 additions & 82 deletions src/build/targets.jam
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1320,8 +1320,22 @@ class basic-target : abstract-target
[ $(rproperties).raw ] ;
}

if ( $(rproperties[1]) != "@error" ) && ( [ $(rproperties).get
<build> ] != no )
local skip ;
if $(rproperties[1]) = "@error"
{
ECHO [ targets.indent ] "Skipping build of:" [ full-name ]
"cannot compute common properties" ;
skip = true ;
}
else if [ $(rproperties).get <build> ] = no
{
# If we just see <build>no, we cannot produce any reasonable
# diagnostics. The code that adds this property is expected
# to explain why a target is not built, for example using
# the configure.log-component-configuration function.
skip = true ;
}
else
{
local source-targets ;
local properties = [ $(rproperties).non-dependency ] ;
Expand All @@ -1340,102 +1354,90 @@ class basic-target : abstract-target
$(self.name)": " $(usage-requirements) ;
}

rproperties = [ property-set.create $(properties)
$(usage-requirements) ] ;
usage-requirements = [ property-set.create $(usage-requirements)
] ;

if [ modules.peek : .debug-building ]
# Skipping this target if a dependency is skipped.
# Consider letting subclasses override this behavior. E.g.
# alias-target-class may override this to not fail to build if
# a dependency fails.
if <build>no in $(usage-requirements)
{
ECHO [ targets.indent ] "Build properties: "
[ $(rproperties).raw ] ;
skip = true ;
}
else
{
rproperties = [ property-set.create $(properties)
$(usage-requirements) ] ;
usage-requirements = [ property-set.create $(usage-requirements)
] ;

local extra = [ $(rproperties).get <source> ] ;
source-targets += $(extra:G=) ;
# We might get duplicate sources, for example if we link to two
# libraries having the same <library> usage requirement. Use
# stable sort, since for some targets the order is important,
# e.g. RUN_PY targets need a python source to come first.
source-targets = [ sequence.unique $(source-targets) : stable ]
;
if [ modules.peek : .debug-building ]
{
ECHO [ targets.indent ] "Build properties: "
[ $(rproperties).raw ] ;
}

local result = [ construct $(self.name) : $(source-targets) :
$(rproperties) ] ;
local extra = [ $(rproperties).get <source> ] ;
source-targets += $(extra:G=) ;
# We might get duplicate sources, for example if we link to two
# libraries having the same <library> usage requirement. Use
# stable sort, since for some targets the order is important,
# e.g. RUN_PY targets need a python source to come first.
source-targets = [ sequence.unique $(source-targets) : stable ]
;

if $(result)
{
local gur = $(result[1]) ;
result = $(result[2-]) ;

# Relevant is automatically applied to usage requirements
# and only applies for propagated features
local relevant = [ propagated-relevant
[ $(gur).get <relevant> ]
[ $(rproperties).get <relevant> ] ] ;
gur = [ property-set.create
[ property.change [ $(gur).raw ] : <relevant> ]
<relevant>$(relevant) ] ;

local s = [ create-subvariant $(result)
: [ virtual-target.recent-targets ]
: $(property-set) : $(source-targets)
: $(rproperties) : $(usage-requirements) ] ;
virtual-target.clear-recent-targets ;

if $(self.always)
local result = [ construct $(self.name) : $(source-targets) :
$(rproperties) ] ;

if $(result)
{
for local t in [ $(s).created-targets ]
local gur = $(result[1]) ;
result = $(result[2-]) ;

# Relevant is automatically applied to usage requirements
# and only applies for propagated features
local relevant = [ propagated-relevant
[ $(gur).get <relevant> ]
[ $(rproperties).get <relevant> ] ] ;
gur = [ property-set.create
[ property.change [ $(gur).raw ] : <relevant> ]
<relevant>$(relevant) ] ;

local s = [ create-subvariant $(result)
: [ virtual-target.recent-targets ]
: $(property-set) : $(source-targets)
: $(rproperties) : $(usage-requirements) ] ;
virtual-target.clear-recent-targets ;

if $(self.always)
{
$(t).always ;
for local t in [ $(s).created-targets ]
{
$(t).always ;
}
}
}

local ur = [ compute-usage-requirements $(s) ] ;
ur = [ $(ur).add $(gur) ] ;
$(s).set-usage-requirements $(ur) ;
if [ modules.peek : .debug-building ]
{
ECHO [ targets.indent ] "Usage requirements from"
$(self.name)": " [ $(ur).raw ] ;
}
local ur = [ compute-usage-requirements $(s) ] ;
ur = [ $(ur).add $(gur) ] ;
$(s).set-usage-requirements $(ur) ;
if [ modules.peek : .debug-building ]
{
ECHO [ targets.indent ] "Usage requirements from"
$(self.name)": " [ $(ur).raw ] ;
}

self.generated.$(property-set) = $(ur) $(result) ;
self.generated.$(property-set) = $(ur) $(result) ;
}
}
}
else
{
if $(rproperties[1]) = "@error"
{
ECHO [ targets.indent ] "Skipping build of:" [ full-name ]
"cannot compute common properties" ;
}
else if [ $(rproperties).get <build> ] = no
{
# If we just see <build>no, we cannot produce any reasonable
# diagnostics. The code that adds this property is expected
# to explain why a target is not built, for example using
# the configure.log-component-configuration function.
}
else
{
ECHO [ targets.indent ] "Skipping build of: " [ full-name ]
" unknown reason" ;
}

if $(skip)
{
# We are here either because there has been an error computing
# properties or there is <build>no in properties. In the latter
# case we do not want any diagnostic. In the former case, we
# need diagnostics. FIXME
# properties or there is <build>no in properties or usage
# requirements. In the latter case we do not want any
# diagnostic. In the former case, we need diagnostics. FIXME

# If this target fails to build, add <build>no to properties to
# cause any parent target to fail to build. Except that it
# - does not work now, since we check for <build>no only in
# common properties, but not in properties that came from
# dependencies
# - it is not clear if that is a good idea anyway. The alias
# target, for example, should not fail to build if a
# dependency fails.
# cause any parent target to fail to build.
self.generated.$(property-set) = [ property-set.create <build>no
] ;
}
Expand Down
1 change: 1 addition & 0 deletions test/test_all.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -318,6 +318,7 @@ def reorder_tests(tests, first_test):
"toolset_gcc",
"toolset_intel_darwin",
"toolset_requirements",
"transitive_skip",
"unit_test",
"unused",
"use_requirements",
Expand Down
30 changes: 30 additions & 0 deletions test/transitive_skip.py
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
#!/usr/bin/python

# Copyright 2021 Dmitry Arkhipov (grisumbras@gmail.com)
# Distributed under the Boost Software License, Version 1.0.
# (See accompanying file LICENSE.txt or https://www.bfgroup.xyz/b2/LICENSE.txt)

# Regression test: it was possible that due to evaluation of conditional
# requirements, two different values of non-free features were present in a
# property set.

import BoostBuild

t = BoostBuild.Tester()

t.write("a.cpp", "")

t.write("jamroot.jam", """
alias dep : : <build>no ;
make a : dep : maker ;
actions maker
{
this-command-is-unlikely-to-succeed ;
}
""")

t.run_build_system()

t.cleanup()

0 comments on commit 7402029

Please sign in to comment.