diff options
| author | Christoph Reiter <reiter.christoph@gmail.com> | 2018-07-11 18:49:27 +0200 |
|---|---|---|
| committer | Christoph Reiter <reiter.christoph@gmail.com> | 2018-07-11 20:44:52 +0200 |
| commit | 2dbf8f4ea4992ca33c272786f860d7fc291ba89b (patch) | |
| tree | fca28df47c9d2e3afc991c19de68fe80db477e18 /giscanner | |
| parent | 4542321c383304807228f204de600aa64944c87e (diff) | |
| download | gobject-introspection-2dbf8f4ea4992ca33c272786f860d7fc291ba89b.tar.gz | |
meson: Add a "python" option to make the python to build against configurable
This allows us to build with Python 2 and run tests with it.
This requires the new "python" meson module which was added in 0.46.0 so
bump the required meson version (glib needs a newer one anyway).
Also fixes a small test error under Python 2.
Diffstat (limited to 'giscanner')
| -rw-r--r-- | giscanner/introspectablepass.py | 2 | ||||
| -rw-r--r-- | giscanner/meson.build | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/giscanner/introspectablepass.py b/giscanner/introspectablepass.py index 19d1388f..072494bd 100644 --- a/giscanner/introspectablepass.py +++ b/giscanner/introspectablepass.py @@ -84,7 +84,7 @@ class IntrospectablePass(object): if not node.type.resolved: self._parameter_warning(parent, node, - "Unresolved type: %r" % (node.type.unresolved_string, )) + "Unresolved type: '%s'" % (node.type.unresolved_string, )) parent.introspectable = False return diff --git a/giscanner/meson.build b/giscanner/meson.build index 5a1e44c9..b4ec3796 100644 --- a/giscanner/meson.build +++ b/giscanner/meson.build @@ -79,12 +79,12 @@ giscanner_lib = static_library('giscanner', dependencies: [glib_dep, gobject_dep, gio_dep, gmodule_dep], ) -giscanner_pymod = py3.extension_module('_giscanner', 'giscannermodule.c', +giscanner_pymod = python.extension_module('_giscanner', ['giscannermodule.c'], link_with: giscanner_lib, c_args: [gi_hidden_visibility_cflags], include_directories : configinc, dependencies: [glib_dep, gobject_dep, gio_dep, gmodule_dep, - dependency('python3')], + python.dependency()], install: true, install_dir: giscannerdir, ) |