From: ghost_at_[hidden]
Date: 2007-10-25 12:48:24
Author: vladimir_prus
Date: 2007-10-25 12:48:24 EDT (Thu, 25 Oct 2007)
New Revision: 40462
URL: http://svn.boost.org/trac/boost/changeset/40462
Log:
Report underfined paths before trying to replace
spaces in them (and crash on emptry paths).
Text files modified:
trunk/tools/build/v2/tools/boostbook.jam | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
Modified: trunk/tools/build/v2/tools/boostbook.jam
==============================================================================
--- trunk/tools/build/v2/tools/boostbook.jam (original)
+++ trunk/tools/build/v2/tools/boostbook.jam 2007-10-25 12:48:24 EDT (Thu, 25 Oct 2007)
@@ -211,8 +211,11 @@
# BoostBook DTD catalog entry
local boostbook-dtd-dir = [ boostbook.dtd-dir ] ;
- boostbook-dtd-dir = [ regex.replace $(boostbook-dtd-dir) " " "%20" ] ;
-
+ if $(boostbook-dtd-dir)
+ {
+ boostbook-dtd-dir = [ regex.replace $(boostbook-dtd-dir) " " "%20" ] ;
+ }
+
print.text
"<?xml version=\"1.0\"?>"
"<!DOCTYPE catalog "
@@ -222,8 +225,7 @@
" <rewriteURI uriStartString=\"http://www.boost.org/tools/boostbook/dtd/\" rewritePrefix=\"file://$(boostbook-dtd-dir)/\"/>"
: true ;
- local docbook-xsl-dir = [ boostbook.docbook-xsl-dir ] ;
- docbook-xsl-dir = [ regex.replace $(docbook-xsl-dir) " " "%20" ] ;
+ local docbook-xsl-dir = [ boostbook.docbook-xsl-dir ] ;
if ! $(docbook-xsl-dir)
{
ECHO "BoostBook warning: no DocBook XSL directory specified." ;
@@ -236,11 +238,11 @@
}
else
{
+ docbook-xsl-dir = [ regex.replace $(docbook-xsl-dir) " " "%20" ] ;
print.text " <rewriteURI uriStartString=\"http://docbook.sourceforge.net/release/xsl/current/\" rewritePrefix=\"file://$(docbook-xsl-dir)/\"/>" ;
}
- local docbook-dtd-dir = [ boostbook.docbook-dtd-dir ] ;
- docbook-dtd-dir = [ regex.replace $(docbook-dtd-dir) " " "%20" ] ;
+ local docbook-dtd-dir = [ boostbook.docbook-dtd-dir ] ;
if ! $(docbook-dtd-dir)
{
ECHO "BoostBook warning: no DocBook DTD directory specified." ;
@@ -253,6 +255,7 @@
}
else
{
+ docbook-dtd-dir = [ regex.replace $(docbook-dtd-dir) " " "%20" ] ;
print.text " <rewriteURI uriStartString=\"http://www.oasis-open.org/docbook/xml/4.2/\" rewritePrefix=\"file://$(docbook-dtd-dir)/\"/>" ;
}