mirror of
https://github.com/boostorg/build.git
synced 2026-02-15 13:02:11 +00:00
Updated Boost Build's doxygen.jam toolset module to not rely on Boost Build leaving behind a dangling 'current project' reference after it finishes loading all of its project modules. This should fix Boost library documentation build failures encountered after revision [79874].
[SVN r79915]
This commit is contained in:
@@ -547,36 +547,37 @@ else
|
||||
}
|
||||
}
|
||||
|
||||
rule check-tools ( )
|
||||
rule check-tools ( project )
|
||||
{
|
||||
if ! $(.check-tools-targets)
|
||||
{
|
||||
# Find the root project.
|
||||
local root-project = [ project.current ] ;
|
||||
root-project = [ $(root-project).project-module ] ;
|
||||
while
|
||||
[ project.attribute $(root-project) parent-module ] &&
|
||||
[ project.attribute $(root-project) parent-module ] != user-config
|
||||
local project-module = [ $(project).project-module ] ;
|
||||
local parent-module = [ project.attribute $(project-module)
|
||||
parent-module ] ;
|
||||
while $(parent-module) && $(parent-module) != user-config
|
||||
{
|
||||
root-project =
|
||||
[ project.attribute $(root-project) parent-module ] ;
|
||||
project-module = $(parent-module) ;
|
||||
parent-module = [ project.attribute $(project-module) parent-module
|
||||
] ;
|
||||
}
|
||||
project = [ project.target $(project-module) ] ;
|
||||
|
||||
.latex.check = [ new file-target latex.check
|
||||
:
|
||||
: [ project.target $(root-project) ]
|
||||
: $(project)
|
||||
: [ new action : doxygen.check-latex ]
|
||||
:
|
||||
] ;
|
||||
.dvips.check = [ new file-target dvips.check
|
||||
:
|
||||
: [ project.target $(root-project) ]
|
||||
: $(project)
|
||||
: [ new action : doxygen.check-dvips ]
|
||||
:
|
||||
] ;
|
||||
.gs.check = [ new file-target gs.check
|
||||
:
|
||||
: [ project.target $(root-project) ]
|
||||
: $(project)
|
||||
: [ new action : doxygen.check-gs ]
|
||||
:
|
||||
] ;
|
||||
@@ -593,7 +594,7 @@ class doxygen-check-tools-target-class : basic-target
|
||||
import doxygen ;
|
||||
rule construct ( name : sources * : property-set )
|
||||
{
|
||||
return [ property-set.empty ] [ doxygen.check-tools ] ;
|
||||
return [ property-set.empty ] [ doxygen.check-tools [ project ] ] ;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user