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

Subject: [Boost-commit] svn:boost r80327 - in trunk/tools/build/v2: test tools
From: jurko.gospodnetic_at_[hidden]
Date: 2012-08-31 01:32:56

Author: jurko
Date: 2012-08-31 01:32:49 EDT (Fri, 31 Aug 2012)
New Revision: 80327
URL: http://svn.boost.org/trac/boost/changeset/80327

Log:
Boost Build cleanup - minor stylistic changes.
Text files modified: 
   trunk/tools/build/v2/test/conditionals.py |     3 ++-                                     
   trunk/tools/build/v2/tools/msvc.jam       |    19 +++++++++++--------                     
   2 files changed, 13 insertions(+), 9 deletions(-)

Modified: trunk/tools/build/v2/test/conditionals.py
==============================================================================
--- trunk/tools/build/v2/test/conditionals.py	(original)
+++ trunk/tools/build/v2/test/conditionals.py	2012-08-31 01:32:49 EDT (Fri, 31 Aug 2012)
@@ -3,7 +3,8 @@
 # Copyright 2003 Dave Abrahams
 # Copyright 2002, 2003, 2004 Vladimir Prus
 # Distributed under the Boost Software License, Version 1.0.
-# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt)
+# (See accompanying file LICENSE_1_0.txt or copy at
+# http://www.boost.org/LICENSE_1_0.txt)
 
 # Test conditional properties.
 

Modified: trunk/tools/build/v2/tools/msvc.jam
==============================================================================
--- trunk/tools/build/v2/tools/msvc.jam	(original)
+++ trunk/tools/build/v2/tools/msvc.jam	2012-08-31 01:32:49 EDT (Fri, 31 Aug 2012)
@@ -1,13 +1,13 @@
-# Copyright (c) 2003 David Abrahams.
-# Copyright (c) 2005 Vladimir Prus.
-# Copyright (c) 2005 Alexey Pakhunov.
-# Copyright (c) 2006 Bojan Resnik.
-# Copyright (c) 2006 Ilya Sokolov.
+# Copyright (c) 2003 David Abrahams
+# Copyright (c) 2005 Vladimir Prus
+# Copyright (c) 2005 Alexey Pakhunov
+# Copyright (c) 2006 Bojan Resnik
+# Copyright (c) 2006 Ilya Sokolov
 # Copyright (c) 2007 Rene Rivera
 # Copyright (c) 2008 Jurko Gospodnetic
 #
-# Use, modification and distribution is subject to the Boost Software
-# License Version 1.0. (See accompanying file LICENSE_1_0.txt or
+# Distributed under the Boost Software License, Version 1.0.
+# (See accompanying file LICENSE_1_0.txt or copy at
 # http://www.boost.org/LICENSE_1_0.txt)
 
 ################################################################################
@@ -23,7 +23,6 @@
 
 import "class" : new ;
 import common ;
-import errors ;
 import feature ;
 import generators ;
 import mc ;
@@ -42,6 +41,7 @@
 
 type.register PDB : pdb ;
 
+
 ################################################################################
 #
 # Public rules.
@@ -151,6 +151,7 @@
         case "all" :
             if $(options)
             {
+                import errors ;
                 errors.error "MSVC toolset configuration: options should be"
                     "empty when '$(version)' is specified." ;
             }
@@ -593,6 +594,7 @@
 
         if ! $(pch-header)
         {
+            import errors : user-error : errors.user-error ;
             errors.user-error "can not build pch without pch-header" ;
         }
 
@@ -706,6 +708,7 @@
         # identical sets of options are used.
         if $(options) && ( $(options) != [ $(.versions).get $(version) : options ] )
         {
+            import errors ;
             errors.error "MSVC toolset configuration: Toolset version"
                 "'$(version)' already configured." ;
         }