diff options
| author | John Maddock <john@johnmaddock.co.uk> | 2012-07-14 16:05:50 +0000 |
|---|---|---|
| committer | John Maddock <john@johnmaddock.co.uk> | 2012-07-14 16:05:50 +0000 |
| commit | 8efc16eed52a75f7ef708a225b1f9d90f373d549 (patch) | |
| tree | f8b9b745ad37d72347c221de6bb48340f5bb515b /doc/pdf | |
| parent | bf7414c90a5f7b93a42afd40375db4bac1817e17 (diff) | |
| download | boost-8efc16eed52a75f7ef708a225b1f9d90f373d549.tar.gz | |
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).
[SVN r79500]
Diffstat (limited to 'doc/pdf')
| -rw-r--r-- | doc/pdf/Jamfile.v2 | 6 | ||||
| -rw-r--r-- | doc/pdf/build | 14 |
2 files changed, 10 insertions, 10 deletions
diff --git a/doc/pdf/Jamfile.v2 b/doc/pdf/Jamfile.v2 index 597aad01e5..34633abb03 100644 --- a/doc/pdf/Jamfile.v2 +++ b/doc/pdf/Jamfile.v2 @@ -40,7 +40,7 @@ install pdf-install ../../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 @@ install pdf-install ../../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 @@ install pdf-install ../../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 diff --git a/doc/pdf/build b/doc/pdf/build index 24aba71276..61a5926fc5 100644 --- a/doc/pdf/build +++ b/doc/pdf/build @@ -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 |