[gnome-builder] flatpak: propagate builddir:(true|false) to config

[Christian Hergert <chergert src gnome org>]

commit 189b6c6688cd7bf84cdd9e9f2af66d08a91c91c5
Author: Christian Hergert <chergert redhat com>
Date:   Tue Jan 16 00:46:13 2018 -0800

    flatpak: propagate builddir:(true|false) to config
    
    If the builddir attribute is set, we need to propagate it to the
    build configuration so the build system can potentially override
    the build directory that will be used.

 src/plugins/flatpak/gbp-flatpak-configuration.c | 10 ++++++++++
 1 file changed, 10 insertions(+)
---
diff --git a/src/plugins/flatpak/gbp-flatpak-configuration.c b/src/plugins/flatpak/gbp-flatpak-configuration.c
index bb9bd76ba..d13ed81df 100644
--- a/src/plugins/flatpak/gbp-flatpak-configuration.c
+++ b/src/plugins/flatpak/gbp-flatpak-configuration.c
@@ -419,6 +419,7 @@ gbp_flatpak_configuration_load_from_file (GbpFlatpakConfiguration *self,
       const gchar *primary_module_name;
       JsonObject *primary_module_object;
       g_autofree gchar *config_opts = NULL;
+      IdeBuildLocality locality = IDE_BUILD_LOCALITY_IN_TREE;
 
       primary_module_object = json_node_get_object (primary_module_node);
       primary_module_name = json_object_get_string_member (primary_module_object, "name");
@@ -427,6 +428,15 @@ gbp_flatpak_configuration_load_from_file (GbpFlatpakConfiguration *self,
       config_opts = get_argv_from_member (primary_module_object, "config-opts");
       ide_configuration_set_config_opts (IDE_CONFIGURATION (self), config_opts);
 
+      if (json_object_has_member (primary_module_object, "builddir"))
+        {
+          gboolean builddir = json_object_get_boolean_member (primary_module_object, "builddir");
+          locality = builddir ? IDE_BUILD_LOCALITY_OUT_OF_TREE : IDE_BUILD_LOCALITY_IN_TREE;
+        }
+
+      /* Flatpak does in-tree builds by default unless "builddir": true */
+      ide_configuration_set_locality (IDE_CONFIGURATION (self), locality);
+
       if (json_object_has_member (primary_module_object, "build-commands"))
         {
           JsonArray *build_commands_array;