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

Subject: [Boost-commit] svn:boost r80022 - trunk/tools/build/v2/util
From: jurko.gospodnetic_at_[hidden]
Date: 2012-08-14 00:58:22

Author: jurko
Date: 2012-08-14 00:58:21 EDT (Tue, 14 Aug 2012)
New Revision: 80022
URL: http://svn.boost.org/trac/boost/changeset/80022

Log:
Boost Build cleanup - made the util/path.jam module load errors.jam only when needed.
Text files modified: 
   trunk/tools/build/v2/util/path.jam |     8 +++++++-                                
   1 files changed, 7 insertions(+), 1 deletions(-)

Modified: trunk/tools/build/v2/util/path.jam
==============================================================================
--- trunk/tools/build/v2/util/path.jam	(original)
+++ trunk/tools/build/v2/util/path.jam	2012-08-14 00:58:21 EDT (Tue, 14 Aug 2012)
@@ -16,7 +16,6 @@
 # beginning, and it never ends in slash, except for path consisting of slash
 # only.
 
-import errors ;
 import modules ;
 import regex ;
 import sequence ;
@@ -123,6 +122,7 @@
     }
     else
     {
+        import errors ;
         errors.error "Path '$(path)' has no parent" ;
     }
 }
@@ -165,6 +165,7 @@
         {
             if [ is-rooted $(e) ]
             {
+                import errors ;
                 errors.error only the first element may be rooted ;
             }
         }
@@ -337,6 +338,7 @@
     # Have all upper elements been removed ?
     if $(upper_ele)
     {
+        import errors ;
         errors.error "$(upper_limit) is not prefix of $(path)" ;
     }
 
@@ -406,6 +408,7 @@
                 }
                 else
                 {
+                    import errors ;
                     errors.error $(child) is not a subdir of $(parent) ;
                 }
             }
@@ -475,6 +478,7 @@
         {
             if ! [ MAKEDIR $(native) ]
             {
+                import errors ;
                 errors.error "Could not create directory '$(path)'" ;
                 result = ;
             }
@@ -543,6 +547,7 @@
     # VP: I have no idea now 'native' can be empty here! But it can!
     if ! $(native)
     {
+        import errors ;
         errors.error "Empty path passed to 'make-UNIX'" ;
     }
     else
@@ -606,6 +611,7 @@
 {
     if [ MATCH ^(\\[[a-zA-Z0-9]) : $(native) ]
     {
+        import errors ;
         errors.error "Can't handle default-device absolute paths: " $(native) ;
     }