Merge r64010, wherein jam has been moved.

[SVN r65233]
This commit is contained in:
Vladimir Prus
2010-09-04 11:02:21 +00:00
parent b67ca38522
commit d3833607a2
12 changed files with 26 additions and 26 deletions

View File

@@ -6,20 +6,20 @@ 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\jam\src\bin.ntx86\bjam.exe" del tools\jam\src\bin.ntx86\bjam.exe
if exist ".\tools\jam\src\bin.ntx86_64\bjam.exe" del tools\jam\src\bin.ntx86_64\bjam.exe
cd tools\jam\src
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
call .\build.bat > ..\..\..\bjam.log
@ECHO OFF
cd ..\..\..
cd ..\..\..\..\..
if exist ".\tools\jam\src\bin.ntx86\bjam.exe" (
copy .\tools\jam\src\bin.ntx86\bjam.exe . > nul
if exist ".\tools\build\v2\engine\src\bin.ntx86\bjam.exe" (
copy .\tools\build\v2\engine\src\bin.ntx86\bjam.exe . > nul
goto :bjam_built)
if exist ".\tools\jam\src\bin.ntx86_64\bjam.exe" (
copy .\tools\jam\src\bin.ntx86_64\bjam.exe . > nul
if exist ".\tools\build\v2\engine\src\bin.ntx86_64\bjam.exe" (
copy .\tools\build\v2\engine\src\bin.ntx86_64\bjam.exe . > nul
goto :bjam_built)
goto :bjam_failure