diff options
author | Vladimir Prus <ghost@cs.msu.su> | 2010-07-14 10:37:12 +0000 |
---|---|---|
committer | Vladimir Prus <ghost@cs.msu.su> | 2010-07-14 10:37:12 +0000 |
commit | b8caf157d7f8eaed309d593c0f3bb8955835f0ac (patch) | |
tree | ff92f23e2bb00c0f31f3fdd0de1f2bf088199e36 | |
parent | 836bfaea0baafca764da36ccd0513491c61f0021 (diff) | |
download | boost-b8caf157d7f8eaed309d593c0f3bb8955835f0ac.tar.gz |
Move tools/jam into tools/build/v2/engine
[SVN r64010]
-rw-r--r-- | bootstrap.bat | 16 | ||||
-rwxr-xr-x | bootstrap.sh | 10 | ||||
-rw-r--r-- | doc/Jamfile.v2 | 4 | ||||
-rw-r--r-- | doc/pdf/Jamfile.v2 | 2 | ||||
-rw-r--r-- | more/getting_started/detail/build-from-source-head.rst | 2 | ||||
m--------- | tools/build | 0 | ||||
m--------- | tools/inspect | 0 | ||||
-rw-r--r-- | tools/regression/src/regression.py | 2 | ||||
-rw-r--r-- | tools/regression/src/run_tests.sh | 4 | ||||
-rwxr-xr-x | tools/release/snapshot_posix.sh | 4 |
10 files changed, 22 insertions, 22 deletions
diff --git a/bootstrap.bat b/bootstrap.bat index b735566922..9db20355d7 100644 --- a/bootstrap.bat +++ b/bootstrap.bat @@ -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
diff --git a/bootstrap.sh b/bootstrap.sh index b6b7f38940..7424606dc7 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/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 @@ rm -f config.log 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 @@ if test "x$BJAM" = x; then 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 diff --git a/doc/Jamfile.v2 b/doc/Jamfile.v2 index 17100bf9b6..3584478b36 100644 --- a/doc/Jamfile.v2 +++ b/doc/Jamfile.v2 @@ -39,7 +39,7 @@ boostbook doc <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 @@ boostbook doc <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 diff --git a/doc/pdf/Jamfile.v2 b/doc/pdf/Jamfile.v2 index ed5f2b9ed2..3567e0ea37 100644 --- a/doc/pdf/Jamfile.v2 +++ b/doc/pdf/Jamfile.v2 @@ -79,7 +79,7 @@ install pdf-install ../../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 : diff --git a/more/getting_started/detail/build-from-source-head.rst b/more/getting_started/detail/build-from-source-head.rst index 707a95ef85..ff72e4fc12 100644 --- a/more/getting_started/detail/build-from-source-head.rst +++ b/more/getting_started/detail/build-from-source-head.rst @@ -12,7 +12,7 @@ installing software. To use it, you'll need an executable called .. _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`` diff --git a/tools/build b/tools/build -Subproject e4f774a694ed00ec4aa74af49f27bf87b988100 +Subproject 498519f31160ff5a750b7503a75f1f3cc47ef8a diff --git a/tools/inspect b/tools/inspect -Subproject d0148407117b54f1ed3174df54e07dbcd604980 +Subproject 104485a3e227f216d7ee9a29db67db158210ce3 diff --git a/tools/regression/src/regression.py b/tools/regression/src/regression.py index 36ca9550b2..47de795fd0 100644 --- a/tools/regression/src/regression.py +++ b/tools/regression/src/regression.py @@ -26,7 +26,7 @@ repo_path = { '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' diff --git a/tools/regression/src/run_tests.sh b/tools/regression/src/run_tests.sh index 12437bf827..3b936074b7 100644 --- a/tools/regression/src/run_tests.sh +++ b/tools/regression/src/run_tests.sh @@ -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/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 @@ fi # 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." diff --git a/tools/release/snapshot_posix.sh b/tools/release/snapshot_posix.sh index 4824c5ccf1..95f3de02cc 100755 --- a/tools/release/snapshot_posix.sh +++ b/tools/release/snapshot_posix.sh @@ -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/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..." |