[Boost-commit] svn:boost r84552 - trunk/tools/build/v2/tools

Subject: [Boost-commit] svn:boost r84552 - trunk/tools/build/v2/tools
From: dnljms_at_[hidden]
Date: 2013-05-30 04:28:42

Author: danieljames
Date: 2013-05-30 04:28:42 EDT (Thu, 30 May 2013)
New Revision: 84552
URL: http://svn.boost.org/trac/boost/changeset/84552

Log:
Import `errors` in `make-error`.

In [83204] some commands to `import errors` were removed before calls to
`make-error`, which causes it to fail, as it uses `errors`. Rather than
restoring `import errors` I removed it from the other calls, and added it to
the function itself, which is hopefully less error prone.
Text files modified: 
   trunk/tools/build/v2/tools/boostbook.jam |     4 +---                                    
   1 files changed, 1 insertions(+), 3 deletions(-)

Modified: trunk/tools/build/v2/tools/boostbook.jam
==============================================================================
--- trunk/tools/build/v2/tools/boostbook.jam	(original)
+++ trunk/tools/build/v2/tools/boostbook.jam	2013-05-30 04:28:42 EDT (Thu, 30 May 2013)
@@ -178,6 +178,7 @@
 
 rule make-error ( message * )
 {
+    import errors ;
     return [ errors.nearest-user-location ] $(message) ;
 }
 
@@ -204,7 +205,6 @@
     {
         if ! [ path.glob $(.docbook-xsl-dir) : common/common.xsl ]
         {
-            import errors ;
             .error-message = [ make-error BoostBook: could not find docbook XSL stylesheets
                 in: [ path.native $(.docbook-xsl-dir) ] ] ;
         }
@@ -223,7 +223,6 @@
     {
         if ! [ path.glob $(.docbook-dtd-dir) : docbookx.dtd ]
         {
-            import errors ;
             .error-message = [ make-error BoostBook: could not find docbook DTD in: [
                 path.native $(.docbook-dtd-dir) ] ] ;
         }
@@ -278,7 +277,6 @@
 {
     if $(boostbook-dir) && ! [ path.glob $(boostbook-dir) : xsl ]
     {
-        import errors ;
         .error-message = [ make-error BoostBook: could not find boostbook in: [ path.native
             $(boostbook-dir) ] ] ;
     }