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

Subject: [Boost-commit] svn:boost r78526 - trunk/tools/build/v2/build
From: jurko.gospodnetic_at_[hidden]
Date: 2012-05-21 03:57:18

Author: jurko
Date: 2012-05-21 03:57:17 EDT (Mon, 21 May 2012)
New Revision: 78526
URL: http://svn.boost.org/trac/boost/changeset/78526

Log:
Corrected a syntax error in Boost Build error reporting code in 'project.jam' (fix for an invalid fix in revision 75734).
Text files modified: 
   trunk/tools/build/v2/build/project.jam |    36 ++++++++++++++++++------------------    
   1 files changed, 18 insertions(+), 18 deletions(-)

Modified: trunk/tools/build/v2/build/project.jam
==============================================================================
--- trunk/tools/build/v2/build/project.jam	(original)
+++ trunk/tools/build/v2/build/project.jam	2012-05-21 03:57:17 EDT (Mon, 21 May 2012)
@@ -263,7 +263,7 @@
     {
         errors.error Unable to load Jamfile.
             : Could not find a Jamfile in directory '$(dir)'.
-            : Attempted to find it with pattern '"$(JAMFILE:J= )"'.
+            : Attempted to find it with pattern '$(JAMFILE:J=" ")'.
             : Please consult the documentation at 'http://www.boost.org'. ;
     }
 
@@ -287,14 +287,14 @@
     {
         jamfile-to-load = [ find-jamfile $(dir) ] ;
     }
-    
+
     if $(jamfile-to-load[2])
     {
-        errors.error "Multiple Jamfiles found at '$(dir)'" 
+        errors.error "Multiple Jamfiles found at '$(dir)'"
           :  "Filenames are: " $(jamfile-to-load:D=) ;
     }
-    
-    # Now load the Jamfile in it's own context. 
+
+    # Now load the Jamfile in it's own context.
     # The call to 'initialize' may load parent Jamfile, which might have
     # 'use-project' statement that causes a second attempt to load the
     # same project we're loading now.  Checking inside .jamfile-modules
@@ -420,7 +420,7 @@
     else if $(module-name) = project-config
     {
         parent-module = user-config ;
-    }    
+    }
     else
     {
         # We search for parent/project-root only if Jamfile was specified, i.e.
@@ -437,13 +437,13 @@
             {
                 # If project-config module exist, inherit from it.
                 if $(project-config.attributes)
-                {   
+                {
                     parent-module = project-config ;
                 }
                 else
-                {                    
+                {
                     parent-module = user-config ;
-                }                
+                }
                 jamroot = true ;
             }
         }
@@ -480,7 +480,7 @@
             if ! $(s)
             {
                 errors.error "Could not determine project location $(module-name)" ;
-            }        
+            }
             $(attributes).set source-location : $(s:D) : exact ;
         }
 
@@ -784,7 +784,7 @@
             $(project-module) )
         {
             errors.user-error Attempt to redeclare already existing project id
-                '$(id)' 
+                '$(id)'
                 location '$(location)' ;
         }
         $(id).jamfile-module = $(project-module) ;
@@ -856,13 +856,13 @@
             # Otherwise, use full path just to avoid any ambiguities.
             local rel = [ path.relative $(p) $(location) : no-error ] ;
             if $(rel) = not-a-child
-            {                   
+            {
                 result += [ path.root $(p) [ path.pwd ] ] ;
             }
             else
             {
                 result += $(rel) ;
-            }                
+            }
         }
     }
     else
@@ -1064,9 +1064,9 @@
         for local n in $(target-names)
         {
             $(t).mark-target-as-always $(n) ;
-        }        
+        }
     }
-    
+
     rule glob ( wildcards + : excludes * )
     {
         import project ;
@@ -1106,7 +1106,7 @@
             return $(condition):$(requirements) ;
         }
     }
-    
+
     rule option ( name : value )
     {
         local m = [ CALLER_MODULE ] ;
@@ -1114,8 +1114,8 @@
         {
             import errors ;
             errors.error "The 'option' rule may be used only in site-config or user-config" ;
-        }        
+        }
         import option ;
         option.set $(name) : $(value) ;
-    }    
+    }
 }