Skip to content

Commit c53742d

Browse files
paolopasgrafikrobot
authored andcommitted
targets.jam (and project.jam, property-set.jam) review
* fixing some comments * fixed regex and condition in resolve-reference * removed common-properties2 rule * fixed regex in basic-target.compute-usage-requirements * fixed xusage-requirements in basic-target.compute-usage-requirements now is a local variable instead of a class attribute * removed all checking for '@error', not need anymore since 0419f26 (2003-09-26), this is also done in build/project.jam and build/property-set.jam * emit error using errors module in typed-target.construct * removed unused imports * moved .debug-building from root module to targets * fixed checking for generate-really return value * in main-target.generate; since [ property-set.empty ] always evaluate to true it is better to avoid returning it instead of writing if $(r) = [ property-set.empty ] core_parallel_actions.py review * fixed core_parallel_actions.py test logic * reduced concurrency on core_parallel_actions.py
1 parent 5865604 commit c53742d

File tree

5 files changed

+68
-156
lines changed

5 files changed

+68
-156
lines changed

src/build/ac.jam

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,7 @@ class ac-library : basic-target
141141
import configure ;
142142
import config-cache ;
143143
import os ;
144+
import project ;
144145

145146
rule __init__ ( name : project : requirements * : include-path ? : library-path ? : library-name ? )
146147
{

src/build/project.jam

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -968,18 +968,9 @@ class project-attributes
968968
}
969969
else if $(attribute) = "requirements"
970970
{
971-
local result = [ property-set.refine-from-user-input
971+
self.requirements = [ property-set.refine-from-user-input
972972
$(self.requirements) : $(specification)
973973
: $(self.project-module) : $(self.location) ] ;
974-
975-
if $(result[1]) = "@error"
976-
{
977-
import errors : error : errors.error ;
978-
errors.error Requirements for project at '$(self.location)'
979-
conflict with parent's. : "Explanation:" $(result[2-]) ;
980-
}
981-
982-
self.requirements = $(result) ;
983974
}
984975
else if $(attribute) = "usage-requirements"
985976
{

src/build/property-set.jam

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -183,15 +183,8 @@ class property-set
183183
{
184184
if ! $(self.refined.$(ps))
185185
{
186-
local r = [ property.refine $(self.raw) : [ $(ps).raw ] ] ;
187-
if $(r[1]) != "@error"
188-
{
189-
self.refined.$(ps) = [ property-set.create $(r) ] ;
190-
}
191-
else
192-
{
193-
self.refined.$(ps) = $(r) ;
194-
}
186+
self.refined.$(ps) = [ property-set.create
187+
[ property.refine $(self.raw) : [ $(ps).raw ] ] ] ;
195188
}
196189
return $(self.refined.$(ps)) ;
197190
}

0 commit comments

Comments
 (0)