Subject: [Boost-commit] svn:boost r52306 - trunk/tools/build/v2/tools
From: dave_at_[hidden]
Date: 2009-04-10 16:02:52
Author: dave
Date: 2009-04-10 16:02:51 EDT (Fri, 10 Apr 2009)
New Revision: 52306
URL: http://svn.boost.org/trac/boost/changeset/52306
Log:
Makes it possible to use an installed docutils without referring to a
source distro directory.
Text files modified:
trunk/tools/build/v2/tools/docutils.jam | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
Modified: trunk/tools/build/v2/tools/docutils.jam
==============================================================================
--- trunk/tools/build/v2/tools/docutils.jam (original)
+++ trunk/tools/build/v2/tools/docutils.jam 2009-04-10 16:02:51 EDT (Fri, 10 Apr 2009)
@@ -42,15 +42,19 @@
generators.register-standard docutils.html : ReST : HTML ;
-rule init ( docutils-dir ? )
+rule init ( docutils-dir ? : tools-dir ? )
{
+ ECHO docutils-dir= $(docutils-dir) ;
docutils-dir ?= [ modules.peek : DOCUTILS_DIR ] ;
+ ECHO tools-dir= $(tools-dir) ;
+ tools-dir ?= $(docutils-dir)/tools ;
if ! $(.initialized)
{
.initialized = true ;
.docutils-dir = $(docutils-dir) ;
-
+ .tools-dir = $(tools-dir:R="") ;
+
.setup = [
common.prepend-path-variable-command PYTHONPATH
: $(.docutils-dir) $(.docutils-dir)/extras ] ;
@@ -62,7 +66,7 @@
if ! [ on $(target) return $(RST2XXX) ]
{
local python-cmd = [ property.select <python.interpreter> : $(properties) ] ;
- RST2XXX on $(target) = $(python-cmd:G=:E="python") $(.docutils-dir)/tools/rst2html.py ;
+ RST2XXX on $(target) = $(python-cmd:G=:E="python") $(.tools-dir)/rst2html.py ;
}
}