From 8abbc0186efe977cec2a3214e7aa3703e9f1169f Mon Sep 17 00:00:00 2001 From: Alexander Larsson Date: Mon, 9 May 2016 11:07:53 +0200 Subject: Rename everything but the on-disk location to flatpak --- builder/Makefile.am.inc | 8 ++++---- builder/builder-context.c | 6 +++--- builder/builder-main.c | 2 +- builder/builder-manifest.c | 24 ++++++++++++------------ builder/builder-module.c | 2 +- builder/builder-source-shell.c | 2 +- 6 files changed, 22 insertions(+), 22 deletions(-) (limited to 'builder') diff --git a/builder/Makefile.am.inc b/builder/Makefile.am.inc index 1f560d5..b1f7117 100644 --- a/builder/Makefile.am.inc +++ b/builder/Makefile.am.inc @@ -1,8 +1,8 @@ bin_PROGRAMS += \ - xdg-app-builder \ + flatpak-builder \ $(NULL) -xdg_app_builder_SOURCES = \ +flatpak_builder_SOURCES = \ builder/builder-main.c \ builder/builder-manifest.c \ builder/builder-manifest.h \ @@ -34,6 +34,6 @@ xdg_app_builder_SOURCES = \ builder/builder-utils.h \ $(NULL) -xdg_app_builder_LDADD = $(BASE_LIBS) $(OSTREE_LIBS) $(JSON_LIBS) $(SOUP_LIBS) $(LIBARCHIVE_LIBS) $(LIBELF_LIBS) \ +flatpak_builder_LDADD = $(BASE_LIBS) $(OSTREE_LIBS) $(JSON_LIBS) $(SOUP_LIBS) $(LIBARCHIVE_LIBS) $(LIBELF_LIBS) \ libglnx.la libflatpak-common.la -xdg_app_builder_CFLAGS = $(BASE_CFLAGS) $(OSTREE_CFLAGS) $(JSON_CFLAGS) $(SOUP_CFLAGS) $(LIBARCHIVE_CFLAGS) +flatpak_builder_CFLAGS = $(BASE_CFLAGS) $(OSTREE_CFLAGS) $(JSON_CFLAGS) $(SOUP_CFLAGS) $(LIBARCHIVE_CFLAGS) diff --git a/builder/builder-context.c b/builder/builder-context.c index f0e127d..afc5bc9 100644 --- a/builder/builder-context.c +++ b/builder/builder-context.c @@ -137,7 +137,7 @@ builder_context_constructed (GObject *object) { BuilderContext *self = BUILDER_CONTEXT (object); - self->state_dir = g_file_get_child (self->base_dir, ".xdg-app-builder"); + self->state_dir = g_file_get_child (self->base_dir, ".flatpak-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"); @@ -224,7 +224,7 @@ builder_context_get_soup_session (BuilderContext *self) { const char *http_proxy; - self->soup_session = soup_session_new_with_options (SOUP_SESSION_USER_AGENT, "xdg-app-builder ", + self->soup_session = soup_session_new_with_options (SOUP_SESSION_USER_AGENT, "flatpak-builder ", SOUP_SESSION_SSL_USE_SYSTEM_CA_FILE, TRUE, SOUP_SESSION_USE_THREAD_CONTEXT, TRUE, SOUP_SESSION_TIMEOUT, 60, @@ -391,7 +391,7 @@ builder_context_extend_env (BuilderContext *self, const char *old_path = g_environ_getenv (envp, "PATH"); g_autofree char *new_path = NULL; if (old_path == NULL) - old_path = "/app/bin:/usr/bin"; /* This is the xdg-app default PATH */ + old_path = "/app/bin:/usr/bin"; /* This is the flatpak default PATH */ new_path = g_strdup_printf ("/run/ccache/bin:%s", old_path); envp = g_environ_setenv (envp, "PATH", new_path, TRUE); diff --git a/builder/builder-main.c b/builder/builder-main.c index 41c5e18..512859c 100644 --- a/builder/builder-main.c +++ b/builder/builder-main.c @@ -112,7 +112,7 @@ do_export (BuilderContext *build_context, g_autoptr(GSubprocess) subp = NULL; args = g_ptr_array_new_with_free_func (g_free); - g_ptr_array_add (args, g_strdup ("xdg-app")); + g_ptr_array_add (args, g_strdup ("flatpak")); g_ptr_array_add (args, g_strdup ("build-export")); g_ptr_array_add (args, g_strdup_printf ("--arch=%s", builder_context_get_arch (build_context))); diff --git a/builder/builder-manifest.c b/builder/builder-manifest.c index 95ae42b..986f7ef 100644 --- a/builder/builder-manifest.c +++ b/builder/builder-manifest.c @@ -818,7 +818,7 @@ builder_manifest_get_branch (BuilderManifest *self) } static char * -xdg_app (GError **error, +flatpak (GError **error, ...) { gboolean res; @@ -826,7 +826,7 @@ xdg_app (GError **error, va_list ap; va_start (ap, error); - res = flatpak_spawn (NULL, &output, error, "xdg-app", ap); + res = flatpak_spawn (NULL, &output, error, "flatpak", ap); va_end (ap); if (res) @@ -846,14 +846,14 @@ builder_manifest_start (BuilderManifest *self, arch_option = g_strdup_printf ("--arch=%s", builder_context_get_arch (context)); - self->sdk_commit = xdg_app (NULL, "info", arch_option, "--show-commit", self->sdk, + self->sdk_commit = flatpak (NULL, "info", arch_option, "--show-commit", self->sdk, builder_manifest_get_runtime_version (self), NULL); if (self->sdk_commit == NULL) return flatpak_fail (error, "Unable to find sdk %s version %s", self->sdk, builder_manifest_get_runtime_version (self)); - self->runtime_commit = xdg_app (NULL, "info", arch_option, "--show-commit", self->runtime, + self->runtime_commit = flatpak (NULL, "info", arch_option, "--show-commit", self->runtime, builder_manifest_get_runtime_version (self), NULL); if (self->runtime_commit == NULL) return flatpak_fail (error, "Unable to find runtime %s version %s", @@ -899,7 +899,7 @@ builder_manifest_init_app_dir (BuilderManifest *self, args = g_ptr_array_new_with_free_func (g_free); - g_ptr_array_add (args, g_strdup ("xdg-app")); + g_ptr_array_add (args, g_strdup ("flatpak")); g_ptr_array_add (args, g_strdup ("build-init")); if (self->writable_sdk || self->build_runtime) { @@ -1129,7 +1129,7 @@ command (GFile *app_dir, int i; args = g_ptr_array_new_with_free_func (g_free); - g_ptr_array_add (args, g_strdup ("xdg-app")); + g_ptr_array_add (args, g_strdup ("flatpak")); g_ptr_array_add (args, g_strdup ("build")); g_ptr_array_add (args, g_strdup ("--nofilesystem=host")); @@ -1306,7 +1306,7 @@ appstream_compose (GFile *app_dir, va_list ap; args = g_ptr_array_new_with_free_func (g_free); - g_ptr_array_add (args, g_strdup ("xdg-app")); + g_ptr_array_add (args, g_strdup ("flatpak")); g_ptr_array_add (args, g_strdup ("build")); g_ptr_array_add (args, g_strdup ("--nofilesystem=host")); g_ptr_array_add (args, g_file_get_path (app_dir)); @@ -1550,7 +1550,7 @@ builder_manifest_cleanup (BuilderManifest *self, g_print ("Running appstream-compose\n"); if (!appstream_compose (app_dir, error, self->build_runtime ? "--prefix=/usr" : "--prefix=/app", - "--origin=xdg-app", + "--origin=flatpak", basename_arg, self->id, NULL)) @@ -1605,7 +1605,7 @@ builder_manifest_finish (BuilderManifest *self, } args = g_ptr_array_new_with_free_func (g_free); - g_ptr_array_add (args, g_strdup ("xdg-app")); + g_ptr_array_add (args, g_strdup ("flatpak")); g_ptr_array_add (args, g_strdup ("build-finish")); if (self->command) g_ptr_array_add (args, g_strdup_printf ("--command=%s", self->command)); @@ -1771,7 +1771,7 @@ builder_manifest_create_platform (BuilderManifest *self, args = g_ptr_array_new_with_free_func (g_free); - g_ptr_array_add (args, g_strdup ("xdg-app")); + g_ptr_array_add (args, g_strdup ("flatpak")); g_ptr_array_add (args, g_strdup ("build-init")); g_ptr_array_add (args, g_strdup ("--update")); g_ptr_array_add (args, g_strdup ("--writable-sdk")); @@ -1985,7 +1985,7 @@ builder_manifest_run (BuilderManifest *self, return FALSE; args = g_ptr_array_new_with_free_func (g_free); - g_ptr_array_add (args, g_strdup ("xdg-app")); + g_ptr_array_add (args, g_strdup ("flatpak")); g_ptr_array_add (args, g_strdup ("build")); build_dir_path = g_file_get_path (builder_context_get_build_dir (context)); @@ -2038,7 +2038,7 @@ builder_manifest_run (BuilderManifest *self, if (!execvp ((char *) args->pdata[0], (char **) args->pdata)) { - g_set_error (error, G_IO_ERROR, g_io_error_from_errno (errno), "Unable to start xdg-app build"); + g_set_error (error, G_IO_ERROR, g_io_error_from_errno (errno), "Unable to start flatpak build"); return FALSE; } diff --git a/builder/builder-module.c b/builder/builder-module.c index 178b071..2ba5c37 100644 --- a/builder/builder-module.c +++ b/builder/builder-module.c @@ -583,7 +583,7 @@ build (GFile *app_dir, int i; args = g_ptr_array_new_with_free_func (g_free); - g_ptr_array_add (args, g_strdup ("xdg-app")); + g_ptr_array_add (args, g_strdup ("flatpak")); g_ptr_array_add (args, g_strdup ("build")); source_dir_path_canonical = canonicalize_file_name (source_dir_path); diff --git a/builder/builder-source-shell.c b/builder/builder-source-shell.c index e9ebcbb..2902258 100644 --- a/builder/builder-source-shell.c +++ b/builder/builder-source-shell.c @@ -126,7 +126,7 @@ run_script (BuilderContext *context, g_autofree char *source_dir_path_canonical = NULL; args = g_ptr_array_new_with_free_func (g_free); - g_ptr_array_add (args, g_strdup ("xdg-app")); + g_ptr_array_add (args, g_strdup ("flatpak")); g_ptr_array_add (args, g_strdup ("build")); source_dir_path_canonical = canonicalize_file_name (source_dir_path); -- cgit v1.2.1