modules/gnome: add support for multiple include for Gir. Closes #69

Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>

modules/gnome.py

@@ -58,8 +58,16 @@ class GnomeModule:
         scan_name = girtarget.name + '-gir'
         scan_command = ['g-ir-scanner', '@INPUT@', '--program', girtarget]
         scan_command += pkgargs
-        scan_command += ['--include=GObject-2.0', '--namespace='+ns,
+        scan_command += ['--namespace='+ns, '--nsversion=' + nsversion,
-                         '--nsversion=' + nsversion, '--output', '@OUTPUT@']
+                         '--output', '@OUTPUT@']
+        if 'includes' in kwargs:
+            includes = kwargs.pop('includes')
+            if isinstance(includes, str):
+                scan_command += ['--include=%s' % includes]
+            elif isinstance(includes, list):
+                scan_command += ['--include=%s' % inc for inc in includes]
+            else:
+                raise MesonException('Gir includes must be str or list')
         scankwargs = {'output' : girfile,
                       'input' : libsources,
                       'command' : scan_command}

test cases/frameworks/7 gnome/gir/meson.build

@@ -8,6 +8,7 @@ gnome.generate_gir(girexe,
 sources : libsources,
 nsversion : '1.0',
 namespace : 'Meson',
+includes : ['GObject-2.0', 'Gio-2.0'],
 install : true
 )