[Boost-commit] svn:boost r42480 - in trunk/tools/build/v2: build kernel notes

From: jurko.gospodnetic_at_[hidden]
Date: 2008-01-05 11:55:37

Author: jurko
Date: 2008-01-05 11:55:36 EST (Sat, 05 Jan 2008)
New Revision: 42480
URL: http://svn.boost.org/trac/boost/changeset/42480

Log:
Typo corrections. Minor stylistic changes.
Text files modified: 
   trunk/tools/build/v2/build/project.jam          |    19 +++++---------                          
   trunk/tools/build/v2/kernel/bootstrap.jam       |     3 -                                       
   trunk/tools/build/v2/notes/build_dir_option.txt |    49 ++++++++++++++++++--------------------- 
   3 files changed, 31 insertions(+), 40 deletions(-)

Modified: trunk/tools/build/v2/build/project.jam
==============================================================================
--- trunk/tools/build/v2/build/project.jam	(original)
+++ trunk/tools/build/v2/build/project.jam	2008-01-05 11:55:36 EST (Sat, 05 Jan 2008)
@@ -289,8 +289,7 @@
     {
         jamfile-to-load = [ find-jamfile $(dir) ] ;
     }
-    
-    
+
     # The module of the jamfile.
     #
     local jamfile-module = [ module-name  [ path.parent $(jamfile-to-load) ] ] ;
@@ -324,7 +323,7 @@
     {
         errors.error "The value of the .current-project variable"
           : "has magically changed after loading a Jamfile."
-          : "This means some of the targets might be defined a the wrong project."
+          : "This means some of the targets might be defined in the wrong project."
           : "after loading " $(jamfile-module) 
           : "expected value " $(saved-project)  
           : "actual value " $(.current-project)
@@ -334,9 +333,9 @@
     if $(.global-build-dir)
     {        
         local id = [ attribute $(jamfile-module) id ] ;
-        local project-root  = [ attribute $(jamfile-module) project-root ] ;
+        local project-root = [ attribute $(jamfile-module) project-root ] ;
         local location = [ attribute $(jamfile-module) location ] ;
-    
+
         if $(location) && $(project-root) = $(dir)
         {
             # This is Jamroot
@@ -349,10 +348,6 @@
             }            
         }        
     }        
-    
-
-    
-    
 }
 
 rule mark-as-user ( module-name )
@@ -883,10 +878,10 @@
         if $(global-build-dir)
         {                
             local location = [ $(attributes).get location ] ;
-            # Project with empty location is 'standalone' project, like
-            # user-config, or qt.  It has no build dir.
+            # Project with an empty location is a 'standalone' project such as
+            # user-config or qt.  It has no build dir.
             # If we try to set build dir for user-config, we'll then
-            # try to inherit it, with either weird, or wrong consequences.
+            # try to inherit it, with either weird or wrong consequences.
             if $(location) && $(location) = [ $(attributes).get project-root ]
             {
                 # This is Jamroot.

Modified: trunk/tools/build/v2/kernel/bootstrap.jam
==============================================================================
--- trunk/tools/build/v2/kernel/bootstrap.jam	(original)
+++ trunk/tools/build/v2/kernel/bootstrap.jam	2008-01-05 11:55:36 EST (Sat, 05 Jan 2008)
@@ -118,7 +118,7 @@
 import option ;
 local dont-build = [ option.process ] ;
 
-# Should we skip building, i.e. loding the build system, according
+# Should we skip building, i.e. loading the build system, according
 # to the options processed?
 #
 if ! $(dont-build)
@@ -131,4 +131,3 @@
     # Use last element in case of multiple command-line options
     import $(build-system[-1]) ;
 }
-

Modified: trunk/tools/build/v2/notes/build_dir_option.txt
==============================================================================
--- trunk/tools/build/v2/notes/build_dir_option.txt	(original)
+++ trunk/tools/build/v2/notes/build_dir_option.txt	2008-01-05 11:55:36 EST (Sat, 05 Jan 2008)
@@ -1,6 +1,6 @@
-Copyright 2005 Vladimir Prus 
-Distributed under the Boost Software License, Version 1.0. 
-(See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) 
+Copyright 2005 Vladimir Prus
+Distributed under the Boost Software License, Version 1.0.
+(See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt)
 
 
 Summary
@@ -41,15 +41,15 @@
 
    project foo : build-dir /tmp/build/foo/bin.v2 ;
 
-We can't drop "bin.v2" because it's quite possible that the name of build
-dir have specific meaning. For example, it can be used to 
-separate Boost.Build V2 and V1 build results.
+We can't drop "bin.v2" because it's quite possible that the name of build dir
+have specific meaning. For example, it can be used to separate Boost.Build V1
+and V2 build results.
 
-The --build-dir option has no effect if Jamroot does not define any project
-id. Dowing otherwise can lead to nasty problems if we're building two distinct
+The --build-dir option has no effect if Jamroot does not define any project id.
+Doing otherwise can lead to nasty problems if we're building two distinct
 projects (that is with two different Jamroot). They'll get the same build
-directory. Most likely, user will see
-the "duplicate target" error, which is generally confusing.
+directory. Most likely, user will see the "duplicate target" error, which is
+generally confusing.
 
 It is expected that any non-trivial project will have top-level "project"
 invocation with non empty id, so the above limitation is not so drastic.
@@ -57,24 +57,21 @@
 is specified.
 
 Here's the exact behavior of the --build-dir option. If we're loading a
-Jamfile (either  root or non-root), that declare some project id and some
+Jamfile (either root or non-root), that declare some project id and some
 build-dir attribute, the following table gives the value of build-dir
 that will actually be used.
 
-
-Root?    Id     Build-dir attribute            Resulting build dir
-yes      none    *                             --build-dir is ignored, with warning 
-yes      'foo'   none                          /tmp/build/foo
-yes      'foo'   'bin.v2'                      /tmp/build/foo/bin.v2
-yes      'foo'   '/tmp/bar'                    Error [1]
-no       *      none                           --build-dir has no effect,                                                  inherited build dir is used
-no       *      non-empty                      Error [2]
-
+-------------------------------------------------------------------------------
+Root?    Id      Build-dir attribute   Resulting build dir
+-------------------------------------------------------------------------------
+yes      none    *                     --build-dir is ignored, with warning
+yes      'foo'   none                  /tmp/build/foo
+yes      'foo'   'bin.v2'              /tmp/build/foo/bin.v2
+yes      'foo'   '/tmp/bar'            Error [1]
+no       *       none                  --build-dir has no effect, inherited
+                                       build dir is used
+no       *       non-empty             Error [2]
+-------------------------------------------------------------------------------
 [1] -- not clear what to do
-[2] -- can be made to work, but non-empty build-dir 
+[2] -- can be made to work, but non-empty build-dir
 attribute in non-root Jamfile does not make much sense even without --build-dir
-
-
-
-
-