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

Drop the --arch option for make-reop 

We can determine the arch from the metadata.
tingping/wmclass
Matthias Clasen 2015-01-16 11:22:39 -05:00
parent 3b92f28eea
commit 842ba6a649
2 changed files with 43 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
doc/xdg-app-make-repo.xml
View File

@ -58,8 +58,8 @@
<para>
The contents of <arg choice="plain">DIRECTORY</arg> are committed
on the branch with name <literal>app/NAME/ARCH/BRANCH</literal>,
where ARCH is the architecture of the host system unless overridden
by the <option>--arch</option> option.
where ARCH is the architecture of the runtime that the application
is using.
</para>
<para>
After this command, <arg choice="plain">REPO</arg> can be
@ -83,14 +83,6 @@
</para></listitem>
</varlistentry>
<varlistentry>
<term><option>--arch=ARCH</option></term>
<listitem><para>
The architecture to use.
</para></listitem>
</varlistentry>
<varlistentry>
<term><option>-v</option></term>
<term><option>--verbose</option></term>

55
xdg-app-builtins-make-repo.c
View File

@ -10,13 +10,42 @@
#include "xdg-app-builtins.h"
#include "xdg-app-utils.h"
static char *opt_arch;
static GOptionEntry options[] = {
{ "arch", 0, 0, G_OPTION_ARG_STRING, &opt_arch, "Arch to use", "ARCH" },
{ NULL }
};
static gboolean
metadata_get_arch (GFile *file, char **out_arch, GError **error)
{
gboolean ret = FALSE;
gs_free char *path = NULL;
gs_unref_keyfile GKeyFile *keyfile = NULL;
gs_free char *runtime = NULL;
gs_strfreev char **parts = NULL;
keyfile = g_key_file_new ();
path = g_file_get_path (file);
if (!g_key_file_load_from_file (keyfile, path, G_KEY_FILE_NONE, error))
goto out;
runtime = g_key_file_get_string (keyfile, "Application", "runtime", error);
if (*error)
goto out;
parts = g_strsplit (runtime, "/", 0);
if (g_strv_length (parts) != 3)
{
g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, "Failed to determine arch from metadata runtime key: %s", runtime);
goto out;
}
*out_arch = g_strdup (parts[1]);
ret = TRUE;
out:
return ret;
}
gboolean
xdg_app_builtin_make_repo (int argc, char **argv, GCancellable *cancellable, GError **error)
{
@ -33,8 +62,8 @@ xdg_app_builtin_make_repo (int argc, char **argv, GCancellable *cancellable, GEr
const char *repoarg;
const char *directory;
const char *name;
const char *arch;
const char *branch;
gs_free char *arch = NULL;
gs_free char *full_branch = NULL;
gs_free char *parent = NULL;
gs_free char *commit_checksum = NULL;
@ -50,7 +79,7 @@ xdg_app_builtin_make_repo (int argc, char **argv, GCancellable *cancellable, GEr
if (argc < 4)
{
usage_error (context, "RUNTIME must be specified", error);
usage_error (context, "REPO, DIRECTORY and NAME must be specified", error);
goto out;
}
@ -63,15 +92,6 @@ xdg_app_builtin_make_repo (int argc, char **argv, GCancellable *cancellable, GEr
else
branch = "master";
if (opt_arch)
arch = opt_arch;
else
arch = xdg_app_get_arch ();
subject = "Import an application build";
body = g_strconcat ("Name: ", name, "\nArch: ", arch, "\nBranch: ", branch, NULL);
full_branch = g_strconcat ("app/", name, "/", arch, "/", branch, NULL);
base = g_file_new_for_commandline_arg (directory);
files = g_file_get_child (base, "files");
metadata = g_file_get_child (base, "metadata");
@ -90,6 +110,13 @@ xdg_app_builtin_make_repo (int argc, char **argv, GCancellable *cancellable, GEr
goto out;
}
if (!metadata_get_arch (metadata, &arch, error))
goto out;
subject = "Import an application build";
body = g_strconcat ("Name: ", name, "\nArch: ", arch, "\nBranch: ", branch, NULL);
full_branch = g_strconcat ("app/", name, "/", arch, "/", branch, NULL);
repofile = g_file_new_for_commandline_arg (repoarg);
repo = ostree_repo_new (repofile);