aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2016-01-21 21:38:51 +0200
committerJussi Pakkanen <jpakkane@gmail.com>2016-01-21 21:38:51 +0200
commit9573ec60ad36169c9ce7748998c63f09570f2dd4 (patch)
tree980260feb875c35992268c79f464e77685f12134
parent6d55275f6c347a2f20736c9a0db126f9e0f4eac8 (diff)
downloadmeson-9573ec60ad36169c9ce7748998c63f09570f2dd4.zip
meson-9573ec60ad36169c9ce7748998c63f09570f2dd4.tar.gz
meson-9573ec60ad36169c9ce7748998c63f09570f2dd4.tar.bz2
Vala .d and .vapi should be named after the first vala source file in the target rather than target name.
-rw-r--r--mesonbuild/ninjabackend.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/mesonbuild/ninjabackend.py b/mesonbuild/ninjabackend.py
index 840957c..ef379d9 100644
--- a/mesonbuild/ninjabackend.py
+++ b/mesonbuild/ninjabackend.py
@@ -810,7 +810,9 @@ int dummy;
for s in src:
if s.endswith('.vala'):
vala_input_files.append(s.rel_to_builddir(self.build_to_src))
- namebase = os.path.splitext(os.path.split(vala_input_files[0])[1])[0]
+ if len(src) == 0:
+ raise InvalidArguments('Vala library has no Vala source files.')
+ namebase = os.path.splitext(os.path.split(src[0].fname)[1])[0]
hname = namebase + '.h'
vapiname = namebase + '.vapi'
outputs = [vapiname]