boost/build
2
0
Fork 0
mirror of https://github.com/boostorg/build.git synced 2026-02-13 12:22:17 +00:00
Code Issues Projects Releases Wiki Activity

Boost Build cleanup - minor stylistic changes.

Browse Source 
[SVN r79875]
This commit is contained in:
Jurko Gospodnetić
2012-08-05 16:30:41 +00:00
parent b15f9a1a62
commit aa86e1cd8b
1 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/build/project.jam
View File

@@ -900,11 +900,12 @@ rule glob-internal ( project : wildcards + : excludes * : rule-name )
#
module project-rules
{
import modules ;
rule using ( toolset-module : * )
{
import toolset ;
import modules ;
import project ;
import toolset ;
# Temporarily change the search path so the module referred to by
# 'using' can be placed in the same directory as Jamfile. User will
@@ -919,25 +920,31 @@ module project-rules
: $(18) : $(19) ;
modules.poke : BOOST_BUILD_PATH : $(x) ;
# The above might have clobbered .current-project (newly created project
# instances automatically get set as the 'current' project). Restore the
# correct value.
# The above might have clobbered .current-project in case it caused a
# new project instance to be created (which would then automatically
# get set as the 'current' project). Restore the correct value so any
# main targets declared after this do not get mapped to the loaded
# module's project.
modules.poke project : .current-project : [ project.target $(caller) ] ;
}
import modules ;
rule import ( * : * : * )
{
modules.import project ;
local caller = [ CALLER_MODULE ] ;
local saved = [ modules.peek project : .current-project ] ;
local saved-project = [ modules.peek project : .current-project ] ;
module $(caller)
{
modules.import $(1) : $(2) : $(3) ;
}
modules.poke project : .current-project : $(saved) ;
# The above might have clobbered .current-project in case it caused a
# new project instance to be created (which would then automatically
# get set as the 'current' project). Restore the correct value so any
# main targets declared after this do not get mapped to the loaded
# module's project.
modules.poke project : .current-project : $(saved-project) ;
}
rule project ( id ? : options * : * )
@@ -949,7 +956,7 @@ module project-rules
local attributes = [ project.attributes $(caller) ] ;
if $(id)
{
$(attributes).set id : $(id) ;
$(attributes).set id : $(id) ;
}
local explicit-build-dir ;