marko10_000
/
flatpak-builder
forked from Mirrors/flatpak-builder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

builder: Build runtimes in /run/build-runtime 

This way we the runtime build dir doesn't conflict with the app dir.
Which is good if we want debuginfo with sources for both.
tingping/wmclass
Alexander Larsson 2016-02-23 14:12:20 +01:00
parent 22d997e712
commit 90aaed7f7b
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
builder/builder-manifest.c
View File

@ -1971,7 +1971,9 @@ builder_manifest_run (BuilderManifest *self,
g_ptr_array_add (args, g_strdup ("build"));
build_dir_path = g_file_get_path (builder_context_get_build_dir (context));
g_ptr_array_add (args, g_strdup_printf ("--bind-mount=/run/build=%s", build_dir_path));
g_ptr_array_add (args, g_strdup_printf ("--bind-mount=/run/%s=%s",
builder_context_get_build_runtime (context) ? "build-runtime" : "build",
build_dir_path));
if (g_file_query_exists (builder_context_get_ccache_dir (context), NULL))
{

12
builder/builder-module.c
View File

@ -572,6 +572,7 @@ build (GFile *app_dir,
g_autofree char *source_dir_path = g_file_get_path (source_dir);
g_autofree char *source_dir_path_canonical = NULL;
g_autofree char *ccache_dir_path = NULL;
const char *builddir;
va_list ap;
int i;
@ -581,14 +582,19 @@ build (GFile *app_dir,
source_dir_path_canonical = canonicalize_file_name (source_dir_path);
if (builder_context_get_build_runtime (context))
builddir = "/run/build-runtime/";
else
builddir = "/run/build/";
g_ptr_array_add (args, g_strdup ("--nofilesystem=host"));
g_ptr_array_add (args, g_strdup_printf ("--filesystem=%s", source_dir_path_canonical));
g_ptr_array_add (args, g_strdup_printf ("--bind-mount=/run/build/%s=%s", module_name, source_dir_path_canonical));
g_ptr_array_add (args, g_strdup_printf ("--bind-mount=%s%s=%s", builddir, module_name, source_dir_path_canonical));
if (cwd_subdir)
g_ptr_array_add (args, g_strdup_printf ("--build-dir=/run/build/%s/%s", module_name, cwd_subdir));
g_ptr_array_add (args, g_strdup_printf ("--build-dir=%s%s/%s", builddir, module_name, cwd_subdir));
else
g_ptr_array_add (args, g_strdup_printf ("--build-dir=/run/build/%s", module_name));
g_ptr_array_add (args, g_strdup_printf ("--build-dir=%s%s", builddir, module_name));
if (g_file_query_exists (builder_context_get_ccache_dir (context), NULL))
{