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

Subject: [Boost-commit] svn:boost r52174 - trunk/tools/build/v2/build
From: ghost_at_[hidden]
Date: 2009-04-04 17:16:05

Author: vladimir_prus
Date: 2009-04-04 17:16:05 EDT (Sat, 04 Apr 2009)
New Revision: 52174
URL: http://svn.boost.org/trac/boost/changeset/52174

Log:
Make Jamroots inherit from project-config, if one exists.

Text files modified: 
   trunk/tools/build/v2/build/project.jam |    14 +++++++++++++-                          
   1 files changed, 13 insertions(+), 1 deletions(-)

Modified: trunk/tools/build/v2/build/project.jam
==============================================================================
--- trunk/tools/build/v2/build/project.jam	(original)
+++ trunk/tools/build/v2/build/project.jam	2009-04-04 17:16:05 EDT (Sat, 04 Apr 2009)
@@ -439,6 +439,10 @@
     {
         parent-module = site-config ;
     }
+    else if $(module-name) = project-config
+    {
+        parent-module = user-config ;
+    }    
     else
     {
         # We search for parent/project-root only if Jamfile was specified, i.e.
@@ -453,7 +457,15 @@
             # inherit from user-config.
             if $(location)
             {
-                parent-module = user-config ;
+                # If project-config module exist, inherit from it.
+                if $(project-config.attributes)
+                {   
+                    parent-module = project-config ;
+                }
+                else
+                {                    
+                    parent-module = user-config ;
+                }                
                 jamroot = true ;
             }
         }