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

From: jurko.gospodnetic_at_[hidden]
Date: 2008-07-01 16:22:18

Author: jurko
Date: 2008-07-01 16:22:18 EDT (Tue, 01 Jul 2008)
New Revision: 46976
URL: http://svn.boost.org/trac/boost/changeset/46976

Log:
Minor stylistic changes made to the Boost Build tools/doxygen.jam module.
Text files modified: 
   trunk/tools/build/v2/tools/doxygen.jam |    44 ++++++++++++++++----------------------- 
   1 files changed, 18 insertions(+), 26 deletions(-)

Modified: trunk/tools/build/v2/tools/doxygen.jam
==============================================================================
--- trunk/tools/build/v2/tools/doxygen.jam	(original)
+++ trunk/tools/build/v2/tools/doxygen.jam	2008-07-01 16:22:18 EDT (Tue, 01 Jul 2008)
@@ -37,6 +37,7 @@
 import common ;
 import modules ;
 
+
 # Use to specify extra configuration paramters. These get translated
 # into a doxyfile which configures the building of the docs.
 feature.feature doxygen:param : : free ;
@@ -87,6 +88,8 @@
 
         if ! $(name)
         {
+            local doxygen-path ;
+
             if [ os.name ] = NT
             {
                 local ProgramFiles = [ modules.peek : ProgramFiles ] ;
@@ -99,49 +102,38 @@
                     ProgramFiles = "C:\\Program Files" ;
                 }
 
-                local doxygen-path =
+                doxygen-path =
                     [ GLOB
                         [ modules.peek : PATH ]
                         "$(ProgramFiles)\\doxygen\\bin"
                         : doxygen\.exe ] ;
-                doxygen-path = $(doxygen-path[1]) ;
-
-                if $(doxygen-path)
-                {
-                    if --debug-configuration in [ modules.peek : ARGV ]
-                    {
-                        ECHO "notice:" using doxygen ":" $(doxygen-path) ;
-                    }
-                    .doxygen = $(doxygen-path) ;
-                }
             }
             else
             {
-                local doxygen-path =
+                doxygen-path =
                     [ GLOB
                         [ modules.peek : PATH ]
                         : doxygen ] ;
-                doxygen-path = $(doxygen-path[1]) ;
+            }
 
-                if $(doxygen-path)
-                {
-                    if --debug-configuration in [ modules.peek : ARGV ]
-                    {
-                        ECHO "notice:" using doxygen ":" $(doxygen-path) ;
-                    }
-                    .doxygen = $(doxygen-path) ;
-                }
+            doxygen-path = $(doxygen-path[1]) ;
+
+            if $(doxygen-path)
+            {
+                .doxygen = $(doxygen-path) ;
             }
+
+            .doxygen ?= doxygen ;
         }
         else
         {
-            if --debug-configuration in [ modules.peek : ARGV ]
-            {
-                ECHO "notice:" using doxygen ":" $(name) ;
-            }
             .doxygen = $(name) ;
         }
-        .doxygen ?= doxygen ;
+
+        if --debug-configuration in [ modules.peek : ARGV ]
+        {
+            ECHO "notice:" using doxygen ":" $(.doxygen) ;
+        }
 
         .doxproc = [ modules.binding $(__name__) ] ;
         .doxproc = $(.doxproc:D)/doxproc.py ;