[Boost-commit] svn:boost r83578 - in trunk: . tools/build/v2 tools/build/v2/kernel tools/build/v2/util

Subject: [Boost-commit] svn:boost r83578 - in trunk: . tools/build/v2 tools/build/v2/kernel tools/build/v2/util
From: jhunold_at_[hidden]
Date: 2013-03-26 06:19:08

Author: jhunold
Date: 2013-03-26 06:19:07 EDT (Tue, 26 Mar 2013)
New Revision: 83578
URL: http://svn.boost.org/trac/boost/changeset/83578

Log:
change bjam to b2 for user visible output
Text files modified: 
   trunk/Jamroot                             |     2 +-                                      
   trunk/tools/build/v2/bootstrap.sh         |    16 ++++++++--------                        
   trunk/tools/build/v2/kernel/bootstrap.jam |     4 ++--                                    
   trunk/tools/build/v2/util/doc.jam         |    10 +++++-----                              
   4 files changed, 16 insertions(+), 16 deletions(-)

Modified: trunk/Jamroot
==============================================================================
--- trunk/Jamroot	(original)
+++ trunk/Jamroot	2013-03-26 06:19:07 EDT (Tue, 26 Mar 2013)
@@ -9,7 +9,7 @@
 
 # Usage:
 #
-#   bjam [options] [properties] [install|stage]
+#   b2 [options] [properties] [install|stage]
 #
 #   Builds and installs Boost.
 #

Modified: trunk/tools/build/v2/bootstrap.sh
==============================================================================
--- trunk/tools/build/v2/bootstrap.sh	(original)
+++ trunk/tools/build/v2/bootstrap.sh	2013-03-26 06:19:07 EDT (Tue, 26 Mar 2013)
@@ -8,9 +8,9 @@
 
 # boostinspect:notab - Tabs are required for the Makefile.
 
-BJAM=""
+B2=""
 TOOLSET=""
-BJAM_CONFIG=""
+B2_CONFIG=""
 
 for option
 do
@@ -42,7 +42,7 @@
 
 Configuration:
   -h, --help                display this help and exit
-  --with-bjam=BJAM          use existing Boost.Jam executable (bjam)
+  --with-b2=B2              use existing Boost.Build executable (b2)
                             [automatically built]
   --with-toolset=TOOLSET    use specific Boost.Build toolset
                             [automatically detected]
@@ -92,8 +92,8 @@
 
 rm -f config.log
 
-# Build bjam
-if test "x$BJAM" = x; then
+# Build b2
+if test "x$B2" = x; then
   echo -n "Bootstrapping the build engine with toolset $TOOLSET... "
   pwd=`pwd`
   (cd "$my_dir/engine" && ./build.sh "$TOOLSET") > bootstrap.log 2>&1
@@ -105,9 +105,9 @@
   fi
   cd "$pwd"
   arch=`cd $my_dir/engine && ./bootstrap/jam0 -d0 -f build.jam --toolset=$TOOLSET --toolset-root= --show-locate-target && cd ..`
-  BJAM="$my_dir/engine/$arch/b2"
-  echo "engine/$arch/bjam"
-  cp "$BJAM" .
+  B2="$my_dir/engine/$arch/b2"
+  echo "engine/$arch/b2"
+  cp "$B2" .
   cp "$my_dir/engine/$arch/bjam" .
 fi
 

Modified: trunk/tools/build/v2/kernel/bootstrap.jam
==============================================================================
--- trunk/tools/build/v2/kernel/bootstrap.jam	(original)
+++ trunk/tools/build/v2/kernel/bootstrap.jam	2013-03-26 06:19:07 EDT (Tue, 26 Mar 2013)
@@ -63,7 +63,7 @@
     if ! $(TMPNAME)
     {
         ECHO "error: no @() functionality found" ;
-        ECHO "error: your version of bjam is likely out of date" ;
+        ECHO "error: your version of b2 is likely out of date" ;
         ECHO "error: please get a fresh version from SVN." ;
         EXIT ;
     }
@@ -76,7 +76,7 @@
     {
         ECHO "warning: escape sequences are not supported" ;
         ECHO "warning: this will cause major misbehaviour on cygwin" ;
-        ECHO "warning: your version of bjam is likely out of date" ;
+        ECHO "warning: your version of b2 is likely out of date" ;
         ECHO "warning: please get a fresh version from SVN." ;
     }
 }

Modified: trunk/tools/build/v2/util/doc.jam
==============================================================================
--- trunk/tools/build/v2/util/doc.jam	(original)
+++ trunk/tools/build/v2/util/doc.jam	2013-03-26 06:19:07 EDT (Tue, 26 Mar 2013)
@@ -246,7 +246,7 @@
 {
     print.section "General command line usage" ;
 
-    print.text "    bjam [options] [properties] [targets]
+    print.text "    b2 [options] [properties] [targets]
 
   Options, properties and targets can be specified in any order.
       " ;
@@ -281,8 +281,8 @@
 #
 local rule print-help-usage ( )
 {
-    print.section "Boost.Jam Usage"
-        "bjam [ options... ] targets..."
+    print.section "Boost.Build Usage"
+        "b2 [ options... ] targets..."
         ;
     print.list-start ;
     print.list-item -a;
@@ -306,9 +306,9 @@
     print.list-item -tx;
         Rebuild the target '"x"', even if it is up-to-date. ;
     print.list-item -v;
-        Display the version of bjam. ;
+        Display the version of b2. ;
     print.list-item --x;
-        Any option not explicitly handled by Boost.Jam remains available to
+        Any option not explicitly handled by Boost.Build remains available to
         build scripts using the '"ARGV"' variable. ;
     print.list-item --abbreviate-paths;
         Use abbreviated paths for targets. ;