From 6b737dfbcc61b343d6d33895e7399d8636870636 Mon Sep 17 00:00:00 2001 From: John Maddock Date: Thu, 7 Jun 2012 12:32:56 +0000 Subject: [PATCH] Changes required to build PDF versions of docs. [SVN r78845] --- doc/pdf/Jamfile.v2 | 52 ++++++++++++++++++++++++++++++++------------- doc/pdf/build | 15 ++++++++++--- libs/container | 2 +- libs/functional | 2 +- libs/geometry | 2 +- libs/interprocess | 2 +- libs/intrusive | 2 +- libs/local_function | 2 +- libs/utility | 2 +- 9 files changed, 56 insertions(+), 25 deletions(-) diff --git a/doc/pdf/Jamfile.v2 b/doc/pdf/Jamfile.v2 index 8ca87a691d..597aad01e5 100644 --- a/doc/pdf/Jamfile.v2 +++ b/doc/pdf/Jamfile.v2 @@ -10,6 +10,9 @@ import common ; import doxygen ; import quickbook ; +project : requirements ../../libs/geometry/doc ; + + boostbook array_docs : ../../libs/array/doc/array.xml @@ -31,47 +34,55 @@ install pdf-install any_docs ../../libs/accumulators/doc//standalone ../../libs/algorithm/string/doc//string_algo + ../../libs/algorithm/doc//standalone ../../libs/bimap/doc//standalone ../../libs/bind/doc//ref-doc + ../../libs/chrono/doc//standalone ../../libs/concept_check/doc//concepts ../../libs/config/doc//standalone + #../../libs/container/doc//pdf-install + ../../libs/conversion/doc//standalone ../../libs/date_time/xmldoc//date_time ../../libs/foreach/doc//standalone ../../libs/function/doc//function-doc ../../libs/functional/factory/doc//standalone ../../libs/functional/forward/doc//standalone ../../libs/functional/hash/doc//standalone +# ../../libs/functional/overloaded_function/doc//doc ../../libs/fusion/doc//quickbook - ../../libs/interprocess/doc//standalone + #../../libs/geometry/doc//geometry + ../../libs/icl/doc//standalone ../../libs/integer/doc//standalone - ../../libs/intrusive/doc//standalone ../../libs/iterator/doc//standalone ../../libs/lambda/doc//lambda-doc +# ../../libs/local_function/doc//doc ../../libs/logic/doc//tribool ../../libs/math/doc/complex//standalone ../../libs/math/doc/octonion//standalone ../../libs/math/doc/quaternion//standalone ../../libs/math/doc/gcd//standalone - ../../libs/math/doc/sf_and_dist//standalone + ../../libs/math/doc/sf_and_dist//pdf-install + ../../libs/move/doc//standalone ../../libs/mpi/doc//standalone ../../libs/numeric/conversion/doc//standalone ../../libs/optional/doc//standalone + ../../libs/phoenix/doc//phoenix-doc ../../libs/program_options/doc//program_option ../../libs/property_tree/doc//standalone ../../libs/proto/doc//standalone # Invalid Jamfile, doesn't use Boostbook anyway?? #../../libs/ptr_container/doc//standalone + ../../libs/ratio/doc//standalone ../../libs/regex/doc//standalone - ../../libs/scope_exit/doc//standalone ../../libs/signals/doc//doc - ../../libs/spirit/doc//spirit2 ../../libs/spirit/repository/doc//spirit2_repository ../../libs/static_assert/doc//standalone ../../libs/thread/doc//standalone ../../libs/tr1/doc//standalone - ../../libs/type_traits/doc//standalone + ../../libs/type_traits/doc//pdf-install ../../libs/typeof/doc//standalone ../../libs/units/doc//standalone +# ../../libs/utility/identity_type/doc//doc ../../libs/unordered/doc//standalone ../../libs/variant/doc//variant-doc ../../libs/xpressive/doc//standalone @@ -114,7 +125,7 @@ install phoenix-install . PDF pdf - phoenix.pdf + spirit-phoenix-v2.pdf ; install boost-build-install @@ -151,14 +162,25 @@ install range-install # Just copy the MSM PDF over: install msm_install : ../../libs/msm/doc/pdf/msm.pdf : . ; - - - - - - - - +install spirit-install + : + ../../libs/spirit/doc//spirit2 + : + . + PDF + pdf + spirit2.pdf +; + +install scope_exit_install + : + ../../libs/scope_exit/doc//doc + : + . + PDF + pdf + scope_exit.pdf +; diff --git a/doc/pdf/build b/doc/pdf/build index c3aa9e3e50..24aba71276 100644 --- a/doc/pdf/build +++ b/doc/pdf/build @@ -1,11 +1,20 @@ #!/bin/bash boost_version=$(grep 'define.*BOOST_LIB_VERSION' ../../boost/version.hpp | sed 's/.*"\([^"]*\)".*/\1/') echo Boost version tag = $boost_version -bjam -a pdf xsl:param=fop1.extensions=0 xsl:param=xep.extensions=1 +(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/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 +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 +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 mv *.pdf boost_${boost_version}_pdf - - diff --git a/libs/container b/libs/container index 082c47b721..4f013bfcce 160000 --- a/libs/container +++ b/libs/container @@ -1 +1 @@ -Subproject commit 082c47b72196310aa64df7260ef40eee69a4b2ea +Subproject commit 4f013bfcce9b2659c910a5212d9bd509fb403320 diff --git a/libs/functional b/libs/functional index b839b806cf..b5d39108b2 160000 --- a/libs/functional +++ b/libs/functional @@ -1 +1 @@ -Subproject commit b839b806cfaafbd2e38d33dbb7760305f31eec94 +Subproject commit b5d39108b2634d19567568f0c972781ec3ab69cf diff --git a/libs/geometry b/libs/geometry index 24ab79556d..abc9585a10 160000 --- a/libs/geometry +++ b/libs/geometry @@ -1 +1 @@ -Subproject commit 24ab79556dd8591126d4be28b117b7bf2fc9430a +Subproject commit abc9585a10b27234b085b98d53144f569d433b0a diff --git a/libs/interprocess b/libs/interprocess index 26d2be20ad..1dcc0b8479 160000 --- a/libs/interprocess +++ b/libs/interprocess @@ -1 +1 @@ -Subproject commit 26d2be20adc2d1043a408d74d26bd470d211a92f +Subproject commit 1dcc0b8479c776b616e6f3a986b7a6084c9a47ef diff --git a/libs/intrusive b/libs/intrusive index 27a8cf203e..24ffb35f13 160000 --- a/libs/intrusive +++ b/libs/intrusive @@ -1 +1 @@ -Subproject commit 27a8cf203ea1356a836ee330e68c8ecdc6f1f15a +Subproject commit 24ffb35f130bc7b2e135b31a9bd9e57f883a0fe4 diff --git a/libs/local_function b/libs/local_function index 8bcae38558..92b7f4a14a 160000 --- a/libs/local_function +++ b/libs/local_function @@ -1 +1 @@ -Subproject commit 8bcae38558f3c89cc5c3f458b945138e5e8d3319 +Subproject commit 92b7f4a14ac9f5e05c80552125f9ed43c71f5d9f diff --git a/libs/utility b/libs/utility index 8036d4370f..a201cbe646 160000 --- a/libs/utility +++ b/libs/utility @@ -1 +1 @@ -Subproject commit 8036d4370f7c67634143a8acea238915032ba96e +Subproject commit a201cbe64621478f48d5a076bec7c95eb4de0caf