[gnome-builder] meson: check for installed: true
- From: Christian Hergert <chergert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-builder] meson: check for installed: true
- Date: Wed, 18 Oct 2017 03:40:44 +0000 (UTC)
commit 2373e0571ba58e4bb4a0060060a7675af5aa993b
Author: Christian Hergert <chergert redhat com>
Date: Tue Oct 17 20:39:03 2017 -0700
meson: check for installed: true
We should check that the target is actually installed, not just
that it is in bindir.
src/plugins/meson/gbp-meson-build-system.c | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
---
diff --git a/src/plugins/meson/gbp-meson-build-system.c b/src/plugins/meson/gbp-meson-build-system.c
index 835c63c..099d641 100644
--- a/src/plugins/meson/gbp-meson-build-system.c
+++ b/src/plugins/meson/gbp-meson-build-system.c
@@ -526,6 +526,7 @@ gbp_meson_build_system_get_build_targets_communciate_cb (GObject *object,
const gchar *filename;
JsonObject *obj;
JsonNode *member;
+ gboolean installed;
if (JSON_NODE_HOLDS_OBJECT (element) &&
NULL != (obj = json_node_get_object (element)) &&
@@ -534,7 +535,10 @@ gbp_meson_build_system_get_build_targets_communciate_cb (GObject *object,
NULL != (name = json_node_get_string (member)) &&
NULL != (member = json_object_get_member (obj, "install_filename")) &&
JSON_NODE_HOLDS_VALUE (member) &&
- NULL != (filename = json_node_get_string (member)))
+ NULL != (filename = json_node_get_string (member)) &&
+ NULL != (member = json_object_get_member (obj, "installed")) &&
+ JSON_NODE_HOLDS_VALUE (member) &&
+ TRUE == (installed = json_node_get_boolean (member)))
{
g_autofree gchar *install_dir = NULL;
g_autofree gchar *base = NULL;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]