From e47f34f24fc66f5295fcc747a5bf86ddfa96dcb5 Mon Sep 17 00:00:00 2001 From: Vladimir Prus Date: Sun, 3 Jul 2011 08:08:57 +0000 Subject: Merge Boost.Build branding changes: https://svn.boost.org/trac/boost/changeset/72773 https://svn.boost.org/trac/boost/changeset/72793 Authorized by Beman. [SVN r72866] --- bootstrap.bat | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'bootstrap.bat') diff --git a/bootstrap.bat b/bootstrap.bat index 121ff6d4e2..a327ac0e88 100644 --- a/bootstrap.bat +++ b/bootstrap.bat @@ -5,8 +5,10 @@ REM REM Distributed under the Boost Software License, Version 1.0. REM (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) -ECHO Building Boost.Jam build engine +ECHO Building Boost.Build engine +if exist ".\tools\build\v2\engine\bin.ntx86\b2.exe" del tools\build\v2\engine\bin.ntx86\b2.exe if exist ".\tools\build\v2\engine\bin.ntx86\bjam.exe" del tools\build\v2\engine\bin.ntx86\bjam.exe +if exist ".\tools\build\v2\engine\bin.ntx86_64\b2.exe" del tools\build\v2\engine\bin.ntx86_64\b2.exe if exist ".\tools\build\v2\engine\bin.ntx86_64\bjam.exe" del tools\build\v2\engine\bin.ntx86_64\bjam.exe pushd tools\build\v2\engine @@ -16,10 +18,12 @@ call .\build.bat %* > ..\..\..\..\bootstrap.log popd if exist ".\tools\build\v2\engine\bin.ntx86\bjam.exe" ( + copy .\tools\build\v2\engine\bin.ntx86\b2.exe . > nul copy .\tools\build\v2\engine\bin.ntx86\bjam.exe . > nul goto :bjam_built) if exist ".\tools\build\v2\engine\bin.ntx86_64\bjam.exe" ( + copy .\tools\build\v2\engine\bin.ntx86_64\b2.exe . > nul copy .\tools\build\v2\engine\bin.ntx86_64\bjam.exe . > nul goto :bjam_built) @@ -43,13 +47,13 @@ ECHO. >> project-config.jam ECHO. ECHO Bootstrapping is done. To build, run: ECHO. -ECHO .\bjam +ECHO .\b2 ECHO. ECHO To adjust configuration, edit 'project-config.jam'. ECHO Further information: ECHO. ECHO - Command line help: -ECHO .\bjam --help +ECHO .\b2 --help ECHO. ECHO - Getting started guide: ECHO http://boost.org/more/getting_started/windows.html @@ -62,7 +66,7 @@ goto :end :bjam_failure ECHO. -ECHO Failed to build Boost.Jam build engine. +ECHO Failed to build Boost.Build engine. ECHO Please consult bootstrap.log for furter diagnostics. ECHO. ECHO You can try to obtain a prebuilt binary from -- cgit v1.2.1