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

Subject: [Boost-commit] svn:boost r79656 - trunk/tools/build/v2/build
From: jurko.gospodnetic_at_[hidden]
Date: 2012-07-22 03:17:44

Author: jurko
Date: 2012-07-22 03:17:43 EDT (Sun, 22 Jul 2012)
New Revision: 79656
URL: http://svn.boost.org/trac/boost/changeset/79656

Log:
Allowed Boost Build option rule to be used in test-config configuration files. Corrected and updated the related end-user error message.
Text files modified: 
   trunk/tools/build/v2/build/project.jam |     6 ++++--                                  
   1 files changed, 4 insertions(+), 2 deletions(-)

Modified: trunk/tools/build/v2/build/project.jam
==============================================================================
--- trunk/tools/build/v2/build/project.jam	(original)
+++ trunk/tools/build/v2/build/project.jam	2012-07-22 03:17:43 EDT (Sun, 22 Jul 2012)
@@ -1104,10 +1104,12 @@
     rule option ( name : value )
     {
         local m = [ CALLER_MODULE ] ;
-        if $(m) != site-config && $(m) != user-config && $(m) != project-config
+        local cfgs = project site test user ;
+        if ! $(m) in $(cfgs)-config
         {
             import errors ;
-            errors.error "The 'option' rule may be used only in site-config or user-config" ;
+            errors.error The 'option' rule may only be used "in" Boost Build
+                configuration files. ;
         }
         import option ;
         option.set $(name) : $(value) ;