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

builder: Break out build-dir allocation code

tingping/wmclass
Alexander Larsson 2017-02-21 11:48:35 +01:00
parent 50c9812a56
commit 1cdd9e796d
3 changed files with 46 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
builder/builder-context.c
View File

@ -241,6 +241,44 @@ builder_context_get_build_dir (BuilderContext *self)
return self->build_dir;
}
GFile *
builder_context_allocate_build_subdir (BuilderContext *self,
const char *name,
GError **error)
{
g_autoptr(GError) my_error = NULL;
int count;
if (!flatpak_mkdir_p (self->build_dir,
NULL, error))
return NULL;
for (count = 1; count < 1000; count++)
{
g_autofree char *buildname = NULL;
g_autoptr(GFile) subdir = NULL;
buildname = g_strdup_printf ("%s-%d", name, count);
subdir = g_file_get_child (self->build_dir, buildname);
if (g_file_make_directory (subdir, NULL, &my_error))
return g_steal_pointer (&subdir);
else
{
if (!g_error_matches (my_error, G_IO_ERROR, G_IO_ERROR_EXISTS))
{
g_propagate_error (error, g_steal_pointer (&my_error));
return NULL;
}
g_clear_error (&my_error);
/* Already exists, try again */
}
}
flatpak_fail (error, "Unable to allocate build dir for %s\n", name);
return NULL;
}
GFile *
builder_context_get_ccache_dir (BuilderContext *self)
{

3
builder/builder-context.h
View File

@ -41,6 +41,9 @@ GFile * builder_context_get_base_dir (BuilderContext *self);
GFile * builder_context_get_state_dir (BuilderContext *self);
GFile * builder_context_get_cache_dir (BuilderContext *self);
GFile * builder_context_get_build_dir (BuilderContext *self);
GFile * builder_context_allocate_build_subdir (BuilderContext *self,
const char *name,
GError **error);
GFile * builder_context_get_ccache_dir (BuilderContext *self);
GFile * builder_context_get_download_dir (BuilderContext *self);
SoupSession * builder_context_get_soup_session (BuilderContext *self);

37
builder/builder-module.c
View File

@ -943,44 +943,17 @@ builder_module_build (BuilderModule *self,
g_autofree char *buildname = NULL;
g_autoptr(GError) my_error = NULL;
BuilderPostProcessFlags post_process_flags = 0;
int count;
build_parent_dir = builder_context_get_build_dir (context);
if (!flatpak_mkdir_p (build_parent_dir,
NULL, error))
source_dir = builder_context_allocate_build_subdir (context, self->name, error);
if (source_dir == NULL)
{
g_prefix_error (error, "module %s: ", self->name);
return FALSE;
}
for (count = 1; source_dir_path == NULL; count++)
{
g_autoptr(GFile) source_dir_count = NULL;
g_free (buildname);
buildname = g_strdup_printf ("%s-%d", self->name, count);
source_dir_count = g_file_get_child (build_parent_dir, buildname);
if (g_file_make_directory (source_dir_count, NULL, &my_error))
{
source_dir_path = g_file_get_path (source_dir_count);
}
else
{
if (!g_error_matches (my_error, G_IO_ERROR, G_IO_ERROR_EXISTS))
{
g_propagate_error (error, g_steal_pointer (&my_error));
g_prefix_error (error, "module %s: ", self->name);
return FALSE;
}
g_clear_error (&my_error);
/* Already exists, try again */
}
}
source_dir = g_file_new_for_path (source_dir_path);
build_parent_dir = g_file_get_parent (source_dir);
buildname = g_file_get_basename (source_dir);
source_dir_path = g_file_get_path (source_dir);
/* Make an unversioned symlink */
build_link = g_file_get_child (build_parent_dir, self->name);