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

Subject: [Boost-commit] svn:boost r79971 - in trunk/tools/build/v2: build tools
From: jurko.gospodnetic_at_[hidden]
Date: 2012-08-11 17:43:24

Author: jurko
Date: 2012-08-11 17:43:23 EDT (Sat, 11 Aug 2012)
New Revision: 79971
URL: http://svn.boost.org/trac/boost/changeset/79971

Log:
Boost Build cleanup - minor stylistic changes.
Text files modified: 
   trunk/tools/build/v2/build/project.jam  |    22 +++++++++++-----------                  
   trunk/tools/build/v2/tools/doxygen.jam  |    22 ++++++++++++++--------                  
   trunk/tools/build/v2/tools/xsltproc.jam |     4 ++--                                    
   3 files changed, 27 insertions(+), 21 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-08-11 17:43:23 EDT (Sat, 11 Aug 2012)
@@ -471,7 +471,7 @@
         }
         else
         {
-            local cfgs = test site user project ;
+            local cfgs = project site test user ;
             if ! $(module-name) in $(cfgs)-config
             {
                 # This is a standalone project with known location. Set its
@@ -542,17 +542,17 @@
     # Parent module might be locationless configuration module.
     if [ modules.binding $(parent-module) ]
     {
-        $(attributes).set parent : [ path.parent
-            [ path.make [ modules.binding $(parent-module) ] ] ] ;
+        $(attributes).set parent :
+            [ path.parent [ path.make [ modules.binding $(parent-module) ] ] ] ;
     }
-    local v = [ $(pattributes).get project-root ] ;
-    $(attributes).set project-root : $(v) : exact ;
-    $(attributes).set default-build
-        : [ $(pattributes).get default-build ] ;
-    $(attributes).set requirements
-        : [ $(pattributes).get requirements ] : exact ;
-    $(attributes).set usage-requirements
-        : [ $(pattributes).get usage-requirements ] : exact ;
+    $(attributes).set project-root :
+        [ $(pattributes).get project-root ] : exact ;
+    $(attributes).set default-build :
+        [ $(pattributes).get default-build ] ;
+    $(attributes).set requirements :
+        [ $(pattributes).get requirements ] : exact ;
+    $(attributes).set usage-requirements :
+        [ $(pattributes).get usage-requirements ] : exact ;
 
     local parent-build-dir = [ $(pattributes).get build-dir ] ;
     if $(parent-build-dir)

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-11 17:43:23 EDT (Sat, 11 Aug 2012)
@@ -533,6 +533,12 @@
     if ! $(.check-tools-targets)
     {
         # Find the root project.
+        # FIXME: This is a feeble attempt to avoid using different locations for
+        # storing our *.check files depending on which project imported the
+        # doxygen toolset first. It does not work though as the passed project
+        # is always 'doxygen' which is a standalone project and so does not have
+        # a parent. We should modify this code to do the same as the
+        # boostbook.jam module does for its built xml-catalog target.
         local project-module = [ $(project).project-module ] ;
         local parent-module = [ project.attribute $(project-module)
             parent-module ] ;
@@ -542,15 +548,15 @@
             parent-module = [ project.attribute $(project-module) parent-module
                 ] ;
         }
-        project = [ project.target $(project-module) ] ;
+        local root-project = [ project.target $(project-module) ] ;
 
-        local latex.check = [ new file-target latex.check : : $(project) : [ new
-            action : doxygen.check-latex ] ] ;
-        local dvips.check = [ new file-target dvips.check : : $(project) : [ new
-            action : doxygen.check-dvips ] ] ;
-        local gs.check = [ new file-target gs.check : : $(project) : [ new
-            action : doxygen.check-gs ] ] ;
-        .check-tools-targets = $(latex.check) $(dvips.check) $(gs.check) ;
+        .check-tools-targets =
+            [ new file-target latex.check : : $(root-project) : [ new action :
+                doxygen.check-latex ] ]
+            [ new file-target dvips.check : : $(root-project) : [ new action :
+                doxygen.check-dvips ] ]
+            [ new file-target gs.check : : $(root-project) : [ new action :
+                doxygen.check-gs ] ] ;
     }
     return $(.check-tools-targets) ;
 }

Modified: trunk/tools/build/v2/tools/xsltproc.jam
==============================================================================
--- trunk/tools/build/v2/tools/xsltproc.jam	(original)
+++ trunk/tools/build/v2/tools/xsltproc.jam	2012-08-11 17:43:23 EDT (Sat, 11 Aug 2012)
@@ -87,8 +87,8 @@
     if [ os.on-windows ]
     {
         local file = [ path.make [ modules.binding $(__name__) ] ] ;
-        local dir = [ path.native
-                      [ path.join [ path.parent $(file) ] xsltproc ] ] ;
+        local dir = [ path.native [ path.join [ path.parent $(file) ] xsltproc ]
+            ] ;
         if [ os.name ] = CYGWIN
         {
             dir = $(dir:W) ;