organicmaps/boost
13
Fork 0
mirror of https://github.com/boostorg/boost.git synced 2025-04-05 21:45:00 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions

Revert "Fix build paths."

Browse source 
This reverts commit 0ac664e7f9.
This commit is contained in:
Rene Rivera 2013-12-28 14:50:11 -06:00
parent ee5d4c6e8d
commit 1f7411cf03
9 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
doc/Jamfile.v2
View file

@ -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/doc//jam_docs
<dependency>../tools/build/v2/doc//jam_docs
<dependency>../tools/quickbook/doc//boost-doc-tools
<dependency>../tools/quickbook/doc//quickbook
<dependency>../libs/interprocess/doc//standalone/<format>docbook
@ -101,7 +101,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/doc//jam_docs
<implicit-dependency>../tools/build/v2/doc//jam_docs
<implicit-dependency>../tools/quickbook/doc//boost-doc-tools
<implicit-dependency>../tools/quickbook/doc//quickbook
<implicit-dependency>../libs/mpi/doc//mpi

4
doc/pdf/Jamfile.v2
View file

@ -93,7 +93,7 @@ install pdf-install
../../libs/xpressive/doc//standalone
../../tools/boostbook/doc//boostbook
../../tools/build/doc//jam_docs
../../tools/build/v2/doc//jam_docs
../../tools/quickbook/doc//standalone
../../tools/bcp/doc//standalone
:
@ -135,7 +135,7 @@ install phoenix-install
install boost-build-install
:
../../tools/build/doc//userman
../../tools/build/v2/doc//userman
:
<location>.
<install-type>PDF

2
doc/src/boost.xml
View file

@ -749,7 +749,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/doc/src/userman.xml"/>
<xi:include href="../../tools/build/v2/doc/src/userman.xml"/>
</part>
</boostbook>

2
more/getting_started/detail/conclusion.rst
View file

@ -29,7 +29,7 @@ mailing list`_.
-- the Boost Developers
.. _Boost.Build reference manual: ../../tools/build/index.html
.. _Boost.Build reference manual: ../../tools/build/v2/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

2
more/getting_started/unix-variants.html
View file

@ -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/index.html">Boost.Build reference manual</a></li>
<li><a class="reference external" href="../../tools/build/v2/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>

2
more/getting_started/windows.html
View file

@ -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/index.html">Boost.Build reference manual</a></li>
<li><a class="reference external" href="../../tools/build/v2/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>

4
tools/regression/src/regression.py
View file

@ -26,7 +26,7 @@ repo_path = {
'trunk' : 'trunk',
'release' : 'branches/release',
'build' : 'trunk/tools/build/v2',
'jam' : 'trunk/tools/build/engine',
'jam' : 'trunk/tools/build/v2/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/test'));
os.chdir (os.path.join (self.boost_root, 'tools/build/v2/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'])

4
tools/regression/src/run_tests.sh
View file

@ -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/engine/bin/bjam$exe_suffix"
bjam="$boost_root/tools/build/v2/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/engine" && \
cd "$boost_root/tools/build/v2/engine" && \
LOCATE_TARGET=bin sh ./build.sh
if test $? != 0 ; then
echo "bjam build failed."

2
tools/regression/test/report/Jamfile.jam
View file

@ -6,7 +6,7 @@
path-constant expected-results : expected_results.xml ;
path-constant failures-markup : explicit-failures-markup.xml ;
path-constant css : ../../xsl_reports/xsl/html/master.css ;
path-constant css : ../../xsl_reports/xsl/v2/html/master.css ;
path-constant comment : comment.html ;
run ../../build//boost_report :
--expected=\"$(expected-results)\"