2
0
mirror of https://github.com/boostorg/build.git synced 2026-02-18 01:52:17 +00:00

Boost Build cleanup - minor stylistic changes.

[SVN r79865]
This commit is contained in:
Jurko Gospodnetić
2012-08-04 22:40:25 +00:00
parent e0d65ffcee
commit d35d843877
4 changed files with 12 additions and 22 deletions

View File

@@ -559,7 +559,6 @@ local rule should-clean-project ( project )
current-project = [ project.target [ project.load "." ] ] ;
}
# Load the default toolset module if no other has already been specified.
if ! [ feature.values <toolset> ]
{

View File

@@ -953,8 +953,7 @@ module project-rules
}
# If '--build-dir' is specified, change the build dir for the project.
local global-build-dir =
[ modules.peek project : .global-build-dir ] ;
local global-build-dir = [ modules.peek project : .global-build-dir ] ;
if $(global-build-dir)
{

View File

@@ -2,7 +2,8 @@
# Copyright 2005 Rene Rivera
# Copyright 2002, 2003, 2004, 2005, 2006 Vladimir Prus
# Distributed under the Boost Software License, Version 1.0.
# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt)
# (See accompanying file LICENSE_1_0.txt or copy at
# http://www.boost.org/LICENSE_1_0.txt)
# Support for toolset definition.
@@ -36,7 +37,8 @@ if --ignore-toolset-requirements in [ modules.peek : ARGV ]
rule using ( toolset-module : * )
{
import $(toolset-module) ;
$(toolset-module).init $(2) : $(3) : $(4) : $(5) : $(6) : $(7) : $(8) : $(9) ;
$(toolset-module).init $(2) : $(3) : $(4) : $(5) : $(6) : $(7) : $(8) : $(9)
;
}
@@ -497,8 +499,8 @@ rule inherit-flags ( toolset : base : prohibited-properties * : prohibited-vars
local rule-or-module = $(.rule-or-module.$(f)) ;
if ( [ set.difference
$(.$(rule-or-module).condition.$(f)) :
$(prohibited-properties) ]
|| ! $(.$(rule-or-module).condition.$(f))
$(prohibited-properties) ]
|| ! $(.$(rule-or-module).condition.$(f))
) && ( ! $(.$(rule-or-module).variable.$(f)) in $(prohibited-vars) )
{
local rule_ = [ MATCH "[^.]*\.(.*)" : $(rule-or-module) ] ;

View File

@@ -9,32 +9,22 @@ import BoostBuild
t = BoostBuild.Tester()
t.write("sub/a.cpp", """
int main() {}
""")
t.write("jamroot.jam", """
using some_tool ;
""")
t.write("some_tool.jam", """
t.write("jamroot.jam", "using some_tool ;")
t.write("some_tool.jam", """\
import project ;
project.initialize $(__name__) ;
rule init ( ) { }
""")
t.write("some_tool.py", """
t.write("some_tool.py", """\
from b2.manager import get_manager
get_manager().projects().initialize(__name__)
def init():
pass
""")
t.write("sub/jamfile.jam", """
exe a : a.cpp ;
""")
t.write("sub/a.cpp", "int main() {}\n")
t.write("sub/jamfile.jam", "exe a : a.cpp ;")
t.run_build_system(subdir="sub")
t.expect_addition("sub/bin/$toolset/debug/a.exe")