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

Apply cleanup from zlib to png, tiff, and jpeg as well.

Browse Source
This commit is contained in:
Steven Watanabe
2017-11-24 14:39:14 -07:00
parent 79a8a04d68
commit 4e6e4038c8
4 changed files with 43 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/tools/libjpeg.jam
View File

@@ -99,7 +99,10 @@ rule init (
: is-default ?
# Default configurations are only used when libjpeg
# 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 ] ;
@@ -129,7 +132,11 @@ rule init (
condition = [ property-set.create $(requirements) ] ;
condition = [ property-set.create [ $(condition).base ] ] ;
local no-build-from-source ;
if ! $(library-path) && ! $(include-path) && ! $(source-path) && ! $(library-name)
{
is-default = true ;
}
# Ignore environmental LIBJPEG_SOURCE if this initialization
# requested to search for a specific pre-built library.
if $(library-path) || $(include-path) || $(library-name)
@@ -140,13 +147,11 @@ rule init (
[ property.select <search> <include> <name> : $(options) ] "and"
[ property.select <source> <tag> <build-name> : $(options) ] ;
}
else
{
no-build-from-source = true ;
}
}
source-path ?= [ modules.peek : LIBJPEG_SOURCE ] ;
else
{
source-path ?= [ modules.peek : LIBJPEG_SOURCE ] ;
}
if $(.configured.$(condition))
{
@@ -163,7 +168,7 @@ rule init (
}
return ;
}
else if $(source-path) && ! $(no-build-from-source)
else if $(source-path)
{
build-name ?= jpeg ;
library-id = [ CALC $(library-id) + 1 ] ;

23
src/tools/libpng.jam
View File

@@ -93,7 +93,10 @@ rule init (
: is-default ?
# Default configurations are only used when libpng
# 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 ] ;
@@ -120,10 +123,14 @@ 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 ] ] ;
local no-build-from-source ;
# Ignore environmental LIBPNG_SOURCE if this initialization
# requested to search for a specific pre-built library.
if $(library-path) || $(include-path) || $(library-name)
@@ -134,13 +141,11 @@ rule init (
[ property.select <search> <include> <name> : $(options) ] "and"
[ property.select <source> <tag> <build-name> : $(options) ] ;
}
else
{
no-build-from-source = true ;
}
}
source-path ?= [ modules.peek : LIBPNG_SOURCE ] ;
else
{
source-path ?= [ modules.peek : LIBPNG_SOURCE ] ;
}
if $(.configured.$(condition))
{
@@ -157,7 +162,7 @@ rule init (
}
return ;
}
else if $(source-path) && ! $(no-build-from-source)
else if $(source-path)
{
build-name ?= png ;
library-id = [ CALC $(library-id) + 1 ] ;

26
src/tools/libtiff.jam
View File

@@ -96,7 +96,10 @@ rule init (
: is-default ?
# Default configurations are only used when libtiff
# 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,11 +126,15 @@ 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 ] ] ;
local no-build-from-source ;
# Ignore environmental ZLIB_SOURCE if this initialization
# Ignore environmental LIBTIFF_SOURCE if this initialization
# requested to search for a specific pre-built library.
if $(library-path) || $(include-path) || $(library-name)
{
@@ -137,13 +144,11 @@ rule init (
[ property.select <search> <include> <name> : $(options) ] "and"
[ property.select <source> <tag> <build-name> : $(options) ] ;
}
else
{
no-build-from-source = true ;
}
}
source-path ?= [ modules.peek : ZLIB_SOURCE ] ;
else
{
source-path ?= [ modules.peek : LIBTIFF_SOURCE ] ;
}
if $(.configured.$(condition))
{
@@ -160,7 +165,7 @@ rule init (
}
return ;
}
else if $(source-path) && ! $(no-build-from-source)
else if $(source-path)
{
build-name ?= tiff ;
library-id = [ CALC $(library-id) + 1 ] ;
@@ -196,7 +201,6 @@ rule init (
<include>$(source-path)
<toolset>msvc:<define>_CRT_SECURE_NO_DEPRECATE
<toolset>msvc:<define>_SCL_SECURE_NO_DEPRECATE
<link>shared:<define>ZLIB_DLL
:
: <include>$(source-path) ] ;
}

1
src/tools/zlib.jam
View File

@@ -132,7 +132,6 @@ rule init (
condition = [ property-set.create $(requirements) ] ;
condition = [ property-set.create [ $(condition).base ] ] ;
local no-build-from-source ;
# Ignore environmental ZLIB_SOURCE if this initialization
# requested to search for a specific pre-built library.
if $(library-path) || $(include-path) || $(library-name)