[Boost-commit] svn:boost r75934 - in trunk: . boost/test boost/test/impl boost/test/included tools/build/v2/doc tools/build/v2/tools tools/quickbook tools/quickbook/extra/cxx_committee

Subject: [Boost-commit] svn:boost r75934 - in trunk: . boost/test boost/test/impl boost/test/included tools/build/v2/doc tools/build/v2/tools tools/quickbook tools/quickbook/extra/cxx_committee
From: dnljms_at_[hidden]
Date: 2011-12-13 13:23:18

Author: danieljames
Date: 2011-12-13 13:23:17 EST (Tue, 13 Dec 2011)
New Revision: 75934
URL: http://svn.boost.org/trac/boost/changeset/75934

Log:
Revert `boostbook-base-style` change, it has broken the test build.
Properties modified: 
   trunk/   (props changed)
   trunk/boost/test/auto_unit_test.hpp   (props changed)
   trunk/boost/test/impl/execution_monitor.ipp   (props changed)
   trunk/boost/test/impl/test_main.ipp   (props changed)
   trunk/boost/test/included/test_exec_monitor.hpp   (props changed)
   trunk/boost/test/included/unit_test_framework.hpp   (props changed)
   trunk/boost/test/test_case_template.hpp   (props changed)
   trunk/boost/test/test_exec_monitor.hpp   (props changed)
   trunk/tools/quickbook/   (props changed)
Text files modified: 
   trunk/Jamroot                                        |     2 +-                                      
   trunk/tools/build/v2/doc/jamfile.jam                 |     2 +-                                      
   trunk/tools/build/v2/tools/boostbook.jam             |    13 +------------                           
   trunk/tools/quickbook/extra/cxx_committee/Jamfile.v2 |     2 +-                                      
   4 files changed, 4 insertions(+), 15 deletions(-)

Modified: trunk/Jamroot
==============================================================================
--- trunk/Jamroot	(original)
+++ trunk/Jamroot	2011-12-13 13:23:17 EST (Tue, 13 Dec 2011)
@@ -152,7 +152,7 @@
       <toolset>como:<link>static
       <toolset>como-linux:<define>_GNU_SOURCE=1
       # When building docs within Boost, we want the standard Boost style
-      <boostbook-base-style>Boost
+      <xsl:param>boost.defaults=Boost
     : usage-requirements <include>.
     : build-dir bin.v2
     ;

Modified: trunk/tools/build/v2/doc/jamfile.jam
==============================================================================
--- trunk/tools/build/v2/doc/jamfile.jam	(original)
+++ trunk/tools/build/v2/doc/jamfile.jam	2011-12-13 13:23:17 EST (Tue, 13 Dec 2011)
@@ -15,7 +15,7 @@
      <implicit-dependency>jam_docs
      <dependency>jam_docs
      <xsl:param>boost.root=../../../../..
-     <boostbook-base-style>Boost
+     <xsl:param>boost.defaults=Boost
    ;
    
 xml jam_docs : bjam.qbk ;   

Modified: trunk/tools/build/v2/tools/boostbook.jam
==============================================================================
--- trunk/tools/build/v2/tools/boostbook.jam	(original)
+++ trunk/tools/build/v2/tools/boostbook.jam	2011-12-13 13:23:17 EST (Tue, 13 Dec 2011)
@@ -54,11 +54,6 @@
 feature.feature format : html xhtml htmlhelp onehtml man pdf ps docbook fo tests
   : incidental implicit composite propagated ;
 
-# <boostbook-base-style> sets some default style parameters in
-# the boostbook xsl stylesheets. Search for boost.defaults in
-# the stylesheets for more info.
-feature.feature boostbook-base-style : none Boost : incidental ;
-
 type.register DTDXML : dtdxml ;
 type.register XML : xml ;
 type.register BOOSTBOOK : boostbook : XML ;
@@ -623,13 +618,7 @@
             case ps      : type = PS ;
             case tests   : type = TESTS ;
         }
-
-        local style = [ $(property-set).get <boostbook-base-style> ] ;
-        if $(style) {
-            property-set = [ $(property-set).add-raw
-                <xsl:param>boost.defaults=$(style) ] ;
-        }
-
+        
         if $(manifest)
         {
             # Create DOCBOOK file from BOOSTBOOK sources.

Modified: trunk/tools/quickbook/extra/cxx_committee/Jamfile.v2
==============================================================================
--- trunk/tools/quickbook/extra/cxx_committee/Jamfile.v2	(original)
+++ trunk/tools/quickbook/extra/cxx_committee/Jamfile.v2	2011-12-13 13:23:17 EST (Tue, 13 Dec 2011)
@@ -24,9 +24,9 @@
     
                 #<xsl:param>boost.libraries=$(BOOST_ROOT)/libs/libraries.htm
                 #<xsl:param>boost.root=../../../../
-		<boostbook-base-style>none
                 <xsl:param>html.stylesheet=proposal.css
                 <xsl:param>doc.standalone=1
+		<xsl:param>nav.layout=none
     <xsl:param>generate.toc="article toc"
     #<xsl:param>generate.toc="article toc section nop"
     #<xsl:param>generate.toc="article nop section nop"