diff options
author | Alistair Thomas <astavale@yahoo.co.uk> | 2017-06-26 13:57:52 +0100 |
---|---|---|
committer | Alistair Thomas <astavale@yahoo.co.uk> | 2017-06-26 13:57:52 +0100 |
commit | cca0fa815458e5c872dc49772dcada6b751b682c (patch) | |
tree | 74ea80ae5083c7c819f85b0a00e1fbfea3702089 /mesonbuild/backend/ninjabackend.py | |
parent | ce9cd33f27e8605c2d7fc77c3c2f086b6ac530ae (diff) | |
download | meson-cca0fa815458e5c872dc49772dcada6b751b682c.zip meson-cca0fa815458e5c872dc49772dcada6b751b682c.tar.gz meson-cca0fa815458e5c872dc49772dcada6b751b682c.tar.bz2 |
Recognise .gs extension as a Vala source
Diffstat (limited to 'mesonbuild/backend/ninjabackend.py')
-rw-r--r-- | mesonbuild/backend/ninjabackend.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py index 0c3525c..e2653d4 100644 --- a/mesonbuild/backend/ninjabackend.py +++ b/mesonbuild/backend/ninjabackend.py @@ -1005,7 +1005,7 @@ int dummy; def split_vala_sources(self, t): """ - Splits the target's sources into .vala, .vapi, and other sources. + Splits the target's sources into .vala, .gs, .vapi, and other sources. Handles both pre-existing and generated sources. Returns a tuple (vala, vapi, others) each of which is a dictionary with @@ -1026,7 +1026,7 @@ int dummy; 'mesonlib.File, not {!r}'.format(t, s) raise InvalidArguments(msg) f = s.rel_to_builddir(self.build_to_src) - if s.endswith('.vala'): + if s.endswith(('.vala', '.gs')): srctype = vala elif s.endswith('.vapi'): srctype = vapi @@ -1037,7 +1037,7 @@ int dummy; for gensrc in t.get_generated_sources(): for s in gensrc.get_outputs(): f = self.get_target_generated_dir(t, gensrc, s) - if s.endswith('.vala'): + if s.endswith(('.vala', '.gs')): srctype = vala elif s.endswith('.vapi'): srctype = vapi @@ -1061,7 +1061,7 @@ int dummy; (vala_src, vapi_src, other_src) = self.split_vala_sources(target) extra_dep_files = [] if not vala_src: - msg = 'Vala library {!r} has no Vala source files.' + msg = 'Vala library {!r} has no Vala or Genie source files.' raise InvalidArguments(msg.format(target.name)) valac = target.compilers['vala'] |