From 0ba45baa19d37976a517d7663b820b4aebac39a3 Mon Sep 17 00:00:00 2001
From: mat007 <mat007@860be788-9bd5-4423-9f1e-828f051e677b>
Date: Sat, 24 May 2014 07:23:46 +0000
Subject: [PATCH] Fixed documentation generation

git-svn-id: https://svn.code.sf.net/p/turtle/code/trunk@741 860be788-9bd5-4423-9f1e-828f051e677b
---
 build/boost/doc/Jamfile.jam                   |  5 +++--
 build/{boost/doc => boostbook}/xsl/navbar.xsl |  0
 build/build.xml                               | 14 ++++++++++----
 3 files changed, 13 insertions(+), 6 deletions(-)
 rename build/{boost/doc => boostbook}/xsl/navbar.xsl (100%)

diff --git a/build/boost/doc/Jamfile.jam b/build/boost/doc/Jamfile.jam
index 95bad42..f407aed 100644
--- a/build/boost/doc/Jamfile.jam
+++ b/build/boost/doc/Jamfile.jam
@@ -6,8 +6,7 @@
 # accompanying file LICENSE_1_0.txt or copy at
 # http://www.boost.org/LICENSE_1_0.txt)
 
-import path ;
-using boostbook : : : [ path.pwd ] ;
+using boostbook ;
 using quickbook ;
 using doxygen ;
 
@@ -32,6 +31,7 @@ boostbook standalone
     mock
   :
 #    <dependency>reference
+    <xsl:param>boost.root=../../../..
     <xsl:param>boost.image.src=images/boost.png
     <xsl:param>chunk.first.sections=1
 #    <xsl:param>toc.max.depth=3
@@ -39,6 +39,7 @@ boostbook standalone
     <xsl:param>nav.layout=horizontal
 ;
 
+# not needed anymore once in boost
 project example
   : requirements
    <include>../../../../..
diff --git a/build/boost/doc/xsl/navbar.xsl b/build/boostbook/xsl/navbar.xsl
similarity index 100%
rename from build/boost/doc/xsl/navbar.xsl
rename to build/boostbook/xsl/navbar.xsl
diff --git a/build/build.xml b/build/build.xml
index 0ef14f7..a2aa700 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -5,6 +5,7 @@
 
   <property name="boost.root" value="${env.BOOST_ROOT}"/>
   <property name="boost.dir" value="${out.dir}/../boost"/>
+  <property name="boostbook.dir" value="${out.dir}/boostbook"/>
 
   <target name="clean" description="clean intermediate build artifacts">
     <delete dir="${out.dir}"/>
@@ -143,9 +144,12 @@
     <copy todir="${boost.dir}/boost/mock">
       <fileset dir="${libraries.dir}/turtle" includes="**"/>
     </copy>
-    <copy todir="${boost.dir}/libs/mock/doc">
+    <copy todir="${boostbook.dir}">
       <fileset dir="${boost.root}/tools/boostbook" includes="xsl/**,dtd/**"/>
     </copy>
+    <copy todir="${boostbook.dir}" overwrite="true">
+      <fileset dir="boostbook"/>
+    </copy>
     <copy todir="${boost.dir}/libs/mock/doc/html">
       <fileset dir="${boost.root}/doc/src" includes="**/*.css,**/**.png"/>
       <fileset dir="boost/doc" includes="images/*.png"/>
@@ -213,8 +217,8 @@
     <replaceregexp match="\[include changelog.qbk\]" replace="" flags="g">
       <fileset dir="${boost.dir}/libs/mock" includes="**/mock.qbk"/>
     </replaceregexp>
-    <copy todir="${boost.dir}/libs/mock/doc" overwrite="true">
-      <fileset dir="${boost.root}/tools/boostbook" includes="xsl/navbar.xsl"/>
+    <copy todir="${boostbook.dir}" overwrite="true">
+      <fileset dir="${boost.root}/tools/boostbook" includes="xsl/**,dtd/**"/>
     </copy>
   </target>
 
@@ -223,7 +227,9 @@
   </target>
 
   <target name="boost.doc" description="generate boost.mock documentation in ${boost.dir}">
-    <b2 dir="${boost.dir}/libs/mock/doc"/>
+    <b2 dir="${boost.dir}/libs/mock/doc">
+      <env key="BOOSTBOOK_DIR" value="${boostbook.dir}"/>
+    </b2>
   </target>
 
   <target name="boost.package" description="package boost.mock">