|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r78845 - in trunk: doc/pdf libs/container/doc libs/functional/overloaded_function/doc libs/geometry/doc libs/interprocess/doc libs/intrusive/doc libs/local_function/doc libs/utility/identity_type/doc
From: john_at_[hidden]
Date: 2012-06-07 08:32:57
Author: johnmaddock
Date: 2012-06-07 08:32:56 EDT (Thu, 07 Jun 2012)
New Revision: 78845
URL: http://svn.boost.org/trac/boost/changeset/78845
Log:
Changes required to build PDF versions of docs.
Text files modified:
trunk/doc/pdf/Jamfile.v2 | 50 ++++++++++++++++++++++++++++-----------
trunk/doc/pdf/build | 15 +++++++++--
trunk/libs/container/doc/Jamfile.v2 | 13 ++++++++-
trunk/libs/functional/overloaded_function/doc/Jamfile.v2 | 4 +++
trunk/libs/geometry/doc/Jamfile.v2 | 2 +
trunk/libs/interprocess/doc/Jamfile.v2 | 8 ++++-
trunk/libs/intrusive/doc/Jamfile.v2 | 8 ++++-
trunk/libs/local_function/doc/Jamfile.v2 | 11 ++++++++
trunk/libs/utility/identity_type/doc/Jamfile.v2 | 13 ++++++++++
9 files changed, 101 insertions(+), 23 deletions(-)
Modified: trunk/doc/pdf/Jamfile.v2
==============================================================================
--- trunk/doc/pdf/Jamfile.v2 (original)
+++ trunk/doc/pdf/Jamfile.v2 2012-06-07 08:32:56 EDT (Thu, 07 Jun 2012)
@@ -10,6 +10,9 @@
import doxygen ;
import quickbook ;
+project : requirements <include>../../libs/geometry/doc ;
+
+
boostbook array_docs
: ../../libs/array/doc/array.xml
@@ -31,47 +34,55 @@
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 @@
<location>.
<install-type>PDF
<format>pdf
- <name>phoenix.pdf
+ <name>spirit-phoenix-v2.pdf
;
install boost-build-install
@@ -151,14 +162,25 @@
# Just copy the MSM PDF over:
install msm_install : ../../libs/msm/doc/pdf/msm.pdf : <location>. ;
+install spirit-install
+ :
+ ../../libs/spirit/doc//spirit2
+ :
+ <location>.
+ <install-type>PDF
+ <format>pdf
+ <name>spirit2.pdf
+;
-
-
-
-
-
-
-
+install scope_exit_install
+ :
+ ../../libs/scope_exit/doc//doc
+ :
+ <location>.
+ <install-type>PDF
+ <format>pdf
+ <name>scope_exit.pdf
+;
Modified: trunk/doc/pdf/build
==============================================================================
--- trunk/doc/pdf/build (original)
+++ trunk/doc/pdf/build 2012-06-07 08:32:56 EDT (Thu, 07 Jun 2012)
@@ -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
-
-
Modified: trunk/libs/container/doc/Jamfile.v2
==============================================================================
--- trunk/libs/container/doc/Jamfile.v2 (original)
+++ trunk/libs/container/doc/Jamfile.v2 2012-06-07 08:32:56 EDT (Thu, 07 Jun 2012)
@@ -13,6 +13,7 @@
using auto-index ;
path-constant images_location : html ;
+path-constant here : . ;
doxygen autodoc
:
@@ -70,7 +71,7 @@
<format>html:<auto-index-internal>on
# Set the name of the script file to use (index.idx is popular):
- <auto-index-script>index.idx
+ <auto-index-script>$(here)/index.idx
# Commands in the script file should all use RELATIVE PATHS
# otherwise the script will not be portable to other machines.
# Relative paths are normally taken as relative to the location
@@ -79,6 +80,14 @@
# The path specified by <auto-index-prefix> may be either relative or
# absolute, for example the following will get us up to the boost root
# directory for most Boost libraries:
- <auto-index-prefix>"../../.."
+ <auto-index-prefix>"$(here)/../../.."
+ <format>pdf:<xsl:param>admon.graphics.extension=".svg"
;
+
+install pdf-install : standalone : <install-type>PDF <location>. <name>container.pdf ;
+
+
+
+
+
Modified: trunk/libs/functional/overloaded_function/doc/Jamfile.v2
==============================================================================
--- trunk/libs/functional/overloaded_function/doc/Jamfile.v2 (original)
+++ trunk/libs/functional/overloaded_function/doc/Jamfile.v2 2012-06-07 08:32:56 EDT (Thu, 07 Jun 2012)
@@ -28,3 +28,7 @@
<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 ;
+
+
+
Modified: trunk/libs/geometry/doc/Jamfile.v2
==============================================================================
--- trunk/libs/geometry/doc/Jamfile.v2 (original)
+++ trunk/libs/geometry/doc/Jamfile.v2 2012-06-07 08:32:56 EDT (Thu, 07 Jun 2012)
@@ -41,3 +41,5 @@
<format>pdf:<xsl:param>img.src.path=$(images_location)/
;
+install pdf-install : geometry : <location>. <name>geometry.pdf <install-type>PDF ;
+
Modified: trunk/libs/interprocess/doc/Jamfile.v2
==============================================================================
--- trunk/libs/interprocess/doc/Jamfile.v2 (original)
+++ trunk/libs/interprocess/doc/Jamfile.v2 2012-06-07 08:32:56 EDT (Thu, 07 Jun 2012)
@@ -11,6 +11,7 @@
import doxygen ;
import quickbook ;
+path-constant here : . ;
doxygen autodoc
:
@@ -76,7 +77,7 @@
<format>html:<auto-index-internal>on
# Set the name of the script file to use (index.idx is popular):
- <auto-index-script>index.idx
+ <auto-index-script>$(here)/index.idx
# Commands in the script file should all use RELATIVE PATHS
# otherwise the script will not be portable to other machines.
# Relative paths are normally taken as relative to the location
@@ -85,6 +86,9 @@
# The path specified by <auto-index-prefix> may be either relative or
# absolute, for example the following will get us up to the boost root
# directory for most Boost libraries:
- <auto-index-prefix>"../../.."
+ <auto-index-prefix>"$(here)/../../.."
;
+
+install pdf-install : standalone : <location>. <name>interprocess.pdf <install-type>PDF <format>pdf ;
+
Modified: trunk/libs/intrusive/doc/Jamfile.v2
==============================================================================
--- trunk/libs/intrusive/doc/Jamfile.v2 (original)
+++ trunk/libs/intrusive/doc/Jamfile.v2 2012-06-07 08:32:56 EDT (Thu, 07 Jun 2012)
@@ -11,6 +11,7 @@
import doxygen ;
import quickbook ;
+path-constant here : . ;
doxygen autodoc
:
@@ -77,7 +78,7 @@
<format>html:<auto-index-internal>on
# Set the name of the script file to use (index.idx is popular):
- <auto-index-script>index.idx
+ <auto-index-script>$(here)/index.idx
# Commands in the script file should all use RELATIVE PATHS
# otherwise the script will not be portable to other machines.
# Relative paths are normally taken as relative to the location
@@ -86,6 +87,9 @@
# The path specified by <auto-index-prefix> may be either relative or
# absolute, for example the following will get us up to the boost root
# directory for most Boost libraries:
- <auto-index-prefix>"../../.."
+ <auto-index-prefix>"$(here)/../../.."
;
+
+install : standalone : <name>intrusive.pdf <location>. <install-type>PDF <format>pdf ;
+
Modified: trunk/libs/local_function/doc/Jamfile.v2
==============================================================================
--- trunk/libs/local_function/doc/Jamfile.v2 (original)
+++ trunk/libs/local_function/doc/Jamfile.v2 2012-06-07 08:32:56 EDT (Thu, 07 Jun 2012)
@@ -8,6 +8,9 @@
import quickbook ;
using boostbook ;
+path-constant images_location : html ;
+path-constant here : . ;
+
doxygen reference
: ../../../boost/local_function.hpp
../../../boost/local_function/config.hpp
@@ -39,5 +42,13 @@
: <xsl:param>boost.root=../../../..
<xsl:param>boost.defaults=Boost
<format>pdf:<xsl:param>boost.url.prefix=http://www.boost.org/doc/libs/release/libs/local_function/doc/html
+ <format>pdf:<xsl:param>admon.graphics.extension=".svg"
+ <format>pdf:<xsl:param>img.src.path=$(images_location)/
+ <format>pdf:<xsl:param>draft.mode="no"
;
+install pdf-install : doc : <location>. <install-type>PDF <name>local_function.pdf ;
+
+
+
+
Modified: trunk/libs/utility/identity_type/doc/Jamfile.v2
==============================================================================
--- trunk/libs/utility/identity_type/doc/Jamfile.v2 (original)
+++ trunk/libs/utility/identity_type/doc/Jamfile.v2 2012-06-07 08:32:56 EDT (Thu, 07 Jun 2012)
@@ -29,3 +29,16 @@
<xsl:param>boost.root=../../../../..
;
+#
+# This is very imperfect - it results in both html and pdf docs being built,
+# for some reason I can't get the "onehtml" format specified above to play nice
+# with the usual incantations for mixed pdf/html builds. JM 06/2012.
+#
+boostbook pdf_doc : index
+ :
+ <format>pdf
+ <format>html:<build>no
+ ;
+
+install pdf_doc_install : pdf_doc : <location>. <name>identity_type.pdf <install-type>PDF ;
+
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