[gnome-builder] flatpak: special case cmake-ninja and simple buildsystems
- From: Christian Hergert <chergert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-builder] flatpak: special case cmake-ninja and simple buildsystems
- Date: Wed, 15 Mar 2017 10:07:31 +0000 (UTC)
commit 7cd3d80832dfa849754b42b04377beba7d99c7d1
Author: Christian Hergert <chergert redhat com>
Date: Wed Mar 15 03:07:16 2017 -0700
flatpak: special case cmake-ninja and simple buildsystems
These don't map to our naming in Builder, so adjust them to match closer
to what we support in Builder.
.../flatpak/gbp-flatpak-build-system-discovery.c | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
---
diff --git a/plugins/flatpak/gbp-flatpak-build-system-discovery.c
b/plugins/flatpak/gbp-flatpak-build-system-discovery.c
index 25eea95..f7ac007 100644
--- a/plugins/flatpak/gbp-flatpak-build-system-discovery.c
+++ b/plugins/flatpak/gbp-flatpak-build-system-discovery.c
@@ -109,6 +109,9 @@ gbp_flatpak_build_system_discovery_discover (IdeBuildSystemDiscovery *discovery
IDE_TRACE_MSG ("We found %u potential manifests", manifests->len);
+ if (priority)
+ *priority = 0;
+
for (guint i = 0; i < manifests->len; i++)
{
GFile *file = g_ptr_array_index (manifests, i);
@@ -159,12 +162,19 @@ gbp_flatpak_build_system_discovery_discover (IdeBuildSystemDiscovery *discovery
NULL != (buildsystem = json_node_get_string (buildsystem_node)) &&
*buildsystem != '\0')
{
- gchar *ret = g_strdup (buildsystem);
+ gchar *ret;
- IDE_TRACE_MSG ("Discovered buildsystem of type \"%s\"", ret);
+ if (ide_str_equal0 (buildsystem, "cmake-ninja"))
+ buildsystem = "cmake";
- *priority = 0;
+ /* TODO: We could maybe support this if we properly extract the
+ * build-commands property from the manifest.
+ */
+ else if (ide_str_equal0 (buildsystem, "simple"))
+ IDE_RETURN (NULL);
+ ret = g_strdup (buildsystem);
+ IDE_TRACE_MSG ("Discovered buildsystem of type \"%s\"", ret);
IDE_RETURN (ret);
}
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]