aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNirbheek Chauhan <nirbheek@centricular.com>2016-12-09 12:58:22 +0530
committerNirbheek Chauhan <nirbheek@centricular.com>2016-12-13 09:37:47 +0530
commit038b15a7b23122e06b3bb06e1c1fd6c382230a55 (patch)
tree1c02829575b74a2faa5d789c9cf5bf5d9b11ff16
parentd766475176b1dc2a7d7e7e9f1cb9947c65db31d7 (diff)
downloadmeson-038b15a7b23122e06b3bb06e1c1fd6c382230a55.zip
meson-038b15a7b23122e06b3bb06e1c1fd6c382230a55.tar.gz
meson-038b15a7b23122e06b3bb06e1c1fd6c382230a55.tar.bz2
Add __repr__ for ExtractedObjects and better error for Vala libraries
-rw-r--r--mesonbuild/backend/ninjabackend.py3
-rw-r--r--mesonbuild/build.py4
2 files changed, 6 insertions, 1 deletions
diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py
index 39e0e79..3562cf8 100644
--- a/mesonbuild/backend/ninjabackend.py
+++ b/mesonbuild/backend/ninjabackend.py
@@ -966,7 +966,8 @@ int dummy;
(vala_src, vapi_src, other_src) = self.split_vala_sources(target)
extra_dep_files = []
if len(vala_src) == 0:
- raise InvalidArguments('Vala library has no Vala source files.')
+ msg = 'Vala library {!r} has no Vala source files.'
+ raise InvalidArguments(msg.format(target.name))
valac = target.compilers['vala']
c_out_dir = self.get_target_private_dir(target)
diff --git a/mesonbuild/build.py b/mesonbuild/build.py
index 28119b6..5e270a2 100644
--- a/mesonbuild/build.py
+++ b/mesonbuild/build.py
@@ -187,6 +187,10 @@ class ExtractedObjects():
if is_unity:
self.check_unity_compatible()
+ def __repr__(self):
+ r = '<{0} {1!r}: {2}>'
+ return r.format(self.__class__.__name__, self.target.name, self.srclist)
+
def check_unity_compatible(self):
# Figure out if the extracted object list is compatible with a Unity
# build. When we're doing a Unified build, we go through the sources,