diff options
| author | Alexander Larsson <alexl@redhat.com> | 2016-02-17 09:09:45 +0100 |
|---|---|---|
| committer | Alexander Larsson <alexl@redhat.com> | 2016-02-17 10:26:32 +0100 |
| commit | e233705379399776270296b8e350e8b14754d82a (patch) | |
| tree | 6635fdf4c0c56fefec606a62e4df2ce79edb5908 /builder | |
| parent | 393163200d5bf3c38572b0a05ec3f6beb9992049 (diff) | |
| download | xdg-app-e233705379399776270296b8e350e8b14754d82a.tar.gz | |
builder: Add build_context_get_build_dir()
Diffstat (limited to 'builder')
| -rw-r--r-- | builder/builder-context.c | 8 | ||||
| -rw-r--r-- | builder/builder-context.h | 1 | ||||
| -rw-r--r-- | builder/builder-module.c | 4 |
3 files changed, 11 insertions, 2 deletions
diff --git a/builder/builder-context.c b/builder/builder-context.c index e964681..ed908a1 100644 --- a/builder/builder-context.c +++ b/builder/builder-context.c @@ -41,6 +41,7 @@ struct BuilderContext { GFile *download_dir; GFile *state_dir; + GFile *build_dir; GFile *cache_dir; GFile *ccache_dir; @@ -135,6 +136,7 @@ builder_context_constructed (GObject *object) self->state_dir = g_file_get_child (self->base_dir, ".xdg-app-builder"); self->download_dir = g_file_get_child (self->state_dir, "downloads"); + self->build_dir = g_file_get_child (self->state_dir, "build"); self->cache_dir = g_file_get_child (self->state_dir, "cache"); self->ccache_dir = g_file_get_child (self->state_dir, "ccache"); } @@ -201,6 +203,12 @@ builder_context_get_cache_dir (BuilderContext *self) } GFile * +builder_context_get_build_dir (BuilderContext *self) +{ + return self->build_dir; +} + +GFile * builder_context_get_ccache_dir (BuilderContext *self) { return self->ccache_dir; diff --git a/builder/builder-context.h b/builder/builder-context.h index 1a46c9c..b497c1c 100644 --- a/builder/builder-context.h +++ b/builder/builder-context.h @@ -39,6 +39,7 @@ GFile * builder_context_get_app_dir (BuilderContext *self); 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_get_ccache_dir (BuilderContext *self); GFile * builder_context_get_download_dir (BuilderContext *self); SoupSession * builder_context_get_soup_session (BuilderContext *self); diff --git a/builder/builder-module.c b/builder/builder-module.c index 58b9ce7..5ae29e9 100644 --- a/builder/builder-module.c +++ b/builder/builder-module.c @@ -749,7 +749,7 @@ builder_module_build (BuilderModule *self, g_autoptr(GFile) configure_file = NULL; g_autoptr(GFile) cmake_file = NULL; const char *makefile_names[] = {"Makefile", "makefile", "GNUmakefile", NULL}; - g_autoptr(GFile) build_parent_dir = NULL; + GFile *build_parent_dir = NULL; g_autoptr(GFile) build_dir = NULL; g_autoptr(GFile) build_link = NULL; g_autofree char *build_dir_relative = NULL; @@ -768,7 +768,7 @@ builder_module_build (BuilderModule *self, g_autoptr(GError) my_error = NULL; int count; - build_parent_dir = g_file_get_child (builder_context_get_state_dir (context), "build"); + build_parent_dir = builder_context_get_build_dir (context); if (!gs_file_ensure_directory (build_parent_dir, TRUE, NULL, error)) |