[Boost-commit] svn:boost r63503 - in branches/release: boost/unordered libs/unordered libs/unordered/doc libs/unordered/test/exception libs/unordered/test/unordered

Subject: [Boost-commit] svn:boost r63503 - in branches/release: boost/unordered libs/unordered libs/unordered/doc libs/unordered/test/exception libs/unordered/test/unordered
From: daniel_james_at_[hidden]
Date: 2010-07-02 14:55:04

Author: danieljames
Date: 2010-07-01 17:42:52 EDT (Thu, 01 Jul 2010)
New Revision: 63503
URL: http://svn.boost.org/trac/boost/changeset/63503

Log:
Merge unordered build and documentation tweaks.

Properties modified: 
   branches/release/boost/unordered/   (props changed)
   branches/release/libs/unordered/   (props changed)
Text files modified: 
   branches/release/libs/unordered/doc/Jamfile.v2            |    10 ++++++++--                              
   branches/release/libs/unordered/doc/unordered.qbk         |     2 +-                                      
   branches/release/libs/unordered/test/exception/Jamfile.v2 |     2 +-                                      
   branches/release/libs/unordered/test/unordered/Jamfile.v2 |     2 +-                                      
   4 files changed, 11 insertions(+), 5 deletions(-)

Modified: branches/release/libs/unordered/doc/Jamfile.v2
==============================================================================
--- branches/release/libs/unordered/doc/Jamfile.v2	(original)
+++ branches/release/libs/unordered/doc/Jamfile.v2	2010-07-01 17:42:52 EDT (Thu, 01 Jul 2010)
@@ -8,8 +8,6 @@
 
 xml unordered : unordered.qbk ;
 boostbook standalone : unordered :
-    <xsl:param>boost.root=../../../..
-
     <xsl:param>chunk.first.sections=1
     <xsl:param>chunk.section.depth=2
     <xsl:param>generate.section.toc.level=2
@@ -20,7 +18,15 @@
     <xsl:param>boost.compact.function=0
     <xsl:param>boost.compact.enum=0
 
+    # HTML Options:
+
+    <format>html:<xsl:param>boost.root=../../../..
+    <format>html:<xsl:param>img.src.path=../../../../doc/html/
+    <format>xhtml:<xsl:param>boost.root=../../../..
+    <format>xhtml:<xsl:param>img.src.path=../../../../doc/html/
+
     # PDF Options:
+
     # TOC Generation: this is needed for FOP-0.9 and later:
     <xsl:param>fop1.extensions=0
     <format>pdf:<xsl:param>xep.extensions=1

Modified: branches/release/libs/unordered/doc/unordered.qbk
==============================================================================
--- branches/release/libs/unordered/doc/unordered.qbk	(original)
+++ branches/release/libs/unordered/doc/unordered.qbk	2010-07-01 17:42:52 EDT (Thu, 01 Jul 2010)
@@ -13,7 +13,7 @@
     [license
         Distributed under the Boost Software License, Version 1.0.
         (See accompanying file LICENSE_1_0.txt or copy at
-        [@http://www.boost.org/LICENSE_1_0.txt]
+        [@http://www.boost.org/LICENSE_1_0.txt])
     ]
 ]
 

Modified: branches/release/libs/unordered/test/exception/Jamfile.v2
==============================================================================
--- branches/release/libs/unordered/test/exception/Jamfile.v2	(original)
+++ branches/release/libs/unordered/test/exception/Jamfile.v2	2010-07-01 17:42:52 EDT (Thu, 01 Jul 2010)
@@ -15,7 +15,7 @@
         <toolset>gcc:<cxxflags>"-pedantic -Wstrict-aliasing -fstrict-aliasing -Wextra -Wsign-promo -Wunused-parameter"
         <toolset>darwin:<cxxflags>"-pedantic -Wstrict-aliasing -fstrict-aliasing -Wextra -Wsign-promo -Wunused-parameter"
         <toolset>gcc:<define>_GLIBCXX_DEBUG
-        <toolset>darwin:<define>_GLIBCXX_DEBUG
+        #<toolset>darwin:<define>_GLIBCXX_DEBUG
         <toolset>msvc:<warnings-as-errors>on
         #<toolset>gcc:<warnings-as-errors>on
         #<toolset>darwin:<warnings-as-errors>on

Modified: branches/release/libs/unordered/test/unordered/Jamfile.v2
==============================================================================
--- branches/release/libs/unordered/test/unordered/Jamfile.v2	(original)
+++ branches/release/libs/unordered/test/unordered/Jamfile.v2	2010-07-01 17:42:52 EDT (Thu, 01 Jul 2010)
@@ -12,7 +12,7 @@
         <toolset>gcc:<cxxflags>"-pedantic -Wstrict-aliasing -fstrict-aliasing -Wextra -Wsign-promo -Wunused-parameter"
         <toolset>darwin:<cxxflags>"-pedantic -Wstrict-aliasing -fstrict-aliasing -Wextra -Wsign-promo -Wunused-parameter"
         <toolset>gcc:<define>_GLIBCXX_DEBUG
-        <toolset>darwin:<define>_GLIBCXX_DEBUG
+        #<toolset>darwin:<define>_GLIBCXX_DEBUG
         <toolset>msvc:<warnings-as-errors>on
         #<toolset>gcc:<warnings-as-errors>on
         #<toolset>darwin:<warnings-as-errors>on