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

Corrected the Boost Build boostbook.jam toolset module to correctly generate its global XML catalog file without relying on Boost Build's 'current project' reference being left set to some non-standalone project after Boost Build finishes loading all of its project files. This should fix Boost library documentation build failures encountered after revision [79874].

Browse Source 
[SVN r79887]
This commit is contained in:
Jurko Gospodnetić
2012-08-06 14:42:39 +00:00
parent 58c4aa2d03
commit 4e1084a278
1 changed files with 13 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
v2/tools/boostbook.jam
View File

@@ -531,31 +531,21 @@ rule generate-xml-catalog ( target : sources * : properties * )
print.text "</catalog>" ;
}
rule xml-catalog ( )
# Returns information about the global XML catalog virtual target, creating it
# lazily if needed. To get this global catalog generated only once we do not
# create it in every project that requests it but instead only create it in the
# first one and reuse it from there for servicing any later requests.
#
# FIXME: Ideally the catalog target should be created as part of the boostbook
# project, however this is not currently possible as such standalong projects do
# not inherit things like the build directory.
#
rule xml-catalog ( project )
{
if ! $(.xml-catalog)
{
# The target is created as part of the root project. But ideally
# it would be created as part of the boostbook project. This is not
# current possible as such global projects don't inherit things like
# the build directory.
# 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 &&
[ project.attribute $(root-project) parent-module ] != project-config
{
root-project = [ project.attribute $(root-project) parent-module ] ;
}
.xml-catalog = [ new file-target boostbook_catalog
: XML
: [ project.target $(root-project) ]
: [ new action : boostbook.generate-xml-catalog ]
:
] ;
.xml-catalog = [ new file-target boostbook_catalog : XML : $(project) :
[ new action : boostbook.generate-xml-catalog ] ] ;
.xml-catalog-file = [ $(.xml-catalog).path ] [ $(.xml-catalog).name ] ;
.xml-catalog-file = $(.xml-catalog-file:J=/) ;
}
@@ -578,7 +568,7 @@ class boostbook-generator : generator
rule run ( project name ? : property-set : sources * )
{
# Generate the catalog, but only once...
local global-catalog = [ boostbook.xml-catalog ] ;
local global-catalog = [ boostbook.xml-catalog $(project) ] ;
local catalog = $(global-catalog[1]) ;
local catalog-file = $(global-catalog[2]) ;
local targets ;