diff options
| author | Vladimir Prus <ghost@cs.msu.su> | 2010-09-04 11:02:21 +0000 |
|---|---|---|
| committer | Vladimir Prus <ghost@cs.msu.su> | 2010-09-04 11:02:21 +0000 |
| commit | d3833607a2a3287b36e6d520acfd0f0ce453cce4 (patch) | |
| tree | e486ee94e701fd7a9e795a2dc0e7b2ca1cb3bae6 /tools | |
| parent | b67ca385225b5fd9e38cf248d5e82c42ca5d5388 (diff) | |
| download | boost-d3833607a2a3287b36e6d520acfd0f0ce453cce4.tar.gz | |
Merge r64010, wherein jam has been moved.
[SVN r65233]
Diffstat (limited to 'tools')
| 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 |
5 files changed, 5 insertions, 5 deletions
diff --git a/tools/build b/tools/build -Subproject 9f9707e611c49cb2a99b32e6db0eedd2ad592d1 +Subproject 2251e41f56c2c84bf0b7a320c3b2db402681e6e diff --git a/tools/inspect b/tools/inspect -Subproject ab05b63c4314b5bed4de823a411d0e44d6e59a5 +Subproject 05ab46cb00b2e2d1fbcf03a9fa23f7d24de4b16 diff --git a/tools/regression/src/regression.py b/tools/regression/src/regression.py index 753cbac646..64f4f29b39 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_17/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..." |