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

Subject: [Boost-commit] svn:boost r79863 - trunk/tools/build/v2/build
From: jurko.gospodnetic_at_[hidden]
Date: 2012-08-04 07:53:35

Author: jurko
Date: 2012-08-04 07:53:34 EDT (Sat, 04 Aug 2012)
New Revision: 79863
URL: http://svn.boost.org/trac/boost/changeset/79863

Log:
Updated Boost Build to display the 'Loading Jamfile at...' --debug-loading output only when actually loading a Jamfile module and not also when ignoring the load request because the same Jamfile module has already been loaded.
Text files modified: 
   trunk/tools/build/v2/build/project.jam |    10 +++++-----                              
   trunk/tools/build/v2/build/project.py  |     7 +++----                                 
   2 files changed, 8 insertions(+), 9 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-04 07:53:34 EDT (Sat, 04 Aug 2012)
@@ -50,15 +50,15 @@
 #
 rule load ( jamfile-location )
 {
-    if --debug-loading in [ modules.peek : ARGV ]
-    {
-        ECHO "Loading Jamfile at" '$(jamfile-location)' ;
-    }
-
     local module-name = [ module-name $(jamfile-location) ] ;
     # If Jamfile is already loaded, do not try again.
     if ! $(module-name) in $(.jamfile-modules)
     {
+        if --debug-loading in [ modules.peek : ARGV ]
+        {
+            ECHO "[$(fufu)] Loading Jamfile at" '$(jamfile-location)' ;
+        }
+
         load-jamfile $(jamfile-location) : $(module-name) ;
 
         # We want to make sure that child project are loaded only after parent

Modified: trunk/tools/build/v2/build/project.py
==============================================================================
--- trunk/tools/build/v2/build/project.py	(original)
+++ trunk/tools/build/v2/build/project.py	2012-08-04 07:53:34 EDT (Sat, 04 Aug 2012)
@@ -131,14 +131,13 @@
         absolute = os.path.normpath(absolute)
         jamfile_location = b2.util.path.relpath(os.getcwd(), absolute)
 
-        if "--debug-loading" in self.manager.argv():
-            print "Loading Jamfile at '%s'" % jamfile_location
-
-
         mname = self.module_name(jamfile_location)
         # If Jamfile is already loaded, do not try again.
         if not mname in self.jamfile_modules:
 
+            if "--debug-loading" in self.manager.argv():
+                print "Loading Jamfile at '%s'" % jamfile_location
+
             self.load_jamfile(jamfile_location, mname)
 
             # We want to make sure that child project are loaded only