Consolidate warning location formatting in mlog.warning()

Also use .format() rather than %
Also use build.environment rather than hardcoding 'meson.build'

1 files changed, 7 insertions, 0 deletions

diff --git a/mesonbuild/mlog.py b/mesonbuild/mlog.py
index a0d07ec..aa2ac20 100644
--- a/mesonbuild/mlog.py
+++ b/mesonbuild/mlog.py
@@ -103,6 +103,13 @@ def log(*args, **kwargs):
     force_print(*arr, **kwargs)
 
 def warning(*args, **kwargs):
+    from . import environment
+
+    if kwargs.get('location'):
+        location = kwargs['location']
+        del kwargs['location']
+        args += ('in file {}, line {}.'.format(os.path.join(location.subdir, environment.build_filename), location.lineno),)
+
     log(yellow('WARNING:'), *args, **kwargs)
 
 # Format a list for logging purposes as a string. It separates