[gnome-builder/gnome-builder-3-26] buildsystem: translate include paths in build flags
- From: Christian Hergert <chergert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-builder/gnome-builder-3-26] buildsystem: translate include paths in build flags
- Date: Mon, 16 Oct 2017 09:58:53 +0000 (UTC)
commit a725680ba702231374b646152057f414b9c41852
Author: Christian Hergert <chergert redhat com>
Date: Mon Oct 16 02:11:39 2017 -0700
buildsystem: translate include paths in build flags
Previously, only the autotools plugin knew how to translate include paths so
that they could be accessed outside the runtime. This caused problems with
build systems like meson when using flatpak because clang did not know how to
access /app (and even some /usr) on the host.
This moves some post-processing to the base class which should allow some
build system plugins to continue being oblivious to the situation.
libide/buildsystem/ide-build-system.c | 95 +++++++++++++++++++++++++++++++++
1 files changed, 95 insertions(+), 0 deletions(-)
---
diff --git a/libide/buildsystem/ide-build-system.c b/libide/buildsystem/ide-build-system.c
index 44b950a..99849c1 100644
--- a/libide/buildsystem/ide-build-system.c
+++ b/libide/buildsystem/ide-build-system.c
@@ -22,6 +22,8 @@
#include "ide-debug.h"
#include "ide-object.h"
+#include "buildsystem/ide-build-manager.h"
+#include "buildsystem/ide-build-pipeline.h"
#include "buildsystem/ide-build-system.h"
#include "buildsystem/ide-configuration.h"
#include "files/ide-file.h"
@@ -335,6 +337,97 @@ ide_build_system_new_finish (GAsyncResult *result,
IDE_RETURN (IDE_BUILD_SYSTEM (ret));
}
+static gchar *
+ide_build_system_translate (IdeBuildSystem *self,
+ IdeBuildPipeline *pipeline,
+ const gchar *prefix,
+ const gchar *path)
+{
+ g_autofree gchar *freeme = NULL;
+ g_autofree gchar *translated_path = NULL;
+ g_autoptr(GFile) file = NULL;
+ g_autoptr(GFile) translated = NULL;
+ IdeRuntime *runtime;
+
+ g_assert (IDE_IS_BUILD_SYSTEM (self));
+ g_assert (!pipeline || IDE_IS_BUILD_PIPELINE (pipeline));
+ g_assert (prefix != NULL);
+ g_assert (path != NULL);
+
+ if (NULL == pipeline ||
+ NULL == (runtime = ide_build_pipeline_get_runtime (pipeline)))
+ return g_strdup_printf ("%s%s", prefix, path);
+
+ if (!g_path_is_absolute (path))
+ path = freeme = ide_build_pipeline_build_builddir_path (pipeline, path, NULL);
+
+ file = g_file_new_for_path (path);
+ translated = ide_runtime_translate_file (runtime, file);
+ translated_path = g_file_get_path (translated);
+
+ return g_strdup_printf ("%s%s", prefix, translated_path);
+}
+
+static void
+ide_build_system_post_process_build_flags (IdeBuildSystem *self,
+ gchar **flags)
+{
+ IdeBuildPipeline *pipeline;
+ IdeBuildManager *build_manager;
+ IdeContext *context;
+
+ g_assert (IDE_IS_BUILD_SYSTEM (self));
+ g_assert (flags != NULL);
+
+ context = ide_object_get_context (IDE_OBJECT (self));
+ build_manager = ide_context_get_build_manager (context);
+ pipeline = ide_build_manager_get_pipeline (build_manager);
+
+ for (guint i = 0; flags[i] != NULL; i++)
+ {
+ gchar *flag = flags[i];
+ gchar *translated;
+
+ if (flag[0] != '-')
+ continue;
+
+ switch (flag[1])
+ {
+ case 'I':
+ if (flag[2] == '\0')
+ {
+ if (flags[i+1] != NULL)
+ {
+ translated = ide_build_system_translate (self, pipeline, "", flags[++i]);
+ flags[i] = translated;
+ g_free (flag);
+ }
+ }
+ else
+ {
+ translated = ide_build_system_translate (self, pipeline, "-I", &flag[2]);
+ flags[i] = translated;
+ g_free (flag);
+ }
+ break;
+
+ case 'f': /* -fPIC */
+ case 'W': /* -Werror... */
+ case 'm': /* -m64 -mtune=native */
+ break;
+
+ case 'D':
+ case 'x':
+ if (strlen (flag) == 2)
+ i++;
+ break;
+
+ default:
+ break;
+ }
+ }
+}
+
void
ide_build_system_get_build_flags_async (IdeBuildSystem *self,
IdeFile *file,
@@ -371,6 +464,8 @@ ide_build_system_get_build_flags_finish (IdeBuildSystem *self,
g_return_val_if_fail (G_IS_TASK (result), NULL);
ret = IDE_BUILD_SYSTEM_GET_IFACE (self)->get_build_flags_finish (self, result, error);
+ if (ret != NULL)
+ ide_build_system_post_process_build_flags (self, ret);
IDE_RETURN (ret);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]