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

Subject: [Boost-commit] svn:boost r75926 - in trunk/tools: build/v2/tools quickbook
From: dnljms_at_[hidden]
Date: 2011-12-12 18:02:35

Author: danieljames
Date: 2011-12-12 18:02:34 EST (Mon, 12 Dec 2011)
New Revision: 75926
URL: http://svn.boost.org/trac/boost/changeset/75926

Log:
Quickbook: Restore quickbook toolset.

So that it can be used with older versions. Also removed `dist-lib` as
it doesn't seem to do anything, and quickbook no longer pretends to be
usable as a library.
Text files modified: 
   trunk/tools/build/v2/tools/quickbook.jam |     2 +-                                      
   trunk/tools/quickbook/Jamfile.v2         |    24 +++++-------------------                
   2 files changed, 6 insertions(+), 20 deletions(-)

Modified: trunk/tools/build/v2/tools/quickbook.jam
==============================================================================
--- trunk/tools/build/v2/tools/quickbook.jam	(original)
+++ trunk/tools/build/v2/tools/quickbook.jam	2011-12-12 18:02:34 EST (Mon, 12 Dec 2011)
@@ -165,7 +165,7 @@
                 # properties found in target-id. We do not care about these
                 # since we have passed the id ourselves.
                 quickbook-main-target =
-                    [ $(quickbook-main-target[1]).main-target quickbook-auto ] ;
+                    [ $(quickbook-main-target[1]).main-target quickbook ] ;
 
                 quickbook-binary-dependencies =
                     [ $(quickbook-main-target).generate [ $(property-set).propagated ] ] ;

Modified: trunk/tools/quickbook/Jamfile.v2
==============================================================================
--- trunk/tools/quickbook/Jamfile.v2	(original)
+++ trunk/tools/quickbook/Jamfile.v2	2011-12-12 18:02:34 EST (Mon, 12 Dec 2011)
@@ -8,15 +8,11 @@
 #   http://www.boost.org/LICENSE_1_0.txt)
 #==============================================================================
 
-alias quickbook
-    : src//quickbook
-    ;
-
-explicit quickbook ;
+# Install quickbook by default.
 
 install dist-bin
     :
-    quickbook
+    src//quickbook
     :
     <install-type>EXE
     <location>../../dist/bin
@@ -24,22 +20,12 @@
     release
     ;
 
-install dist-lib
-    :
-    quickbook
-    :
-    <install-type>LIB
-    <location>../../dist/lib
-    :
-    release
-    ;
-
 # Target for quickbook toolset's auto build.
 
-alias quickbook-auto
-    : quickbook
+alias quickbook
+    : src//quickbook
     : release
     ;
 
-explicit quickbook-auto
+explicit quickbook
     ;