2
0
mirror of https://github.com/boostorg/build.git synced 2026-02-15 00:52:16 +00:00

Improve error reporting for docutils.

When docutils is not configured at all, produce an
error message as opposed to trying to invoke Python
without providing a script to run.

Even better would be to search for docutils in common
places, and do so even without explicit 'using', but that's
beyond 30 mins I have right now.
This commit is contained in:
Vladimir Prus
2014-08-25 19:34:09 +04:00
parent 9d4eb781a7
commit fa46e4a700

View File

@@ -13,6 +13,7 @@ import toolset ;
import path ;
import feature : feature ;
import property ;
import errors ;
.initialized = ;
@@ -65,6 +66,19 @@ rule html ( target : source : properties * )
if ! [ on $(target) return $(RST2XXX) ]
{
local python-cmd = [ property.select <python.interpreter> : $(properties) ] ;
if ! $(.tools-dir) {
errors.user-error
"The docutils module is used, but not configured. "
: ""
: "Please modify your user-config.jam or project-config.jam to contain:"
: ""
: " using docutils : <docutils-dir> ;"
: ""
: "On Ubuntu, 'docutils-common' package will create /usr/share/docutils."
: "Other flavours of Linux likely have docutils as package as well."
: "On Windows, you can install from http://docutils.sourceforge.net/."
;
}
RST2XXX on $(target) = $(python-cmd:G=:E="python") $(.tools-dir)/rst2html.py ;
}
}