[gnome-builder/gnome-builder-3-26] meson: use 'meson introspect'
- From: Christian Hergert <chergert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-builder/gnome-builder-3-26] meson: use 'meson introspect'
- Date: Mon, 15 Jan 2018 06:00:29 +0000 (UTC)
commit c278c7cc135a30b300480a3a06e2f080883a52e7
Author: Christian Hergert <chergert redhat com>
Date: Sun Jan 14 21:58:11 2018 -0800
meson: use 'meson introspect'
mesonintrospect was failing to execute properly due to an
internal meson error. This makes things work similar to how
it works for us on master (with the C port of meson plugin).
Fixes #257
plugins/meson/meson_plugin/__init__.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/plugins/meson/meson_plugin/__init__.py b/plugins/meson/meson_plugin/__init__.py
index 7191e3b1d..257202a41 100644
--- a/plugins/meson/meson_plugin/__init__.py
+++ b/plugins/meson/meson_plugin/__init__.py
@@ -205,7 +205,7 @@ class MesonBuildSystem(Ide.Object, Ide.BuildSystem, Gio.AsyncInitable):
def build_targets_thread():
try:
- ret = execInRuntime(runtime, 'mesonintrospect', '--targets', builddir)
+ ret = execInRuntime(runtime, 'meson', 'introspect', '--targets', builddir)
except Exception as e:
task.return_error(GLib.Error('Failed to run mesonintrospect: {}'.format(e)))
return
@@ -241,7 +241,7 @@ class MesonBuildSystem(Ide.Object, Ide.BuildSystem, Gio.AsyncInitable):
if not targets or targets[0].install_directory.get_path() != bindir:
try:
# This is a new feature in Meson 0.37.0
- ret = execInRuntime(runtime, 'mesonintrospect', '--installed', builddir)
+ ret = execInRuntime(runtime, 'meson', 'introspect', '--installed', builddir)
installed = json.loads(ret)
for f in installed.values():
install_dir = path.dirname(f)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]