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 r79971]
This commit is contained in:
Jurko Gospodnetić
2012-08-11 21:43:23 +00:00
parent 6638d89c81
commit 426a0a5d93
3 changed files with 27 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/build/project.jam
View File

@@ -471,7 +471,7 @@ rule initialize (
}
else
{
local cfgs = test site user project ;
local cfgs = project site test user ;
if ! $(module-name) in $(cfgs)-config
{
# This is a standalone project with known location. Set its
@@ -542,17 +542,17 @@ rule inherit-attributes ( project-module : parent-module )
# Parent module might be locationless configuration module.
if [ modules.binding $(parent-module) ]
{
$(attributes).set parent : [ path.parent
[ path.make [ modules.binding $(parent-module) ] ] ] ;
$(attributes).set parent :
[ path.parent [ path.make [ modules.binding $(parent-module) ] ] ] ;
}
local v = [ $(pattributes).get project-root ] ;
$(attributes).set project-root : $(v) : exact ;
$(attributes).set default-build
: [ $(pattributes).get default-build ] ;
$(attributes).set requirements
: [ $(pattributes).get requirements ] : exact ;
$(attributes).set usage-requirements
: [ $(pattributes).get usage-requirements ] : exact ;
$(attributes).set project-root :
[ $(pattributes).get project-root ] : exact ;
$(attributes).set default-build :
[ $(pattributes).get default-build ] ;
$(attributes).set requirements :
[ $(pattributes).get requirements ] : exact ;
$(attributes).set usage-requirements :
[ $(pattributes).get usage-requirements ] : exact ;
local parent-build-dir = [ $(pattributes).get build-dir ] ;
if $(parent-build-dir)

22
src/tools/doxygen.jam
View File

@@ -533,6 +533,12 @@ rule check-tools ( project )
if ! $(.check-tools-targets)
{
# Find the root project.
# FIXME: This is a feeble attempt to avoid using different locations for
# storing our *.check files depending on which project imported the
# doxygen toolset first. It does not work though as the passed project
# is always 'doxygen' which is a standalone project and so does not have
# a parent. We should modify this code to do the same as the
# boostbook.jam module does for its built xml-catalog target.
local project-module = [ $(project).project-module ] ;
local parent-module = [ project.attribute $(project-module)
parent-module ] ;
@@ -542,15 +548,15 @@ rule check-tools ( project )
parent-module = [ project.attribute $(project-module) parent-module
] ;
}
project = [ project.target $(project-module) ] ;
local root-project = [ project.target $(project-module) ] ;
local latex.check = [ new file-target latex.check : : $(project) : [ new
action : doxygen.check-latex ] ] ;
local dvips.check = [ new file-target dvips.check : : $(project) : [ new
action : doxygen.check-dvips ] ] ;
local gs.check = [ new file-target gs.check : : $(project) : [ new
action : doxygen.check-gs ] ] ;
.check-tools-targets = $(latex.check) $(dvips.check) $(gs.check) ;
.check-tools-targets =
[ new file-target latex.check : : $(root-project) : [ new action :
doxygen.check-latex ] ]
[ new file-target dvips.check : : $(root-project) : [ new action :
doxygen.check-dvips ] ]
[ new file-target gs.check : : $(root-project) : [ new action :
doxygen.check-gs ] ] ;
}
return $(.check-tools-targets) ;
}

4
src/tools/xsltproc.jam
View File

@@ -87,8 +87,8 @@ rule .is-cygwin ( xsltproc )
if [ os.on-windows ]
{
local file = [ path.make [ modules.binding $(__name__) ] ] ;
local dir = [ path.native
[ path.join [ path.parent $(file) ] xsltproc ] ] ;
local dir = [ path.native [ path.join [ path.parent $(file) ] xsltproc ]
] ;
if [ os.name ] = CYGWIN
{
dir = $(dir:W) ;