diff options
author | Daniel James <daniel@calamity.org.uk> | 2013-12-25 09:30:13 +0000 |
---|---|---|
committer | Daniel James <daniel@calamity.org.uk> | 2013-12-25 09:30:13 +0000 |
commit | ab56308cf79c7b64c419c12f35c9757347c4511e (patch) | |
tree | ba3b86e1b6fb34c903dad79cd36fc2d36e4e0321 | |
parent | 5a86ed2cecde3515ff48ad3d8e13d1d354e947f4 (diff) | |
download | boost-ab56308cf79c7b64c419c12f35c9757347c4511e.tar.gz |
Fix build paths.
-rw-r--r-- | doc/Jamfile.v2 | 4 | ||||
-rw-r--r-- | doc/pdf/Jamfile.v2 | 4 | ||||
-rw-r--r-- | doc/src/boost.xml | 2 | ||||
-rw-r--r-- | more/getting_started/detail/conclusion.rst | 2 | ||||
-rw-r--r-- | more/getting_started/unix-variants.html | 2 | ||||
-rw-r--r-- | more/getting_started/windows.html | 2 | ||||
-rw-r--r-- | tools/regression/src/regression.py | 4 | ||||
-rw-r--r-- | tools/regression/src/run_tests.sh | 4 | ||||
-rwxr-xr-x | tools/release/snapshot_posix.sh | 4 |
9 files changed, 14 insertions, 14 deletions
diff --git a/doc/Jamfile.v2 b/doc/Jamfile.v2 index 67ba959654..2c5b31d1d2 100644 --- a/doc/Jamfile.v2 +++ b/doc/Jamfile.v2 @@ -65,7 +65,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/build/v2/doc//jam_docs + <dependency>../tools/build/doc//jam_docs <dependency>../tools/quickbook/doc//quickbook <dependency>../libs/interprocess/doc//standalone/<format>docbook <dependency>../libs/intrusive/doc//standalone/<format>docbook @@ -100,7 +100,7 @@ boostbook doc <implicit-dependency>../libs/ratio/doc//ratio <implicit-dependency>../libs/typeof/doc//typeof <implicit-dependency>../libs/xpressive/doc//xpressive - <implicit-dependency>../tools/build/v2/doc//jam_docs + <implicit-dependency>../tools/build/doc//jam_docs <implicit-dependency>../tools/quickbook/doc//quickbook <implicit-dependency>../libs/mpi/doc//mpi <implicit-dependency>../libs/circular_buffer/doc//standalone/<format>docbook diff --git a/doc/pdf/Jamfile.v2 b/doc/pdf/Jamfile.v2 index b62d10c2d6..cf53b23c69 100644 --- a/doc/pdf/Jamfile.v2 +++ b/doc/pdf/Jamfile.v2 @@ -97,7 +97,7 @@ install pdf-install ../../libs/xpressive/doc//standalone ../../tools/boostbook/doc//boostbook - ../../tools/build/v2/doc//jam_docs + ../../tools/build/doc//jam_docs ../../tools/quickbook/doc//standalone ../../tools/bcp/doc//standalone : @@ -139,7 +139,7 @@ install phoenix-install install boost-build-install : - ../../tools/build/v2/doc//userman + ../../tools/build/doc//userman : <location>. <install-type>PDF diff --git a/doc/src/boost.xml b/doc/src/boost.xml index 9ef83e0919..79845d6677 100644 --- a/doc/src/boost.xml +++ b/doc/src/boost.xml @@ -758,7 +758,7 @@ <xi:include href="../../tools/boostbook/doc/boostbook.xml"/> <xi:include href="quickbook.xml"/> <xi:include href="jam_docs.xml"/> - <xi:include href="../../tools/build/v2/doc/src/userman.xml"/> + <xi:include href="../../tools/build/doc/src/userman.xml"/> </part> </boostbook> diff --git a/more/getting_started/detail/conclusion.rst b/more/getting_started/detail/conclusion.rst index 2c439e143a..44fb120e8a 100644 --- a/more/getting_started/detail/conclusion.rst +++ b/more/getting_started/detail/conclusion.rst @@ -29,7 +29,7 @@ mailing list`_. -- the Boost Developers -.. _Boost.Build reference manual: ../../tools/build/v2/index.html +.. _Boost.Build reference manual: ../../tools/build/index.html .. _Boost Users' mailing list: http://www.boost.org/more/mailing_lists.htm#users .. _Boost.Build mailing list: http://www.boost.org/more/mailing_lists.htm#jamboost diff --git a/more/getting_started/unix-variants.html b/more/getting_started/unix-variants.html index 561906f273..2d2d096c04 100644 --- a/more/getting_started/unix-variants.html +++ b/more/getting_started/unix-variants.html @@ -712,7 +712,7 @@ If you can't find what you need, or there's anything we can do to make this document clearer, please post it to the <a class="reference external" href="http://www.boost.org/more/mailing_lists.htm#users">Boost Users' mailing list</a>.</p> <ul class="simple"> -<li><a class="reference external" href="../../tools/build/v2/index.html">Boost.Build reference manual</a></li> +<li><a class="reference external" href="../../tools/build/index.html">Boost.Build reference manual</a></li> <li><a class="reference external" href="http://www.boost.org/more/mailing_lists.htm#users">Boost Users' mailing list</a></li> <li><a class="reference external" href="http://www.boost.org/more/mailing_lists.htm#jamboost">Boost.Build mailing list</a></li> <li><a class="reference external" href="../../libs/index.html">Index of all Boost library documentation</a></li> diff --git a/more/getting_started/windows.html b/more/getting_started/windows.html index f3e9780cfe..61a5c714dc 100644 --- a/more/getting_started/windows.html +++ b/more/getting_started/windows.html @@ -782,7 +782,7 @@ If you can't find what you need, or there's anything we can do to make this document clearer, please post it to the <a class="reference external" href="http://www.boost.org/more/mailing_lists.htm#users">Boost Users' mailing list</a>.</p> <ul class="simple"> -<li><a class="reference external" href="../../tools/build/v2/index.html">Boost.Build reference manual</a></li> +<li><a class="reference external" href="../../tools/build/index.html">Boost.Build reference manual</a></li> <li><a class="reference external" href="http://www.boost.org/more/mailing_lists.htm#users">Boost Users' mailing list</a></li> <li><a class="reference external" href="http://www.boost.org/more/mailing_lists.htm#jamboost">Boost.Build mailing list</a></li> <li><a class="reference external" href="../../libs/index.html">Index of all Boost library documentation</a></li> diff --git a/tools/regression/src/regression.py b/tools/regression/src/regression.py index 0fa9603ac4..22bee2f9e3 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' : 'trunk/tools/build/v2/engine', + 'jam' : 'trunk/tools/build/engine', 'regression' : 'trunk/tools/regression', 'boost-build.jam' : 'trunk/boost-build.jam' @@ -373,7 +373,7 @@ class runner: fn = os.path.join(d, "test_log.xml") cd = os.getcwd() try: - os.chdir (os.path.join (self.boost_root, 'tools/build/v2/test')); + os.chdir (os.path.join (self.boost_root, 'tools/build/test')); bjam_path = os.path.dirname (self.tool_path( self.bjam )) self.log( "Using bjam binary in '%s'" % (bjam_path)) os.putenv('PATH', bjam_path + os.pathsep + os.environ['PATH']) diff --git a/tools/regression/src/run_tests.sh b/tools/regression/src/run_tests.sh index 483cecfeae..d4c82f7d61 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/build/v2/engine/bin/bjam$exe_suffix" +bjam="$boost_root/tools/build/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" && \ +cd "$boost_root/tools/build/engine" && \ 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 ccc625a999..d9e03f0dbb 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/build/v2/engine +#pushd posix/tools/build/engine #./build.sh gcc #popd # #echo "Building docs..." #pushd posix/doc -#../tools/build/v2/engine/bin.cygwinx86/bjam --toolset=gcc &>../../posix-bjam.log +#../tools/build/engine/bin.cygwinx86/bjam --toolset=gcc &>../../posix-bjam.log #popd echo "Cleaning up and renaming..." |