[Boost-commit] svn:boost r81026 - trunk/tools/build/v2/tools

Subject: [Boost-commit] svn:boost r81026 - trunk/tools/build/v2/tools
From: steven_at_[hidden]
Date: 2012-10-20 12:35:57

Author: steven_watanabe
Date: 2012-10-20 12:35:56 EDT (Sat, 20 Oct 2012)
New Revision: 81026
URL: http://svn.boost.org/trac/boost/changeset/81026

Log:
Move handling of <auto-index>on to the generator requirements.
Text files modified: 
   trunk/tools/build/v2/tools/auto-index.jam |    12 ++----------                            
   1 files changed, 2 insertions(+), 10 deletions(-)

Modified: trunk/tools/build/v2/tools/auto-index.jam
==============================================================================
--- trunk/tools/build/v2/tools/auto-index.jam	(original)
+++ trunk/tools/build/v2/tools/auto-index.jam	2012-10-20 12:35:56 EDT (Sat, 20 Oct 2012)
@@ -157,15 +157,7 @@
         #ECHO "binary = " $(auto-index-binary) ;
         #ECHO "dependencies = " $(auto-index-binary-dependencies) ;
 
-        if [ $(property-set).get <auto-index> ] = "on"
-        {
-            return [ generator.run $(project) $(name) : $(property-set) : $(sources) ] ;
-        }
-        else
-        {
-            return [ generators.construct $(project) $(name) : DOCBOOK : $(property-set)
-              : $(sources) ] ;
-        }        
+        return [ generator.run $(project) $(name) : $(property-set) : $(sources) ] ;
     }
 }
 
@@ -192,7 +184,7 @@
 toolset.flags auto-index.auto-index AI-COMMAND      <auto-index-binary> ;
 toolset.flags auto-index.auto-index AI-DEPENDENCIES <auto-index-binary-dependencies> ;
 
-generators.register [ class.new auto-index-generator auto-index.auto-index : DOCBOOK : DOCBOOK(%.auto_index) ] ;
+generators.register [ class.new auto-index-generator auto-index.auto-index : DOCBOOK : DOCBOOK(%.auto_index) : <auto-index>on ] ;
 generators.override auto-index.auto-index : boostbook.boostbook-to-docbook ;
 
 rule auto-index ( target : source : properties * )