[Boost-commit] svn:boost r66431 - in trunk/tools: build/v2/tools quickbook/test

Subject: [Boost-commit] svn:boost r66431 - in trunk/tools: build/v2/tools quickbook/test
From: dnljms_at_[hidden]
Date: 2010-11-07 09:45:44

Author: danieljames
Date: 2010-11-07 09:45:43 EST (Sun, 07 Nov 2010)
New Revision: 66431
URL: http://svn.boost.org/trac/boost/changeset/66431

Log:
Support more quickbook options in boost build.
Text files modified: 
   trunk/tools/build/v2/tools/quickbook.jam         |     8 +++++++-                                
   trunk/tools/quickbook/test/quickbook-testing.jam |     1 -                                       
   2 files changed, 7 insertions(+), 2 deletions(-)

Modified: trunk/tools/build/v2/tools/quickbook.jam
==============================================================================
--- trunk/tools/build/v2/tools/quickbook.jam	(original)
+++ trunk/tools/build/v2/tools/quickbook.jam	2010-11-07 09:45:43 EST (Sun, 07 Nov 2010)
@@ -121,6 +121,9 @@
 # <quickbook-binary-dependencies> targets to build QuickBook from sources.
 feature.feature <quickbook-binary> : : free ;
 feature.feature <quickbook-binary-dependencies> : : free dependency ;
+feature.feature <quickbook-define> : : free ;
+feature.feature <quickbook-indent> : : free ;
+feature.feature <quickbook-line-width> : : free ;
 
 
 # quickbook-binary-generator handles generation of the QuickBook executable, by
@@ -297,6 +300,9 @@
 toolset.flags quickbook.quickbook-to-boostbook QB-COMMAND      <quickbook-binary> ;
 toolset.flags quickbook.quickbook-to-boostbook QB-DEPENDENCIES <quickbook-binary-dependencies> ;
 toolset.flags quickbook.quickbook-to-boostbook INCLUDES        <include> ;
+toolset.flags quickbook.quickbook-to-boostbook QB-DEFINES      <quickbook-define> ;
+toolset.flags quickbook.quickbook-to-boostbook QB-INDENT       <quickbook-indent> ;
+toolset.flags quickbook.quickbook-to-boostbook QB-LINE-WIDTH   <quickbook-line-width> ;
 
 
 rule quickbook-to-boostbook ( target : source : properties * )
@@ -309,7 +315,7 @@
 
 actions quickbook-to-boostbook
 {
-    "$(QB-COMMAND)" -I"$(INCLUDES)" --output-file="$(1)" "$(2)"  
+    "$(QB-COMMAND)" -I"$(INCLUDES)" -D"$(QB-DEFINES)" --indent="$(QB-INDENT)" --linewidth="$(QB-LINE-WIDTH)" --output-file="$(1)" "$(2)"
 }
 
 

Modified: trunk/tools/quickbook/test/quickbook-testing.jam
==============================================================================
--- trunk/tools/quickbook/test/quickbook-testing.jam	(original)
+++ trunk/tools/quickbook/test/quickbook-testing.jam	2010-11-07 09:45:43 EST (Sun, 07 Nov 2010)
@@ -16,7 +16,6 @@
 import type ;
 
 feature.feature quickbook-testing.quickbook-command : : free dependency ;
-feature.feature <quickbook-define> : : free ;
 
 type.register QUICKBOOK_INPUT : quickbook ;
 type.register QUICKBOOK_OUTPUT ;