From 9fc48d18067abfd348988f280d0f336530680ced Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jurko=20Gospodneti=C4=87?= Date: Sat, 4 Aug 2012 11:53:34 +0000 Subject: [PATCH] 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. [SVN r79863] --- src/build/project.jam | 10 +++++----- src/build/project.py | 7 +++---- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/build/project.jam b/src/build/project.jam index beb6543ac..251cfb5ce 100644 --- a/src/build/project.jam +++ b/src/build/project.jam @@ -50,15 +50,15 @@ import sequence ; # 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 diff --git a/src/build/project.py b/src/build/project.py index 7d2bea139..7aa483fde 100644 --- a/src/build/project.py +++ b/src/build/project.py @@ -131,14 +131,13 @@ class ProjectRegistry: 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