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

Subject: [Boost-commit] svn:boost r79915 - trunk/tools/build/v2/tools
From: jurko.gospodnetic_at_[hidden]
Date: 2012-08-07 17:30:31

Author: jurko
Date: 2012-08-07 17:30:31 EDT (Tue, 07 Aug 2012)
New Revision: 79915
URL: http://svn.boost.org/trac/boost/changeset/79915

Log:
Updated Boost Build's doxygen.jam toolset module to not rely on Boost Build leaving behind a dangling 'current project' reference after it finishes loading all of its project modules.  This should fix Boost library documentation build failures encountered after revision [79874].
Text files modified: 
   trunk/tools/build/v2/tools/doxygen.jam |    25 +++++++++++++------------               
   1 files changed, 13 insertions(+), 12 deletions(-)

Modified: trunk/tools/build/v2/tools/doxygen.jam
==============================================================================
--- trunk/tools/build/v2/tools/doxygen.jam	(original)
+++ trunk/tools/build/v2/tools/doxygen.jam	2012-08-07 17:30:31 EDT (Tue, 07 Aug 2012)
@@ -547,36 +547,37 @@
    }
 }
 
-rule check-tools ( )
+rule check-tools ( project )
 {
     if ! $(.check-tools-targets)
     {
         # Find the root project.
-        local root-project = [ project.current ] ;
-        root-project = [ $(root-project).project-module ] ;
-        while
-            [ project.attribute $(root-project) parent-module ] &&
-            [ project.attribute $(root-project) parent-module ] != user-config
+        local project-module = [ $(project).project-module ] ;
+        local parent-module = [ project.attribute $(project-module)
+            parent-module ] ;
+        while $(parent-module) && $(parent-module) != user-config
         {
-            root-project =
-                [ project.attribute $(root-project) parent-module ] ;
+            project-module = $(parent-module) ;
+            parent-module = [ project.attribute $(project-module) parent-module
+                ] ;
         }
+        project = [ project.target $(project-module) ] ;
 
         .latex.check = [ new file-target latex.check
             :
-            : [ project.target $(root-project) ]
+            : $(project)
             : [ new action : doxygen.check-latex ]
             :
             ] ;
         .dvips.check = [ new file-target dvips.check
             :
-            : [ project.target $(root-project) ]
+            : $(project)
             : [ new action : doxygen.check-dvips ]
             :
             ] ;
         .gs.check = [ new file-target gs.check
             :
-            : [ project.target $(root-project) ]
+            : $(project)
             : [ new action : doxygen.check-gs ]
             :
             ] ;
@@ -593,7 +594,7 @@
     import doxygen ;
     rule construct ( name : sources * : property-set )
     {
-        return [ property-set.empty ] [ doxygen.check-tools ] ;
+        return [ property-set.empty ] [ doxygen.check-tools [ project ] ] ;
     }
 }