[gnome-builder] foundry: use prefix-set to track :prefix overrides
- From: Christian Hergert <chergert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-builder] foundry: use prefix-set to track :prefix overrides
- Date: Tue, 28 May 2019 18:36:04 +0000 (UTC)
commit 8c47a105cacd0983d4e036f418419a503d830516
Author: Christian Hergert <chergert redhat com>
Date: Tue May 28 11:32:44 2019 -0700
foundry: use prefix-set to track :prefix overrides
src/libide/foundry/ide-runtime.c | 11 ++++++-----
src/plugins/flatpak/gbp-flatpak-runtime.c | 9 +++++----
src/plugins/jhbuild/jhbuild_plugin.py | 5 +++--
3 files changed, 14 insertions(+), 11 deletions(-)
---
diff --git a/src/libide/foundry/ide-runtime.c b/src/libide/foundry/ide-runtime.c
index 38b5fc62b..a0670f3ef 100644
--- a/src/libide/foundry/ide-runtime.c
+++ b/src/libide/foundry/ide-runtime.c
@@ -140,15 +140,15 @@ ide_runtime_contains_program_in_path (IdeRuntime *self,
}
static void
-ide_runtime_real_prepare_configuration (IdeRuntime *self,
- IdeConfig *configuration)
+ide_runtime_real_prepare_configuration (IdeRuntime *self,
+ IdeConfig *config)
{
IdeRuntimePrivate *priv = ide_runtime_get_instance_private (self);
g_assert (IDE_IS_RUNTIME (self));
- g_assert (IDE_IS_CONFIG (configuration));
+ g_assert (IDE_IS_CONFIG (config));
- if (NULL == ide_config_get_prefix (configuration))
+ if (!ide_config_get_prefix_set (config))
{
g_autofree gchar *install_path = NULL;
g_autofree gchar *project_id = NULL;
@@ -164,7 +164,8 @@ ide_runtime_real_prepare_configuration (IdeRuntime *self,
priv->id,
NULL);
- ide_config_set_prefix (configuration, install_path);
+ ide_config_set_prefix (config, install_path);
+ ide_config_set_prefix_set (config, FALSE);
}
}
diff --git a/src/plugins/flatpak/gbp-flatpak-runtime.c b/src/plugins/flatpak/gbp-flatpak-runtime.c
index 39a0cfda4..01c6f115f 100644
--- a/src/plugins/flatpak/gbp-flatpak-runtime.c
+++ b/src/plugins/flatpak/gbp-flatpak-runtime.c
@@ -351,13 +351,14 @@ gbp_flatpak_runtime_create_runner (IdeRuntime *runtime,
}
static void
-gbp_flatpak_runtime_prepare_configuration (IdeRuntime *runtime,
- IdeConfig *configuration)
+gbp_flatpak_runtime_prepare_configuration (IdeRuntime *runtime,
+ IdeConfig *config)
{
g_assert (GBP_IS_FLATPAK_RUNTIME (runtime));
- g_assert (IDE_IS_CONFIG (configuration));
+ g_assert (IDE_IS_CONFIG (config));
- ide_config_set_prefix (configuration, "/app");
+ ide_config_set_prefix (config, "/app");
+ ide_config_set_prefix_set (config, FALSE);
}
static void
diff --git a/src/plugins/jhbuild/jhbuild_plugin.py b/src/plugins/jhbuild/jhbuild_plugin.py
index 5c8271e4c..9f2328454 100644
--- a/src/plugins/jhbuild/jhbuild_plugin.py
+++ b/src/plugins/jhbuild/jhbuild_plugin.py
@@ -55,7 +55,7 @@ class JhbuildRuntime(Ide.Runtime):
return launcher
- def do_prepare_configuration(self, configuration):
+ def do_prepare_configuration(self, config):
launcher = self.create_launcher()
launcher.push_argv('sh')
launcher.push_argv('-c')
@@ -75,7 +75,8 @@ class JhbuildRuntime(Ide.Runtime):
if not prefix:
prefix = os.path.join(GLib.get_home_dir(), 'jhbuild', 'install')
- configuration.set_prefix(prefix)
+ config.set_prefix(prefix)
+ config.set_prefix_set(False)
def do_contains_program_in_path(self, program, cancellable):
launcher = self.create_launcher()
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]