organicmaps/boost
13
Fork 0
mirror of https://github.com/boostorg/boost.git synced 2025-04-05 13:35:00 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions

Adjust for tools/build/v2/engine/src move to tools/build/v2/engine.

Browse source 
[SVN r68593]
This commit is contained in:
Vladimir Prus 2011-02-01 08:43:55 +00:00
parent 1528c8b80b
commit 012320bdec
5 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
bootstrap.bat
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\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
cd tools\build\v2\engine
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
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

10
bootstrap.sh
View file

@ -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/src/build.sh --guess-toolset`
guessed_toolset=`$my_dir/tools/build/v2/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.Jam with toolset $TOOLSET... "
pwd=`pwd`
(cd "$my_dir/tools/build/v2/engine/src" && ./build.sh "$TOOLSET") > bootstrap.log 2>&1
(cd "$my_dir/tools/build/v2/engine" && ./build.sh "$TOOLSET") > bootstrap.log 2>&1
if [ $? -ne 0 ]; then
echo
echo "Failed to build Boost.Jam"
@ -223,9 +223,9 @@ if test "x$BJAM" = x; then
exit 1
fi
cd "$pwd"
arch=`cd $my_dir/tools/build/v2/engine/src && ./bootstrap/jam0 -d0 -f build.jam --toolset=$TOOLSET --toolset-root= --show-locate-target && cd ..`
BJAM="$my_dir/tools/build/v2/engine/src/$arch/bjam"
echo "tools/build/v2/engine/src/$arch/bjam"
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/bjam"
echo "tools/build/v2/engine/$arch/bjam"
cp "$BJAM" .
fi

2
tools/regression/src/regression.py
View file

@ -26,7 +26,7 @@ repo_path = {
'trunk' : 'trunk',
'release' : 'branches/release',
'build' : 'trunk/tools/build/v2',
'jam' : 'trunk/tools/build/v2/engine/src',
'jam' : 'trunk/tools/build/v2/engine',
'regression' : 'trunk/tools/regression',
'boost-build.jam'
: 'trunk/boost-build.jam'

4
tools/regression/src/run_tests.sh
View file

@ -75,7 +75,7 @@ exe_suffix=
# The location of the binary for running bjam. The default should work
# under most circumstances.
#
bjam="$boost_root/tools/build/v2/engine/src/bin/bjam$exe_suffix"
bjam="$boost_root/tools/build/v2/engine/bin/bjam$exe_suffix"
#
# "process_jam_log", and "compiler_status" paths to built helper programs:
@ -133,7 +133,7 @@ fi
# rebuild bjam if required:
#
echo building bjam:
cd "$boost_root/tools/build/v2/engine/src" && \
cd "$boost_root/tools/build/v2/engine" && \
LOCATE_TARGET=bin sh ./build.sh
if test $? != 0 ; then
echo "bjam build failed."

4
tools/release/snapshot_posix.sh
View file

@ -20,13 +20,13 @@ svn export --non-interactive --native-eol LF http://svn.boost.org/svn/boost/bran
#echo "Building bjam..."
# failure to use an up-to-date copy of bjam has caused much wasted effort.
#pushd posix/tools/build/v2/engine/src
#pushd posix/tools/build/v2/engine
#./build.sh gcc
#popd
#
#echo "Building docs..."
#pushd posix/doc
#../tools/build/v2/engine/src/bin.cygwinx86/bjam --toolset=gcc &>../../posix-bjam.log
#../tools/build/v2/engine/bin.cygwinx86/bjam --toolset=gcc &>../../posix-bjam.log
#popd
echo "Cleaning up and renaming..."