[gnome-builder] flatpak: ensure we have access to project directory
- From: Christian Hergert <chergert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-builder] flatpak: ensure we have access to project directory
- Date: Sun, 28 Apr 2019 02:02:19 +0000 (UTC)
commit 656588da866d7b042cc6ccc2fa597b30a5f7de75
Author: Christian Hergert <chergert redhat com>
Date: Sat Apr 27 19:01:42 2019 -0700
flatpak: ensure we have access to project directory
This is useful when running unit tests since we don't install them.
src/plugins/flatpak/gbp-flatpak-runner.c | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
---
diff --git a/src/plugins/flatpak/gbp-flatpak-runner.c b/src/plugins/flatpak/gbp-flatpak-runner.c
index 0b9ac50b1..7da47f454 100644
--- a/src/plugins/flatpak/gbp-flatpak-runner.c
+++ b/src/plugins/flatpak/gbp-flatpak-runner.c
@@ -66,12 +66,25 @@ contains_argv (IdeSubprocessLauncher *launcher,
return g_strv_contains (args, arg);
}
+static gchar *
+get_project_build_dir (GbpFlatpakRunner *self)
+{
+ IdeContext *context;
+
+ g_assert (GBP_IS_FLATPAK_RUNNER (self));
+
+ context = ide_object_get_context (IDE_OBJECT (self));
+ return ide_context_cache_filename (context, NULL, NULL);
+}
+
static void
gbp_flatpak_runner_fixup_launcher (IdeRunner *runner,
IdeSubprocessLauncher *launcher)
{
GbpFlatpakRunner *self = (GbpFlatpakRunner *)runner;
g_autofree gchar *doc_portal = NULL;
+ g_autofree gchar *project_build_dir = NULL;
+ g_autofree gchar *project_build_dir_param = NULL;
IdeConfigManager *config_manager;
IdeConfig *config;
IdeEnvironment *env;
@@ -140,6 +153,11 @@ gbp_flatpak_runner_fixup_launcher (IdeRunner *runner,
ide_subprocess_launcher_insert_argv (launcher, i++, "--talk-name=org.freedesktop.portal.*");
+ /* Make sure we have access to the build directory */
+ project_build_dir = get_project_build_dir (self);
+ project_build_dir_param = g_strdup_printf ("--filesystem=%s", project_build_dir);
+ ide_subprocess_launcher_insert_argv (launcher, i++, project_build_dir_param);
+
/* Proxy environment stuff to the launcher */
if ((env = ide_runner_get_environment (runner)) &&
(environ_ = ide_environment_get_environ (env)))
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]