|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r79500 - in branches/release: . doc/pdf doc/test libs libs/chrono/doc libs/config libs/config/doc libs/container libs/container/doc libs/functional libs/functional/overloaded_function libs/functional/overloaded_function/doc libs/geometry libs/geometry/doc libs/integer libs/integer/doc libs/interprocess libs/interprocess/doc libs/intrusive libs/intrusive/doc libs/local_function libs/local_function/doc libs/math libs/math/doc/sf_and_dist libs/pool/doc libs/ratio libs/ratio/doc libs/type_traits libs/type_traits/doc
From: john_at_[hidden]
Date: 2012-07-14 12:05:53
Author: johnmaddock
Date: 2012-07-14 12:05:50 EDT (Sat, 14 Jul 2012)
New Revision: 79500
URL: http://svn.boost.org/trac/boost/changeset/79500
Log:
Merge changes from trunk:
Fix PDF install rule so that it's explicit and automatically invokes a PDF build when specified on the command line.
So "bjam pdfinstall" will now build and install the PDF to the current directory.
This works around some problems that the previous versions had if the user did not have an FO processor installed (basically Daniel James was unable to build the HTML docs for the distribution if the pdfinstall rule was implicit).
Properties modified:
branches/release/ (props changed)
branches/release/libs/ (props changed)
branches/release/libs/config/ (props changed)
branches/release/libs/container/ (props changed)
branches/release/libs/functional/ (props changed)
branches/release/libs/functional/overloaded_function/ (props changed)
branches/release/libs/geometry/ (props changed)
branches/release/libs/geometry/doc/ (props changed)
branches/release/libs/integer/ (props changed)
branches/release/libs/interprocess/ (props changed)
branches/release/libs/intrusive/ (props changed)
branches/release/libs/local_function/ (props changed)
branches/release/libs/math/ (props changed)
branches/release/libs/ratio/ (props changed)
branches/release/libs/type_traits/ (props changed)
Text files modified:
branches/release/doc/pdf/Jamfile.v2 | 6 +++---
branches/release/doc/pdf/build | 14 +++++++-------
branches/release/doc/test/Jamfile.v2 | 8 ++++----
branches/release/libs/chrono/doc/Jamfile.v2 | 3 ++-
branches/release/libs/config/doc/Jamfile.v2 | 3 ++-
branches/release/libs/container/doc/Jamfile.v2 | 4 ++--
branches/release/libs/functional/overloaded_function/doc/Jamfile.v2 | 4 ++--
branches/release/libs/integer/doc/Jamfile.v2 | 3 ++-
branches/release/libs/interprocess/doc/Jamfile.v2 | 4 ++--
branches/release/libs/intrusive/doc/Jamfile.v2 | 4 ++--
branches/release/libs/local_function/doc/Jamfile.v2 | 4 ++--
branches/release/libs/math/doc/sf_and_dist/Jamfile.v2 | 3 ++-
branches/release/libs/pool/doc/jamfile.v2 | 2 ++
branches/release/libs/ratio/doc/Jamfile.v2 | 3 ++-
branches/release/libs/type_traits/doc/Jamfile.v2 | 4 ++--
15 files changed, 38 insertions(+), 31 deletions(-)
Modified: branches/release/doc/pdf/Jamfile.v2
==============================================================================
--- branches/release/doc/pdf/Jamfile.v2 (original)
+++ branches/release/doc/pdf/Jamfile.v2 2012-07-14 12:05:50 EDT (Sat, 14 Jul 2012)
@@ -40,7 +40,7 @@
../../libs/chrono/doc//standalone
../../libs/concept_check/doc//concepts
../../libs/config/doc//standalone
- #../../libs/container/doc//pdf-install
+ #../../libs/container/doc//pdfinstall
../../libs/conversion/doc//standalone
../../libs/date_time/xmldoc//date_time
../../libs/foreach/doc//standalone
@@ -61,7 +61,7 @@
../../libs/math/doc/octonion//standalone
../../libs/math/doc/quaternion//standalone
../../libs/math/doc/gcd//standalone
- ../../libs/math/doc/sf_and_dist//pdf-install
+ ../../libs/math/doc/sf_and_dist//pdfinstall
../../libs/move/doc//standalone
../../libs/mpi/doc//standalone
../../libs/numeric/conversion/doc//standalone
@@ -79,7 +79,7 @@
../../libs/static_assert/doc//standalone
../../libs/thread/doc//standalone
../../libs/tr1/doc//standalone
- ../../libs/type_traits/doc//pdf-install
+ ../../libs/type_traits/doc//pdfinstall
../../libs/typeof/doc//standalone
../../libs/units/doc//standalone
# ../../libs/utility/identity_type/doc//doc
Modified: branches/release/doc/pdf/build
==============================================================================
--- branches/release/doc/pdf/build (original)
+++ branches/release/doc/pdf/build 2012-07-14 12:05:50 EDT (Sat, 14 Jul 2012)
@@ -2,15 +2,15 @@
boost_version=$(grep 'define.*BOOST_LIB_VERSION' ../../boost/version.hpp | sed 's/.*"\([^"]*\)".*/\1/')
echo Boost version tag = $boost_version
(cd ../../libs/accumulators/doc && bjam -a) 2>&1 | tee build.log
-(cd ../../libs/container/doc && rm -rf *.pdf && bjam -a pdf xsl:param=fop1.extensions=1 && cp *.pdf ../../../doc/pdf) 2>&1 | tee -a build.log
-(cd ../../libs/interprocess/doc && rm -rf *.pdf && bjam -a pdf xsl:param=fop1.extensions=1 && cp *.pdf ../../../doc/pdf) 2>&1 | tee -a build.log
-(cd ../../libs/intrusive/doc && rm -rf *.pdf && bjam -a pdf xsl:param=fop1.extensions=1 && cp *.pdf ../../../doc/pdf) 2>&1 | tee -a build.log
+(cd ../../libs/container/doc && rm -rf *.pdf && bjam -a pdfinstall xsl:param=fop1.extensions=1 && cp *.pdf ../../../doc/pdf) 2>&1 | tee -a build.log
+(cd ../../libs/interprocess/doc && rm -rf *.pdf && bjam -a pdfinstall xsl:param=fop1.extensions=1 && cp *.pdf ../../../doc/pdf) 2>&1 | tee -a build.log
+(cd ../../libs/intrusive/doc && rm -rf *.pdf && bjam -a pdfinstall xsl:param=fop1.extensions=1 && cp *.pdf ../../../doc/pdf) 2>&1 | tee -a build.log
(cd ../../libs/geometry/doc/src/docutils/tools/doxygen_xml2qbk && bjam release) 2>&1 | tee -a build.log
-(cd ../../libs/functional/overloaded_function/doc && rm -rf *.pdf && bjam -a pdf && cp *.pdf ../../../../doc/pdf) 2>&1 | tee -a build.log
-(cd ../../libs/local_function/doc && rm -rf *.pdf && bjam -a pdf && cp *.pdf ../../../doc/pdf) 2>&1 | tee -a build.log
-(cd ../../libs/utility/identity_type/doc && rm -rf *.pdf && bjam -a pdf && cp *.pdf ../../../../doc/pdf) 2>&1 | tee -a build.log
+(cd ../../libs/functional/overloaded_function/doc && rm -rf *.pdf && bjam -a pdfinstall && cp *.pdf ../../../../doc/pdf) 2>&1 | tee -a build.log
+(cd ../../libs/local_function/doc && rm -rf *.pdf && bjam -a pdfinstall && cp *.pdf ../../../doc/pdf) 2>&1 | tee -a build.log
+(cd ../../libs/utility/identity_type/doc && rm -rf *.pdf && bjam -a pdfinstall && cp *.pdf ../../../../doc/pdf) 2>&1 | tee -a build.log
cp ../../dist/bin/doxygen_xml2qbk* /usr/local/bin
-(cd ../../libs/geometry/doc && rm -rf *.pdf && ./make_qbk.py && bjam pdf -a xsl:param=fop1.extensions=1 xsl:param=xep.extensions=0 && cp *.pdf ../../../doc/pdf) 2>&1 | tee -a build.log
+(cd ../../libs/geometry/doc && rm -rf *.pdf && ./make_qbk.py && bjam pdfinstall -a xsl:param=fop1.extensions=1 xsl:param=xep.extensions=0 && cp *.pdf ../../../doc/pdf) 2>&1 | tee -a build.log
bjam -a --enable-index pdf -d2 xsl:param=fop1.extensions=0 xsl:param=xep.extensions=1 2>&1 | tee -a build.log
rm -rf boost_${boost_version}_pdf
mkdir boost_${boost_version}_pdf
Modified: branches/release/doc/test/Jamfile.v2
==============================================================================
--- branches/release/doc/test/Jamfile.v2 (original)
+++ branches/release/doc/test/Jamfile.v2 2012-07-14 12:05:50 EDT (Sat, 14 Jul 2012)
@@ -186,6 +186,8 @@
<xsl:param>chunk.section.depth=1
<xsl:param>boost.root=../../..
<xsl:param>navig.graphics=1
+ <xsl:param>boost.mathjax=1
+ <xsl:path>$(images_location)/..
# PDF Options:
@@ -201,7 +203,5 @@
;
-install pdf-install : standalone : <location>. <install-type>PDF ;
-
-
-
+install pdfinstall : standalone/<format>pdf : <location>. <install-type>PDF ;
+explicit pdfinstall ;
Modified: branches/release/libs/chrono/doc/Jamfile.v2
==============================================================================
--- branches/release/libs/chrono/doc/Jamfile.v2 (original)
+++ branches/release/libs/chrono/doc/Jamfile.v2 2012-07-14 12:05:50 EDT (Sat, 14 Jul 2012)
@@ -72,5 +72,6 @@
<format>pdf:<xsl:param>boost.url.prefix=http://www.boost.org/doc/libs/release/libs/chrono/doc/html
;
-install pdf-install : standalone : <location>. <install-type>PDF ;
+install pdfinstall : standalone/<format>pdf : <location>. <install-type>PDF ;
+explicit pdfinstall ;
Modified: branches/release/libs/config/doc/Jamfile.v2
==============================================================================
--- branches/release/libs/config/doc/Jamfile.v2 (original)
+++ branches/release/libs/config/doc/Jamfile.v2 2012-07-14 12:05:50 EDT (Sat, 14 Jul 2012)
@@ -56,6 +56,7 @@
;
-install pdf-install : standalone : <location>. <install-type>PDF ;
+install pdfinstall : standalone/<format>pdf : <location>. <install-type>PDF ;
+explicit pdfinstall ;
Modified: branches/release/libs/container/doc/Jamfile.v2
==============================================================================
--- branches/release/libs/container/doc/Jamfile.v2 (original)
+++ branches/release/libs/container/doc/Jamfile.v2 2012-07-14 12:05:50 EDT (Sat, 14 Jul 2012)
@@ -85,5 +85,5 @@
<format>pdf:<xsl:param>admon.graphics.extension=".svg"
;
-install pdf-install : standalone : <install-type>PDF <location>. <name>container.pdf ;
-explicit pdf-install ;
+install pdfinstall : standalone/<format>pdf : <install-type>PDF <location>. <name>container.pdf ;
+explicit pdfinstall ;
Modified: branches/release/libs/functional/overloaded_function/doc/Jamfile.v2
==============================================================================
--- branches/release/libs/functional/overloaded_function/doc/Jamfile.v2 (original)
+++ branches/release/libs/functional/overloaded_function/doc/Jamfile.v2 2012-07-14 12:05:50 EDT (Sat, 14 Jul 2012)
@@ -28,5 +28,5 @@
<format>pdf:<xsl:param>boost.url.prefix=http://www.boost.org/doc/libs/release/libs/functional/overloaded_function/doc/html
;
-install pdf-install : doc : <location>. <install-type>PDF <name>overloaded_function.pdf ;
-explicit pdf-install ;
+install pdfinstall : doc/<format>pdf : <location>. <install-type>PDF <name>overloaded_function.pdf ;
+explicit pdfinstall ;
Modified: branches/release/libs/integer/doc/Jamfile.v2
==============================================================================
--- branches/release/libs/integer/doc/Jamfile.v2 (original)
+++ branches/release/libs/integer/doc/Jamfile.v2 2012-07-14 12:05:50 EDT (Sat, 14 Jul 2012)
@@ -50,6 +50,7 @@
<format>pdf:<xsl:param>boost.url.prefix=http://www.boost.org/doc/libs/release/libs/regex/doc/html
;
-install pdf-install : standalone : <location>. <install-type>PDF ;
+install pdfinstall : standalone/<format>pdf : <location>. <install-type>PDF ;
+explicit pdfinstall ;
Modified: branches/release/libs/interprocess/doc/Jamfile.v2
==============================================================================
--- branches/release/libs/interprocess/doc/Jamfile.v2 (original)
+++ branches/release/libs/interprocess/doc/Jamfile.v2 2012-07-14 12:05:50 EDT (Sat, 14 Jul 2012)
@@ -90,5 +90,5 @@
;
-install pdf-install : standalone : <location>. <name>interprocess.pdf <install-type>PDF <format>pdf ;
-explicit pdf-install ;
+install pdfinstall : standalone/<format>pdf : <location>. <name>interprocess.pdf <install-type>PDF <format>pdf ;
+explicit pdfinstall ;
Modified: branches/release/libs/intrusive/doc/Jamfile.v2
==============================================================================
--- branches/release/libs/intrusive/doc/Jamfile.v2 (original)
+++ branches/release/libs/intrusive/doc/Jamfile.v2 2012-07-14 12:05:50 EDT (Sat, 14 Jul 2012)
@@ -91,5 +91,5 @@
;
-install pdf-install : standalone : <name>intrusive.pdf <location>. <install-type>PDF <format>pdf ;
-explicit pdf-install ;
+install pdfinstall : standalone/<format>pdf : <name>intrusive.pdf <location>. <install-type>PDF <format>pdf ;
+explicit pdfinstall ;
Modified: branches/release/libs/local_function/doc/Jamfile.v2
==============================================================================
--- branches/release/libs/local_function/doc/Jamfile.v2 (original)
+++ branches/release/libs/local_function/doc/Jamfile.v2 2012-07-14 12:05:50 EDT (Sat, 14 Jul 2012)
@@ -47,5 +47,5 @@
<format>pdf:<xsl:param>draft.mode="no"
;
-install pdf-install : doc : <location>. <install-type>PDF <name>local_function.pdf ;
-explicit pdf-install ;
+install pdfinstall : doc/<format>pdf : <location>. <install-type>PDF <name>local_function.pdf ;
+explicit pdfinstall ;
Modified: branches/release/libs/math/doc/sf_and_dist/Jamfile.v2
==============================================================================
--- branches/release/libs/math/doc/sf_and_dist/Jamfile.v2 (original)
+++ branches/release/libs/math/doc/sf_and_dist/Jamfile.v2 2012-07-14 12:05:50 EDT (Sat, 14 Jul 2012)
@@ -77,7 +77,8 @@
<format>pdf:<xsl:param>index.on.type=1
;
-install pdf-install : standalone : <location>. <install-type>PDF <name>math.pdf ;
+install pdfinstall : standalone/<format>pdf : <location>. <install-type>PDF <name>math.pdf ;
+explicit pdfinstall ;
Modified: branches/release/libs/pool/doc/jamfile.v2
==============================================================================
--- branches/release/libs/pool/doc/jamfile.v2 (original)
+++ branches/release/libs/pool/doc/jamfile.v2 2012-07-14 12:05:50 EDT (Sat, 14 Jul 2012)
@@ -135,3 +135,5 @@
<dependency>autodoc #
;
+install pdfinstall : standalone/<format>pdf : <location>. <install-type>PDF <name>pool.pdf ;
+explicit pdfinstall ;
Modified: branches/release/libs/ratio/doc/Jamfile.v2
==============================================================================
--- branches/release/libs/ratio/doc/Jamfile.v2 (original)
+++ branches/release/libs/ratio/doc/Jamfile.v2 2012-07-14 12:05:50 EDT (Sat, 14 Jul 2012)
@@ -72,4 +72,5 @@
<format>pdf:<xsl:param>boost.url.prefix=http://www.boost.org/doc/libs/release/libs/ratio/doc/html
;
-install pdf-install : standalone : <location>. <install-type>PDF ;
+install pdfinstall : standalone/<format>pdf : <location>. <install-type>PDF ;
+explicit pdfinstall ;
\ No newline at end of file
Modified: branches/release/libs/type_traits/doc/Jamfile.v2
==============================================================================
--- branches/release/libs/type_traits/doc/Jamfile.v2 (original)
+++ branches/release/libs/type_traits/doc/Jamfile.v2 2012-07-14 12:05:50 EDT (Sat, 14 Jul 2012)
@@ -66,7 +66,7 @@
<auto-index>on
;
-install pdf-install : standalone : <install-type>PDF <location>. <name>type_traits.pdf ;
-
+install pdfinstall : standalone/<format>pdf : <install-type>PDF <location>. <name>type_traits.pdf ;
+explicit pdfinstall ;
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk