From 376e7a8791aba13c8d34ced573dffbe8e845f290 Mon Sep 17 00:00:00 2001
From: Daniel James <daniel@calamity.org.uk>
Date: Sun, 24 Feb 2013 14:46:28 +0000
Subject: Merge auto-index fixes. Fixes #7899.

[SVN r83132]
---
 doc/Jamfile.v2 | 38 +++++++++++++++++++++++++++++---------
 1 file changed, 29 insertions(+), 9 deletions(-)

(limited to 'doc/Jamfile.v2')

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 ;
 
 
+
-- 
cgit v1.2.1