diff options
author | Vladimir Prus <vladimir@codesourcery.com> | 2013-12-18 10:53:40 +0400 |
---|---|---|
committer | Vladimir Prus <vladimir@codesourcery.com> | 2013-12-18 11:08:32 +0400 |
commit | bd86bb8943e01c266e5c2882706f8301e9a752b7 (patch) | |
tree | ae4ed3149b5ca9f852f2f79d3d07404efe63db5b | |
parent | 49454577144b093b8144c2bce5dcf82e1e4bde67 (diff) | |
download | boost-bd86bb8943e01c266e5c2882706f8301e9a752b7.tar.gz |
Update relative paths to Boost.Build changes.
-rw-r--r-- | bootstrap.bat | 22 | ||||
-rwxr-xr-x | bootstrap.sh | 12 | ||||
m--------- | tools/build | 0 |
3 files changed, 17 insertions, 17 deletions
diff --git a/bootstrap.bat b/bootstrap.bat index a62fdda982..33d72d7fde 100644 --- a/bootstrap.bat +++ b/bootstrap.bat @@ -6,25 +6,25 @@ 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.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 +if exist ".\tools\build\src\engine\bin.ntx86\b2.exe" del tools\build\src\engine\bin.ntx86\b2.exe +if exist ".\tools\build\src\engine\bin.ntx86\bjam.exe" del tools\build\src\engine\bin.ntx86\bjam.exe +if exist ".\tools\build\src\engine\bin.ntx86_64\b2.exe" del tools\build\src\engine\bin.ntx86_64\b2.exe +if exist ".\tools\build\src\engine\bin.ntx86_64\bjam.exe" del tools\build\src\engine\bin.ntx86_64\bjam.exe +pushd tools\build\src\engine call .\build.bat %* > ..\..\..\..\bootstrap.log @ECHO OFF 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 +if exist ".\tools\build\src\engine\bin.ntx86\bjam.exe" ( + copy .\tools\build\src\engine\bin.ntx86\b2.exe . > nul + copy .\tools\build\src\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 +if exist ".\tools\build\src\engine\bin.ntx86_64\bjam.exe" ( + copy .\tools\build\src\engine\bin.ntx86_64\b2.exe . > nul + copy .\tools\build\src\engine\bin.ntx86_64\bjam.exe . > nul goto :bjam_built) goto :bjam_failure diff --git a/bootstrap.sh b/bootstrap.sh index 2723f287b9..cde2b2bbb6 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -185,7 +185,7 @@ my_dir="." # Determine the toolset, if not already decided if test "x$TOOLSET" = x; then - guessed_toolset=`$my_dir/tools/build/v2/engine/build.sh --guess-toolset` + guessed_toolset=`$my_dir/tools/build/src/engine/build.sh --guess-toolset` case $guessed_toolset in acc | darwin | gcc | como | mipspro | pathscale | pgi | qcc | vacpp ) TOOLSET=$guessed_toolset @@ -215,7 +215,7 @@ rm -f config.log if test "x$BJAM" = x; then echo -n "Building Boost.Build engine with toolset $TOOLSET... " pwd=`pwd` - (cd "$my_dir/tools/build/v2/engine" && ./build.sh "$TOOLSET") > bootstrap.log 2>&1 + (cd "$my_dir/tools/build/src/engine" && ./build.sh "$TOOLSET") > bootstrap.log 2>&1 if [ $? -ne 0 ]; then echo echo "Failed to build Boost.Build build engine" @@ -223,11 +223,11 @@ if test "x$BJAM" = x; then exit 1 fi cd "$pwd" - arch=`cd $my_dir/tools/build/v2/engine && ./bootstrap/jam0 -d0 -f build.jam --toolset=$TOOLSET --toolset-root= --show-locate-target && cd ..` - BJAM="$my_dir/tools/build/v2/engine/$arch/b2" - echo "tools/build/v2/engine/$arch/b2" + arch=`cd $my_dir/tools/build/src/engine && ./bootstrap/jam0 -d0 -f build.jam --toolset=$TOOLSET --toolset-root= --show-locate-target && cd ..` + BJAM="$my_dir/tools/build/src/engine/$arch/b2" + echo "tools/build/src/engine/$arch/b2" cp "$BJAM" . - cp "$my_dir/tools/build/v2/engine/$arch/bjam" . + cp "$my_dir/tools/build/src/engine/$arch/bjam" . fi diff --git a/tools/build b/tools/build -Subproject 3b3a1cf02a72e644b7055df8b74ac70c93faffa +Subproject 6f3ea379a864e05011bac26971c02d4aa3297c6 |