|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r55200 - trunk/tools/build/v2/tools
From: ghost_at_[hidden]
Date: 2009-07-30 14:43:10
Author: vladimir_prus
Date: 2009-07-27 03:24:41 EDT (Mon, 27 Jul 2009)
New Revision: 55200
URL: http://svn.boost.org/trac/boost/changeset/55200
Log:
Prevent doxygen's html (not docbook) generation from using './html'.
Now, 'html' directory is created in the build dir of the Jamfile
where 'doxygen' target appears.
Text files modified:
trunk/tools/build/v2/tools/doxygen.jam | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 deletions(-)
Modified: trunk/tools/build/v2/tools/doxygen.jam
==============================================================================
--- trunk/tools/build/v2/tools/doxygen.jam (original)
+++ trunk/tools/build/v2/tools/doxygen.jam 2009-07-27 03:24:41 EDT (Mon, 27 Jul 2009)
@@ -354,9 +354,20 @@
{
# Build an HTML directory from the sources.
local html-location = [ feature.get-values <location> : $(requirements) ] ;
- local output-dir = [ path.root
- [ path.join [ $(project).get build-dir ] $(html-location:E=html) ]
- [ path.pwd ] ] ;
+ local output-dir ;
+ if [ $(project).get build-dir ]
+ {
+ # Explicitly specified build dir. Add html at the end.
+ output-dir = [ path.join [ $(project).build-dir ] $(html-location:E=html) ] ;
+ }
+ else
+ {
+ # Trim 'bin' from implicit build dir, for no other reason that backward
+ # compatibility.
+ output-dir = [ path.join [ path.parent [ $(project).build-dir ] ]
+ $(html-location:E=html) ] ;
+ }
+ output-dir = [ path.root $(output-dir) [ path.pwd ] ] ;
local output-dir-native = [ path.native $(output-dir) ] ;
requirements = [ property.change $(requirements) : <location> ] ;
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk