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

Fix a couple of fallouts from the default build change.

Browse Source 
* new/make.jam
  (make): Pass 'default-build' in the right position.

* new/targets.jam
  (basic-target): Use empty property-set if no default-build is passed.
  (main-target): Use 'raw' to test property-set for emptines. The string
  emptyness test that use to be there does not works for property-sets.


[SVN r18440]
This commit is contained in:
Vladimir Prus
2003-05-19 10:28:02 +00:00
parent ad92677c12
commit 83ed59d79b
4 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
new/make.jam
View File

@@ -54,7 +54,6 @@ rule make ( target-name : sources * : generating-rule + : requirements *
[ new make-target-class $(target-name) : $(caller) : $(sources) :
[ targets.main-target-requirements $(requirements) : $(caller) ] :
$(generating-rule) :
:
[ targets.main-target-default-build : $(caller) ]
] ;

8
new/targets.jam
View File

@@ -262,12 +262,12 @@ rule main-target ( name : project )
import sequence ;
import print ;
import build-request feature property-set ;
# Add a new alternative for this target
rule add-alternative ( target )
{
local d = [ $(target).default-build ] ;
if $(self.alternatives) && $(d)
if $(self.alternatives) && [ $(d).raw ]
{
errors.error "default build can be specified only in first alternative"
: "main target is " [ full-name ] ;
@@ -497,6 +497,10 @@ rule basic-target ( name : project
requirements = [ property-set.empty ] ;
}
self.requirements = $(requirements) ;
if ! $(default-build)
{
default-build = [ property-set.empty ] ;
}
self.default-build = $(default-build) ;
if ! $(usage-requirements)
{

8
v2/build/targets.jam
View File

@@ -262,12 +262,12 @@ rule main-target ( name : project )
import sequence ;
import print ;
import build-request feature property-set ;
# Add a new alternative for this target
rule add-alternative ( target )
{
local d = [ $(target).default-build ] ;
if $(self.alternatives) && $(d)
if $(self.alternatives) && [ $(d).raw ]
{
errors.error "default build can be specified only in first alternative"
: "main target is " [ full-name ] ;
@@ -497,6 +497,10 @@ rule basic-target ( name : project
requirements = [ property-set.empty ] ;
}
self.requirements = $(requirements) ;
if ! $(default-build)
{
default-build = [ property-set.empty ] ;
}
self.default-build = $(default-build) ;
if ! $(usage-requirements)
{

1
v2/tools/make.jam
View File

@@ -54,7 +54,6 @@ rule make ( target-name : sources * : generating-rule + : requirements *
[ new make-target-class $(target-name) : $(caller) : $(sources) :
[ targets.main-target-requirements $(requirements) : $(caller) ] :
$(generating-rule) :
:
[ targets.main-target-default-build : $(caller) ]
] ;