Subject: [Boost-commit] svn:boost r64010 - in trunk: . doc doc/pdf more/getting_started/detail tools/build/v2/engine tools/inspect tools/jam tools/regression/src tools/release
From: ghost_at_[hidden]
Date: 2010-07-14 06:37:15
Author: vladimir_prus
Date: 2010-07-14 06:37:12 EDT (Wed, 14 Jul 2010)
New Revision: 64010
URL: http://svn.boost.org/trac/boost/changeset/64010
Log:
Move tools/jam into tools/build/v2/engine
Added:
trunk/tools/build/v2/engine/
- copied from r63788, /trunk/tools/jam/
Removed:
trunk/tools/jam/
Text files modified:
trunk/bootstrap.bat | 16 ++++++++--------
trunk/bootstrap.sh | 10 +++++-----
trunk/doc/Jamfile.v2 | 4 ++--
trunk/doc/pdf/Jamfile.v2 | 2 +-
trunk/more/getting_started/detail/build-from-source-head.rst | 2 +-
trunk/tools/inspect/inspect.cpp | 1 +
trunk/tools/regression/src/regression.py | 2 +-
trunk/tools/regression/src/run_tests.sh | 4 ++--
trunk/tools/release/snapshot_posix.sh | 4 ++--
9 files changed, 23 insertions(+), 22 deletions(-)
Modified: trunk/bootstrap.bat
==============================================================================
--- trunk/bootstrap.bat (original)
+++ trunk/bootstrap.bat 2010-07-14 06:37:12 EDT (Wed, 14 Jul 2010)
@@ -6,20 +6,20 @@
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
Modified: trunk/bootstrap.sh
==============================================================================
--- trunk/bootstrap.sh (original)
+++ trunk/bootstrap.sh 2010-07-14 06:37:12 EDT (Wed, 14 Jul 2010)
@@ -185,7 +185,7 @@
# Determine the toolset, if not already decided
if test "x$TOOLSET" = x; then
- guessed_toolset=`$my_dir/tools/jam/src/build.sh --guess-toolset`
+ guessed_toolset=`$my_dir/tools/build/v2/engine/src/build.sh --guess-toolset`
case $guessed_toolset in
acc | darwin | gcc | como | mipspro | pathscale | pgi | qcc | vacpp )
TOOLSET=$guessed_toolset
@@ -215,7 +215,7 @@
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") > bootstrap.log 2>&1
+ (cd "$my_dir/tools/build/v2/engine/src" && ./build.sh "$TOOLSET") > bootstrap.log 2>&1
if [ $? -ne 0 ]; then
echo
echo "Failed to build Boost.Jam"
@@ -223,9 +223,9 @@
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"
- echo "tools/jam/src/$arch/bjam"
+ 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"
cp "$BJAM" .
fi
Modified: trunk/doc/Jamfile.v2
==============================================================================
--- trunk/doc/Jamfile.v2 (original)
+++ trunk/doc/Jamfile.v2 2010-07-14 06:37:12 EDT (Wed, 14 Jul 2010)
@@ -39,7 +39,7 @@
<dependency>../libs/date_time/xmldoc//gregorian_autodoc.xml
<dependency>../libs/date_time/xmldoc//posix_time_autodoc.xml
<dependency>../libs/date_time/xmldoc//local_time_autodoc.xml
- <dependency>../tools/jam/doc//bjam
+ <dependency>../tools/build/v2/engine/doc//bjam
<dependency>../tools/quickbook/doc//quickbook
<dependency>../libs/interprocess/doc//autodoc.xml
<dependency>../libs/interprocess/doc//interprocess
@@ -63,7 +63,7 @@
<implicit-dependency>../libs/proto/doc//proto
<implicit-dependency>../libs/typeof/doc//typeof
<implicit-dependency>../libs/xpressive/doc//xpressive
- <implicit-dependency>../tools/jam/doc//bjam
+ <implicit-dependency>../tools/build/v2/engine/doc//bjam
<implicit-dependency>../tools/quickbook/doc//quickbook
<implicit-dependency>../libs/mpi/doc//mpi
<implicit-dependency>../libs/interprocess/doc//interprocess
Modified: trunk/doc/pdf/Jamfile.v2
==============================================================================
--- trunk/doc/pdf/Jamfile.v2 (original)
+++ trunk/doc/pdf/Jamfile.v2 2010-07-14 06:37:12 EDT (Wed, 14 Jul 2010)
@@ -79,7 +79,7 @@
../../libs/xpressive/doc//standalone
../../tools/boostbook/doc//boostbook
- ../../tools/jam/doc//standalone
+ ../../tools/build/v2/engine/doc//standalone
../../tools/quickbook/doc//standalone
../../tools/bcp/doc//standalone
:
Modified: trunk/more/getting_started/detail/build-from-source-head.rst
==============================================================================
--- trunk/more/getting_started/detail/build-from-source-head.rst (original)
+++ trunk/more/getting_started/detail/build-from-source-head.rst 2010-07-14 06:37:12 EDT (Wed, 14 Jul 2010)
@@ -12,7 +12,7 @@
.. _precompiled-bjam: http://sourceforge.net/project/showfiles.php?group_id=7586&package_id=72941
.. .. _Boost.Jam documentation: Boost.Jam_
.. _Boost.Build: ../../tools/build/index.html
-.. _Boost.Jam: ../../tools/jam/index.html
+.. _Boost.Jam: ../../tools/build/v2/engine/index.html
.. _Boost.Build documentation: Boost.Build_
Get ``bjam``
Modified: trunk/tools/inspect/inspect.cpp
==============================================================================
--- trunk/tools/inspect/inspect.cpp (original)
+++ trunk/tools/inspect/inspect.cpp 2010-07-14 06:37:12 EDT (Wed, 14 Jul 2010)
@@ -153,6 +153,7 @@
&& leaf != "bin.v2"
// this really out of our hands
&& local.find("tools/jam/src") != 0
+ && local.find("tools/build/v2/engine") != 0
// too many issues with generated HTML files
&& leaf != "status"
// no point in checking doxygen xml output
Modified: trunk/tools/regression/src/regression.py
==============================================================================
--- trunk/tools/regression/src/regression.py (original)
+++ trunk/tools/regression/src/regression.py 2010-07-14 06:37:12 EDT (Wed, 14 Jul 2010)
@@ -26,7 +26,7 @@
'trunk' : 'trunk',
'release' : 'branches/release',
'build' : 'trunk/tools/build/v2',
- 'jam' : 'tags/tools/jam/Boost_Jam_3_1_18/src',
+ 'jam' : 'trunk/tools/build/v2/engine',
'regression' : 'trunk/tools/regression',
'boost-build.jam'
: 'trunk/boost-build.jam'
Modified: trunk/tools/regression/src/run_tests.sh
==============================================================================
--- trunk/tools/regression/src/run_tests.sh (original)
+++ trunk/tools/regression/src/run_tests.sh 2010-07-14 06:37:12 EDT (Wed, 14 Jul 2010)
@@ -75,7 +75,7 @@
# The location of the binary for running bjam. The default should work
# under most circumstances.
#
-bjam="$boost_root/tools/jam/src/bin/bjam$exe_suffix"
+bjam="$boost_root/tools/build/v2/engine/src/bin/bjam$exe_suffix"
#
# "process_jam_log", and "compiler_status" paths to built helper programs:
@@ -133,7 +133,7 @@
# rebuild bjam if required:
#
echo building bjam:
-cd "$boost_root/tools/jam/src" && \
+cd "$boost_root/tools/build/v2/engine/src" && \
LOCATE_TARGET=bin sh ./build.sh
if test $? != 0 ; then
echo "bjam build failed."
Modified: trunk/tools/release/snapshot_posix.sh
==============================================================================
--- trunk/tools/release/snapshot_posix.sh (original)
+++ trunk/tools/release/snapshot_posix.sh 2010-07-14 06:37:12 EDT (Wed, 14 Jul 2010)
@@ -20,13 +20,13 @@
#echo "Building bjam..."
# failure to use an up-to-date copy of bjam has caused much wasted effort.
-#pushd posix/tools/jam/src
+#pushd posix/tools/build/v2/engine/src
#./build.sh gcc
#popd
#
#echo "Building docs..."
#pushd posix/doc
-#../tools/jam/src/bin.cygwinx86/bjam --toolset=gcc &>../../posix-bjam.log
+#../tools/build/v2/engine/src/bin.cygwinx86/bjam --toolset=gcc &>../../posix-bjam.log
#popd
echo "Cleaning up and renaming..."