[Boost-commit] svn:boost r79930 - in trunk/tools/build/v2: . build

Subject: [Boost-commit] svn:boost r79930 - in trunk/tools/build/v2: . build
From: jurko.gospodnetic_at_[hidden]
Date: 2012-08-08 13:21:02

Author: jurko
Date: 2012-08-08 13:21:01 EDT (Wed, 08 Aug 2012)
New Revision: 79930
URL: http://svn.boost.org/trac/boost/changeset/79930

Log:
Boost Build cleanup - minor stylistic changes.
Text files modified: 
   trunk/tools/build/v2/build-system.jam  |     2 +-                                      
   trunk/tools/build/v2/build/project.jam |     4 ++--                                    
   trunk/tools/build/v2/build/targets.jam |    22 ++++++++++++----------                  
   3 files changed, 15 insertions(+), 13 deletions(-)

Modified: trunk/tools/build/v2/build-system.jam
==============================================================================
--- trunk/tools/build/v2/build-system.jam	(original)
+++ trunk/tools/build/v2/build-system.jam	2012-08-08 13:21:01 EDT (Wed, 08 Aug 2012)
@@ -601,7 +601,7 @@
     # that all project files already be loaded.
     # FIXME: This is not entirely true. Additional project files may be loaded
     # only later via the project.find() rule when dereferencing encountered
-    # target ids containing absolute project references. See what to do about
+    # target ids containing explicit project references. See what to do about
     # those as such 'lazy loading' may cause problems that are then extremely
     # difficult to debug.
     local build-request = [ build-request.from-command-line $(.argv)

Modified: trunk/tools/build/v2/build/project.jam
==============================================================================
--- trunk/tools/build/v2/build/project.jam	(original)
+++ trunk/tools/build/v2/build/project.jam	2012-08-08 13:21:01 EDT (Wed, 08 Aug 2012)
@@ -585,7 +585,7 @@
     if [ MATCH (//) : $(id) ]
     {
         import errors ;
-        errors.user-error Project id may not contain multiple successive slash
+        errors.user-error Project id may not contain two consecutive slash
             characters (project id: '$(id)'). ;
     }
 
@@ -602,7 +602,7 @@
         local orig-name = [ $(orig-p).name ] ;
 
         import errors ;
-        errors.user-error Attempt to redeclare already existing project id
+        errors.user-error Attempt to redeclare already registered project id
             '$(id)'.
             : Original project:
             : "   " Name: $(orig-name:E=---)

Modified: trunk/tools/build/v2/build/targets.jam
==============================================================================
--- trunk/tools/build/v2/build/targets.jam	(original)
+++ trunk/tools/build/v2/build/targets.jam	2012-08-08 13:21:01 EDT (Wed, 08 Aug 2012)
@@ -209,8 +209,8 @@
         }
     }
 
-    # This is needed only by the 'make' rule. Need to find the way to make
-    # 'make' work without this method.
+    # This is needed only by the 'make' rule. Need to find a way to make 'make'
+    # work without this method.
     #
     rule project-module ( )
     {
@@ -372,7 +372,8 @@
             }
             else
             {
-                extra-error-message = could not find project '$(project-part)' ;
+                extra-error-message = could not resolve project reference
+                    '$(project-part)' ;
             }
         }
         else
@@ -447,7 +448,7 @@
             import errors : user-error : errors.user-error ;
             errors.user-error Unable to find file or target named
                 : "   " '$(id)'
-                : referred from project at
+                : referred to from project at
                 : "   " '$(current-location)'
                 : $(extra-error-message) ;
         }
@@ -682,7 +683,7 @@
     }
 
     # Select an alternative for this main target, by finding all alternatives
-    # which requirements are satisfied by 'properties' and picking the one with
+    # whose requirements are satisfied by 'properties' and picking the one with
     # the longest requirements set. Returns the result of calling 'generate' on
     # that alternative.
     #
@@ -1493,7 +1494,8 @@
 
     rule construct ( name : source-targets * : property-set )
     {
-        local r = [ generators.construct $(self.project) $(name:S=) : $(self.type)
+        local r = [ generators.construct $(self.project) $(name:S=)
+            : $(self.type)
             : [ property-set.create [ $(property-set).raw ]
                 <main-target-type>$(self.type) ]
             : $(source-targets) : true ] ;
@@ -1502,15 +1504,15 @@
             ECHO "warn: Unable to construct" [ full-name ] ;
 
             # Are there any top-level generators for this type/property set.
-            if ! [ generators.find-viable-generators $(self.type)
-                : $(property-set) ]
+            if ! [ generators.find-viable-generators $(self.type) :
+                $(property-set) ]
             {
                 ECHO "error: no generators were found for type '$(self.type)'" ;
                 ECHO "error: and the requested properties" ;
                 ECHO "error: make sure you've configured the needed tools" ;
                 ECHO "See http://boost.org/boost-build2/doc/html/bbv2/advanced/configuration.html" ;
-                ECHO "To debug this problem, try the --debug-generators option." ;
-                EXIT ;
+                EXIT "To debug this problem, try the --debug-generators option."
+                    ;
             }
         }
         return $(r) ;