boost/build
2
0
Fork 0
mirror of https://github.com/boostorg/build.git synced 2026-02-17 13:42:14 +00:00
Code Issues Projects Releases Wiki Activity

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.

Browse Source 
[SVN r79863]
This commit is contained in:
Jurko Gospodnetić
2012-08-04 11:53:34 +00:00
parent aaa350a78d
commit 9fc48d1806
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/build/project.jam
View File

@@ -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

7
src/build/project.py
View File

@@ -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