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

Clean up formatting/undefined variables/odd control flow in zlib and bzip2.

Browse Source
This commit is contained in:
Steven Watanabe
2016-03-22 10:18:13 -06:00
parent 25819cbda3
commit e6116e7567
2 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/tools/bzip2.jam
View File

@@ -137,13 +137,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 : BZIP2_SOURCE ] ;
else
{
source-path ?= [ modules.peek : BZIP2_SOURCE ] ;
}
if $(.configured.$(condition))
{
@@ -160,7 +158,7 @@ rule init (
}
return ;
}
else if $(source-path) && ! $(no-build-from-source)
else if $(source-path)
{
build-name ?= bz2 ;
library-id = [ CALC $(library-id) + 1 ] ;
@@ -218,7 +216,9 @@ rule init (
$(mt).set-target $(target) ;
}
targets.main-target-alternative $(mt) ;
} else {
}
else
{
if $(.debug)
{
ECHO "notice: [bzip2] Using pre-installed library" ;
@@ -229,7 +229,7 @@ rule init (
}
local mt = [ new ac-library bzip2 : $(.project) : $(condition) :
$(include-path) : $(library-path) : $(library-name) : $(root) ] ;
$(include-path) : $(library-path) : $(library-name) ] ;
$(mt).set-header $(header) ;
$(mt).set-default-names $(names) ;
targets.main-target-alternative $(mt) ;

21
src/tools/zlib.jam
View File

@@ -135,13 +135,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 : ZLIB_SOURCE ] ;
}
if $(.configured.$(condition))
{
@@ -158,7 +156,7 @@ rule init (
}
return ;
}
else if $(source-path) && ! $(no-build-from-source)
else if $(source-path)
{
build-name ?= z ;
library-id = [ CALC $(library-id) + 1 ] ;
@@ -185,7 +183,8 @@ rule init (
}
}
local target ;
if $(sources) {
if $(sources)
{
target = [ targets.create-typed-target LIB : $(.project)
: $(build-name).$(library-id)
: $(sources)
@@ -207,7 +206,9 @@ rule init (
$(mt).set-target $(target) ;
}
targets.main-target-alternative $(mt) ;
} else {
}
else
{
if $(.debug)
{
ECHO "notice: [zlib] Using pre-installed library" ;
@@ -218,7 +219,7 @@ rule init (
}
local mt = [ new ac-library zlib : $(.project) : $(condition) :
$(include-path) : $(library-path) : $(library-name) : $(root) ] ;
$(include-path) : $(library-path) : $(library-name) ] ;
$(mt).set-header $(header) ;
$(mt).set-default-names $(names) ;
targets.main-target-alternative $(mt) ;