Subject: [Boost-commit] svn:boost r57638 - branches/release
From: bdawes_at_[hidden]
Date: 2009-11-13 09:58:04
Author: bemandawes
Date: 2009-11-13 09:58:03 EST (Fri, 13 Nov 2009)
New Revision: 57638
URL: http://svn.boost.org/trac/boost/changeset/57638
Log:
root: merge trunk
Added:
branches/release/CMakeLists.txt (props changed)
- copied unchanged from r57637, /trunk/CMakeLists.txt
Properties modified:
branches/release/ (props changed)
branches/release/INSTALL (props changed)
branches/release/Jamroot (props changed)
branches/release/LICENSE_1_0.txt (props changed)
branches/release/boost-build.jam (contents, props changed)
branches/release/boost.css (props changed)
branches/release/boost.png (props changed)
branches/release/bootstrap.bat (props changed)
branches/release/bootstrap.sh (contents, props changed)
branches/release/index.htm (props changed)
branches/release/index.html (props changed)
branches/release/rst.css (props changed)
Text files modified:
branches/release/boost-build.jam | 1 +
branches/release/bootstrap.sh | 8 +++++++-
2 files changed, 8 insertions(+), 1 deletions(-)
Modified: branches/release/boost-build.jam
==============================================================================
--- branches/release/boost-build.jam (original)
+++ branches/release/boost-build.jam 2009-11-13 09:58:03 EST (Fri, 13 Nov 2009)
@@ -10,6 +10,7 @@
# building Boost libraries. Unless explicitly selected using a command-line
# option, the version included with the Boost library distribution is used (as
# opposed to any other Boost Build version installed on the user's sytem).
+
BOOST_ROOT = $(.boost-build-file:D) ;
BOOST_BUILD = [ MATCH --boost-build=(.*) : $(ARGV) ] ;
BOOST_BUILD ?= tools/build/v2 ;
Modified: branches/release/bootstrap.sh
==============================================================================
--- branches/release/bootstrap.sh (original)
+++ branches/release/bootstrap.sh 2009-11-13 09:58:03 EST (Fri, 13 Nov 2009)
@@ -215,7 +215,13 @@
if test "x$BJAM" = x; then
echo -n "Building Boost.Jam with toolset $TOOLSET... "
pwd=`pwd`
- cd "$my_dir/tools/jam/src" && ./build.sh "$TOOLSET" > config.log 2>&1
+ (cd "$my_dir/tools/jam/src" && ./build.sh "$TOOLSET") > bootstrap.log 2>&1
+ if [ $? -ne 0 ]; then
+ echo
+ echo "Failed to build Boost.Jam"
+ echo "Consult 'bootstrap.log' for more details"
+ exit 1
+ fi
cd "$pwd"
arch=`cd $my_dir/tools/jam/src && ./bootstrap/jam0 -d0 -f build.jam --toolset=$TOOLSET --toolset-root= --show-locate-target && cd ..`
BJAM="$my_dir/tools/jam/src/$arch/bjam"