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

Subject: [Boost-commit] svn:boost r70624 - trunk/tools/build/v2
From: ghost_at_[hidden]
Date: 2011-03-27 07:28:56

Author: vladimir_prus
Date: 2011-03-27 07:28:55 EDT (Sun, 27 Mar 2011)
New Revision: 70624
URL: http://svn.boost.org/trac/boost/changeset/70624

Log:
Install both "b2" and "bjam".

Text files modified: 
   trunk/tools/build/v2/Jamroot.jam   |     2 +-                                      
   trunk/tools/build/v2/bootstrap.bat |     8 +++++---                                
   trunk/tools/build/v2/bootstrap.sh  |     5 +++--                                   
   3 files changed, 9 insertions(+), 6 deletions(-)

Modified: trunk/tools/build/v2/Jamroot.jam
==============================================================================
--- trunk/tools/build/v2/Jamroot.jam	(original)
+++ trunk/tools/build/v2/Jamroot.jam	2011-03-27 07:28:55 EDT (Sun, 27 Mar 2011)
@@ -15,7 +15,7 @@
 package.install boost-build-engine boost-build
   : # properties
   : # binaries
-    bjam$(ext)
+    b2$(ext) bjam$(ext)
   ;
 
 local e1 = [ path.glob-tree $(SELF)/example : * : . .svn ] ;

Modified: trunk/tools/build/v2/bootstrap.bat
==============================================================================
--- trunk/tools/build/v2/bootstrap.bat	(original)
+++ trunk/tools/build/v2/bootstrap.bat	2011-03-27 07:28:55 EDT (Sun, 27 Mar 2011)
@@ -14,11 +14,13 @@
 @ECHO OFF
 cd ..
 
-if exist ".\engine\bin.ntx86\bjam.exe" (
+if exist ".\engine\bin.ntx86\b2.exe" (
+   copy .\engine\bin.ntx86\b2.exe . > nul
    copy .\engine\bin.ntx86\bjam.exe . > nul
    goto :bjam_built)
 
-if exist ".\engine\bin.ntx86_64\bjam.exe" (
+if exist ".\engine\bin.ntx86_64\b2.exe" (
+   copy .\engine\bin.ntx86_64\b2.exe . > nul
    copy .\engine\bin.ntx86_64\bjam.exe . > nul
    goto :bjam_built)
 
@@ -29,7 +31,7 @@
 ECHO.
 ECHO Bootstrapping is done. To build, run:
 ECHO.
-ECHO     .\bjam --prefix=DIR install
+ECHO     .\b2 --prefix=DIR install
 ECHO.
 
 goto :end

Modified: trunk/tools/build/v2/bootstrap.sh
==============================================================================
--- trunk/tools/build/v2/bootstrap.sh	(original)
+++ trunk/tools/build/v2/bootstrap.sh	2011-03-27 07:28:55 EDT (Sun, 27 Mar 2011)
@@ -105,15 +105,16 @@
   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/bjam"
+  BJAM="$my_dir/engine/$arch/b2"
   echo "engine/$arch/bjam"
   cp "$BJAM" .
+  cp "$my_dir/engine/$arch/bjam" .
 fi
 
 cat << EOF
 
 Bootstrapping is done. To build and install, run:
 
-    ./bjam install --prefix=<DIR>
+    ./b2 install --prefix=<DIR>
 
 EOF