mirror of
https://github.com/boostorg/boost.git
synced 2026-01-18 21:41:27 +01:00
Merge Boost.Build from trunk.
[SVN r72443]
This commit is contained in:
@@ -6,20 +6,21 @@ 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
|
||||
if exist ".\tools\build\v2\engine\src\bin.ntx86\bjam.exe" del tools\build\v2\engine\src\bin.ntx86\bjam.exe
|
||||
if exist ".\tools\build\v2\engine\src\bin.ntx86_64\bjam.exe" del tools\build\v2\engine\src\bin.ntx86_64\bjam.exe
|
||||
cd tools\build\v2\engine\src
|
||||
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\bjam.exe" del tools\build\v2\engine\bin.ntx86_64\bjam.exe
|
||||
pushd tools\build\v2\engine
|
||||
|
||||
call .\build.bat > ..\..\..\bjam.log
|
||||
call .\build.bat %* > ..\..\..\..\bootstrap.log
|
||||
@ECHO OFF
|
||||
cd ..\..\..\..\..
|
||||
|
||||
if exist ".\tools\build\v2\engine\src\bin.ntx86\bjam.exe" (
|
||||
copy .\tools\build\v2\engine\src\bin.ntx86\bjam.exe . > nul
|
||||
popd
|
||||
|
||||
if exist ".\tools\build\v2\engine\bin.ntx86\bjam.exe" (
|
||||
copy .\tools\build\v2\engine\bin.ntx86\bjam.exe . > nul
|
||||
goto :bjam_built)
|
||||
|
||||
if exist ".\tools\build\v2\engine\src\bin.ntx86_64\bjam.exe" (
|
||||
copy .\tools\build\v2\engine\src\bin.ntx86_64\bjam.exe . > nul
|
||||
if exist ".\tools\build\v2\engine\bin.ntx86_64\bjam.exe" (
|
||||
copy .\tools\build\v2\engine\bin.ntx86_64\bjam.exe . > nul
|
||||
goto :bjam_built)
|
||||
|
||||
goto :bjam_failure
|
||||
@@ -32,7 +33,12 @@ REM export BOOST_JAM_TOOLSET, and I don't know how to do that
|
||||
REM properly. Default to msvc for now.
|
||||
set toolset=msvc
|
||||
|
||||
ECHO using %toolset% ; > project-config.jam
|
||||
ECHO import option ; > project-config.jam
|
||||
ECHO. >> project-config.jam
|
||||
ECHO using %toolset% ; >> project-config.jam
|
||||
ECHO. >> project-config.jam
|
||||
ECHO option.set keep-going : false ; >> project-config.jam
|
||||
ECHO. >> project-config.jam
|
||||
|
||||
ECHO.
|
||||
ECHO Bootstrapping is done. To build, run:
|
||||
@@ -57,14 +63,14 @@ goto :end
|
||||
|
||||
ECHO.
|
||||
ECHO Failed to build Boost.Jam build engine.
|
||||
ECHO Please consult bjam.log for furter diagnostics.
|
||||
ECHO Please consult bootstrap.log for furter diagnostics.
|
||||
ECHO.
|
||||
ECHO You can try to obtain a prebuilt binary from
|
||||
ECHO.
|
||||
ECHO http://sf.net/project/showfiles.php?group_id=7586^&package_id=72941
|
||||
ECHO.
|
||||
ECHO Also, you can file an issue at http://svn.boost.org
|
||||
ECHO Please attach bjam.log in that case.
|
||||
ECHO Please attach bootstrap.log in that case.
|
||||
|
||||
goto :end
|
||||
|
||||
|
||||
Reference in New Issue
Block a user