[Boost-commit] svn:boost r83050 - in trunk: doc libs/container/doc libs/interprocess/doc libs/intrusive/doc

Subject: [Boost-commit] svn:boost r83050 - in trunk: doc libs/container/doc libs/interprocess/doc libs/intrusive/doc
From: john_at_[hidden]
Date: 2013-02-20 13:29:32

Author: johnmaddock
Date: 2013-02-20 13:29:30 EST (Wed, 20 Feb 2013)
New Revision: 83050
URL: http://svn.boost.org/trac/boost/changeset/83050

Log:
Fix broken links in doc build.
Move some xsl:param's into individual library's Jamfiles.
Refs #7899.
Text files modified: 
   trunk/doc/Jamfile.v2                   |    24 +++++++++++++++++-------                
   trunk/libs/container/doc/Jamfile.v2    |     7 +++++--                                 
   trunk/libs/interprocess/doc/Jamfile.v2 |     7 +++++--                                 
   trunk/libs/intrusive/doc/Jamfile.v2    |     7 +++++--                                 
   4 files changed, 32 insertions(+), 13 deletions(-)

Modified: trunk/doc/Jamfile.v2
==============================================================================
--- trunk/doc/Jamfile.v2	(original)
+++ trunk/doc/Jamfile.v2	2013-02-20 13:29:30 EST (Wed, 20 Feb 2013)
@@ -15,7 +15,16 @@
 # generation is also so slow that it's impractical for a build this large (takes ~ 9 hrs
 # to build with just 3 indexed libraries).  Hence we refer to these libraries as for example:
 #
-# ../libs/interprocess/doc//standalone/<format>docbook/<auto-index-internal>on
+# ../libs/interprocess/doc//standalone/<format>docbook
+#
+# Within each library that uses this, make sure that the boostbook target contains
+#
+# <format>docbook:<auto-index-internal>on
+#
+# And if boost.root is set, restrict it to local html builds using:
+#
+# <format>html:<xsl:param>boost.root=../../../..
+# <format>html:<xsl:param>boost.libraries=../../../../libs/libraries.htm
 #
 # Finally, in boost.xml we xi:include interproces.auto_index.docbook which is the final
 # post-index generation docbook, rather than interprocess.xml which is the pre-indexed boostbook.
@@ -57,11 +66,11 @@
     <dependency>../libs/date_time/xmldoc//local_time_autodoc.xml
     <dependency>../tools/build/v2/doc//jam_docs
     <dependency>../tools/quickbook/doc//quickbook
-    <dependency>../libs/interprocess/doc//standalone/<format>docbook/<auto-index-internal>on
-    <dependency>../libs/intrusive/doc//standalone/<format>docbook/<auto-index-internal>on
+    <dependency>../libs/interprocess/doc//standalone/<format>docbook
+    <dependency>../libs/intrusive/doc//standalone/<format>docbook
     <dependency>../libs/move/doc//autodoc.xml
     <dependency>../libs/move/doc//move
-    <dependency>../libs/container/doc//standalone/<format>docbook/<auto-index-internal>on
+    <dependency>../libs/container/doc//standalone/<format>docbook
     <dependency>../libs/units/doc//units
     <dependency>../libs/unordered/doc//unordered
     <dependency>../libs/thread/doc//thread
@@ -92,9 +101,9 @@
     <implicit-dependency>../tools/build/v2/doc//jam_docs
     <implicit-dependency>../tools/quickbook/doc//quickbook
     <implicit-dependency>../libs/mpi/doc//mpi
-    <implicit-dependency>../libs/container/doc//standalone/<format>docbook/<auto-index-internal>on
-    <implicit-dependency>../libs/interprocess/doc//standalone/<format>docbook/<auto-index-internal>on
-    <implicit-dependency>../libs/intrusive/doc//standalone/<format>docbook/<auto-index-internal>on
+    <implicit-dependency>../libs/container/doc//standalone/<format>docbook
+    <implicit-dependency>../libs/interprocess/doc//standalone/<format>docbook
+    <implicit-dependency>../libs/intrusive/doc//standalone/<format>docbook
     <implicit-dependency>../libs/move/doc//move
     <implicit-dependency>../libs/units/doc//units
     <implicit-dependency>../libs/unordered/doc//unordered
@@ -118,3 +127,4 @@
 explicit callouts ;
 
 
+

Modified: trunk/libs/container/doc/Jamfile.v2
==============================================================================
--- trunk/libs/container/doc/Jamfile.v2	(original)
+++ trunk/libs/container/doc/Jamfile.v2	2013-02-20 13:29:30 EST (Wed, 20 Feb 2013)
@@ -48,8 +48,8 @@
    :
       container
    :
-        <xsl:param>boost.root=../../../..
-        <xsl:param>boost.libraries=../../../../libs/libraries.htm
+        <format>html:<xsl:param>boost.root=../../../..
+        <format>html:<xsl:param>boost.libraries=../../../../libs/libraries.htm
         <xsl:param>generate.section.toc.level=3
         <xsl:param>chunk.first.sections=1
         <format>pdf:<xsl:param>img.src.path=$(images_location)/
@@ -71,6 +71,7 @@
        
         # Choose indexing method for html:
         <format>html:<auto-index-internal>on
+        <format>docbook:<auto-index-internal>on
        
         # Set the name of the script file to use (index.idx is popular):
         <auto-index-script>$(here)/index.idx
@@ -89,3 +90,5 @@
 
 install pdfinstall : standalone/<format>pdf : <install-type>PDF <location>. <name>container.pdf ;
 explicit pdfinstall ;
+
+

Modified: trunk/libs/interprocess/doc/Jamfile.v2
==============================================================================
--- trunk/libs/interprocess/doc/Jamfile.v2	(original)
+++ trunk/libs/interprocess/doc/Jamfile.v2	2013-02-20 13:29:30 EST (Wed, 20 Feb 2013)
@@ -52,8 +52,8 @@
    :
       interprocess
    :
-        <xsl:param>boost.root=../../../..
-        <xsl:param>boost.libraries=../../../../libs/libraries.htm
+        <format>html:<xsl:param>boost.root=../../../..
+        <format>html:<xsl:param>boost.libraries=../../../../libs/libraries.htm
         <xsl:param>toc.max.depth=1
         <xsl:param>toc.section.depth=2
         <xsl:param>chunk.first.sections=1
@@ -75,6 +75,7 @@
 
         # Choose indexing method for html:
         <format>html:<auto-index-internal>on
+        <format>docbook:<auto-index-internal>on
 
         # Set the name of the script file to use (index.idx is popular):
         <auto-index-script>$(here)/index.idx
@@ -92,3 +93,5 @@
 
 install pdfinstall : standalone/<format>pdf : <location>. <name>interprocess.pdf <install-type>PDF <format>pdf ;
 explicit pdfinstall ;
+
+

Modified: trunk/libs/intrusive/doc/Jamfile.v2
==============================================================================
--- trunk/libs/intrusive/doc/Jamfile.v2	(original)
+++ trunk/libs/intrusive/doc/Jamfile.v2	2013-02-20 13:29:30 EST (Wed, 20 Feb 2013)
@@ -55,8 +55,8 @@
    :
       intrusive
    :
-        <xsl:param>boost.root=../../../..
-        <xsl:param>boost.libraries=../../../../libs/libraries.htm
+        <format>html:<xsl:param>boost.root=../../../..
+        <format>html:<xsl:param>boost.libraries=../../../../libs/libraries.htm
         <xsl:param>generate.section.toc.level=3
         <xsl:param>chunk.first.sections=1
         <dependency>autodoc
@@ -76,6 +76,7 @@
 
         # Choose indexing method for html:
         <format>html:<auto-index-internal>on
+        <format>docbook:<auto-index-internal>on
 
         # Set the name of the script file to use (index.idx is popular):
         <auto-index-script>$(here)/index.idx
@@ -93,3 +94,5 @@
 
 install pdfinstall : standalone/<format>pdf : <name>intrusive.pdf <location>. <install-type>PDF <format>pdf ;
 explicit pdfinstall ;
+
+