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

Eliminate the need for the annoying is-default argument of zlib, bzip2, and lzma.

Browse Source
This commit is contained in:
Steven Watanabe
2017-07-28 22:02:30 -06:00
parent 486ddb6ba7
commit 2b988d4ed6
3 changed files with 27 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/tools/bzip2.jam
View File

@@ -96,7 +96,10 @@ rule init (
: is-default ?
# Default configurations are only used when bzip
# has not yet been configured.
# has not yet been configured. This option is
# deprecated. A configuration will be treated
# as a default when none of <include>, <search>,
# <name>, and <source> are present.
)
{
local caller = [ project.current ] ;
@@ -123,6 +126,11 @@ rule init (
local build-name = [ property.select <build-name> : $(options) ] ;
build-name = $(build-name:G=) ;
if ! $(library-path) && ! $(include-path) && ! $(source-path) && ! $(library-name)
{
is-default = true ;
}
condition = [ property-set.create $(requirements) ] ;
condition = [ property-set.create [ $(condition).base ] ] ;

10
src/tools/lzma.jam
View File

@@ -45,7 +45,10 @@ rule init (
: is-default ?
# Default configurations are only used when
# not yet configured.
# not yet configured. This option is
# deprecated. A configuration will be treated
# as a default when none of <include>, <search>,
# <name>, and <source> are present.
)
{
local caller = [ project.current ] ;
@@ -66,6 +69,11 @@ rule init (
local library-name = [ property.select <name> : $(options) ] ;
library-name = $(library-name:G=) ;
if ! $(options)
{
is-default = true ;
}
condition = [ property-set.create $(requirements) ] ;
condition = [ property-set.create [ $(condition).base ] ] ;

10
src/tools/zlib.jam
View File

@@ -94,7 +94,10 @@ rule init (
: is-default ?
# Default configurations are only used when zlib
# has not yet been configured.
# has not yet been configured. This option is
# deprecated. A configuration will be treated
# as a default when none of <include>, <search>,
# <name>, and <source> are present.
)
{
local caller = [ project.current ] ;
@@ -121,6 +124,11 @@ rule init (
local build-name = [ property.select <build-name> : $(options) ] ;
build-name = $(build-name:G=) ;
if ! $(library-path) && ! $(include-path) && ! $(source-path) && ! $(library-name)
{
is-default = true ;
}
condition = [ property-set.create $(requirements) ] ;
condition = [ property-set.create [ $(condition).base ] ] ;