Merge auto-index fixes. Fixes #7899.

[SVN r83132]

5 files changed, 33 insertions, 12 deletions

diff --git a/doc/Jamfile.v2 b/doc/Jamfile.v2
index 2d1ddc4e20..c783c52e5f 100644
--- a/doc/Jamfile.v2
+++ b/doc/Jamfile.v2
@@ -8,6 +8,28 @@ import boostbook : boostbook ;
 
 alias asio : ../libs/asio/doc//asio/<xsl:param>boost.libraries=../../libs/libraries.htm ;
 
+#
+# Note that when refering to libraries that use auto-index we must process all the way to
+# docbook before including here.  We must also ensure that auto-index uses it's own index
+# generation, otherwise we get one big index that's repeated in each library.  Xslt's index
+# 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
+#
+# 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.
+#
+
 boostbook doc
     :
     src/boost.xml
@@ -44,14 +66,11 @@ boostbook doc
     <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//autodoc.xml
-    <dependency>../libs/interprocess/doc//interprocess
-    <dependency>../libs/intrusive/doc//autodoc.xml
-    <dependency>../libs/intrusive/doc//intrusive
+    <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//autodoc.xml
-    <dependency>../libs/container/doc//container
+    <dependency>../libs/container/doc//standalone/<format>docbook
     <dependency>../libs/units/doc//units
     <dependency>../libs/unordered/doc//unordered
     <dependency>../libs/thread/doc//thread
@@ -82,9 +101,9 @@ boostbook doc
     <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//container
-    <implicit-dependency>../libs/interprocess/doc//interprocess
-    <implicit-dependency>../libs/intrusive/doc//intrusive
+    <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
@@ -108,3 +127,4 @@ install callouts : [ glob src/images/callouts/*.png ] : <location>html/images/ca
 explicit callouts ;
 
 
+
diff --git a/doc/src/boost.xml b/doc/src/boost.xml
index 07f4e76470..32643f8582 100644
--- a/doc/src/boost.xml
+++ b/doc/src/boost.xml
@@ -189,7 +189,7 @@
      </libraryinfo>
    </library>
 
-   <xi:include href="container.xml"/>
+   <xi:include href="container.auto_index.docbook"/>
 
    <library name="Conversion" dirname="conversion" html-only="1"
             url="../../libs/conversion/index.html">
@@ -312,7 +312,7 @@
      </libraryinfo>
    </library>
 
-   <xi:include href="interprocess.xml"/>
+   <xi:include href="interprocess.auto_index.docbook"/>
 
    <library name="Interval" dirname="numeric/interval" html-only="1"
             url="../../libs/numeric/interval/doc/index.html">
@@ -335,7 +335,7 @@
      </libraryinfo>
    </library>
 
-   <xi:include href="intrusive.xml"/>
+   <xi:include href="intrusive.auto_index.docbook"/>
 
    <library name="I/O State Savers" dirname="io" html-only="1">
      <libraryinfo>
@@ -771,3 +771,4 @@
 </boostbook>
 
 
+
diff --git a/libs/container b/libs/container
-Subproject 368a0caec973f685640aef74ade1c15f06190ab
+Subproject 14f376128a25d6aef044e405d7f7c9e76a14e7a
diff --git a/libs/interprocess b/libs/interprocess
-Subproject 0d1d9397197c20d73940c46ab8c6ab197f29f61
+Subproject 7123037c352d287f263ba1e3066f316306cc888
diff --git a/libs/intrusive b/libs/intrusive
-Subproject e3773373d78d5d3e1ae4497b1adc26c6ef326bb
+Subproject 8b917e96a7bb7317fee693611b4834c4ae55315