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

run: Be more flexible with --runtime option, and add --runtime-version 

This makes it easier to experiment with running an app with a
different runtime.
tingping/wmclass
Alexander Larsson 2016-01-12 09:57:20 +01:00
parent 5a905d913c
commit 1934562ca2
5 changed files with 58 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/xdg-app-builtins-run.c
View File

@ -40,6 +40,7 @@ static char *opt_branch;
static char *opt_command;
static gboolean opt_devel;
static char *opt_runtime;
static char *opt_runtime_version;
static GOptionEntry options[] = {
{ "arch", 0, 0, G_OPTION_ARG_STRING, &opt_arch, "Arch to use", "ARCH" },
@ -47,6 +48,7 @@ static GOptionEntry options[] = {
{ "branch", 0, 0, G_OPTION_ARG_STRING, &opt_branch, "Branch to use", "BRANCH" },
{ "devel", 'd', 0, G_OPTION_ARG_NONE, &opt_devel, "Use development runtime", NULL },
{ "runtime", 0, 0, G_OPTION_ARG_STRING, &opt_runtime, "Runtime to use", "RUNTIME" },
{ "runtime-version", 0, 0, G_OPTION_ARG_STRING, &opt_runtime_version, "Runtime version to use", "VERSION" },
{ NULL }
};
@ -102,6 +104,7 @@ xdg_app_builtin_run (int argc, char **argv, GCancellable *cancellable, GError **
if (!xdg_app_run_app (app_ref, app_deploy,
arg_context,
opt_runtime,
opt_runtime_version,
opt_devel ? XDG_APP_RUN_FLAG_DEVEL : 0,
opt_command,
&argv[rest_argv_start + 1],

53
common/xdg-app-run.c
View File

@ -2073,6 +2073,7 @@ xdg_app_run_app (const char *app_ref,
XdgAppDeploy *app_deploy,
XdgAppContext *extra_context,
const char *custom_runtime,
const char *custom_runtime_version,
XdgAppRunFlags flags,
const char *custom_command,
char *args[],
@ -2085,6 +2086,7 @@ xdg_app_run_app (const char *app_ref,
g_autoptr(GFile) runtime_files = NULL;
g_autoptr(GFile) app_id_dir = NULL;
g_autofree char *runtime = NULL;
g_autofree char *default_runtime = NULL;
g_autofree char *default_command = NULL;
g_autofree char *runtime_ref = NULL;
g_autoptr(GKeyFile) metakey = NULL;
@ -2093,6 +2095,8 @@ xdg_app_run_app (const char *app_ref,
g_auto(GStrv) envp = NULL;
g_autoptr(GPtrArray) dbus_proxy_argv = NULL;
const char *command = "/bin/sh";
g_autoptr(GError) my_error = NULL;
g_auto(GStrv) runtime_parts = NULL;
int i;
g_autoptr(XdgAppContext) app_context = NULL;
g_autoptr(XdgAppContext) overrides = NULL;
@ -2112,22 +2116,47 @@ xdg_app_run_app (const char *app_ref,
if (!xdg_app_run_add_extension_args (argv_array, metakey, app_ref, cancellable, error))
return FALSE;
if (custom_runtime)
runtime = g_strdup (custom_runtime);
else
default_runtime = g_key_file_get_string (metakey, "Application",
(flags & XDG_APP_RUN_FLAG_DEVEL) != 0 ? "sdk" : "runtime",
&my_error);
if (my_error)
{
g_autoptr(GError) my_error = NULL;
runtime = g_key_file_get_string (metakey, "Application",
(flags & XDG_APP_RUN_FLAG_DEVEL) != 0 ? "sdk" : "runtime",
&my_error);
if (my_error)
g_propagate_error (error, g_steal_pointer (&my_error));
return FALSE;
}
runtime_parts = g_strsplit (default_runtime, "/", 0);
if (g_strv_length (runtime_parts) != 3)
return xdg_app_fail (error, "Wrong number of components in runtime %s", default_runtime);
if (custom_runtime)
{
g_auto(GStrv) custom_runtime_parts = g_strsplit (custom_runtime, "/", 0);
for (i = 0; i < 3 && custom_runtime_parts[i] != NULL; i++)
{
g_propagate_error (error, g_steal_pointer (&my_error));
return FALSE;
if (strlen (custom_runtime_parts[i]) > 0)
{
g_free (runtime_parts[i]);
runtime_parts[i] = g_steal_pointer (&custom_runtime_parts[i]);
}
}
}
runtime_ref = g_build_filename ("runtime", runtime, NULL);
if (custom_runtime_version)
{
g_free (runtime_parts[2]);
runtime_parts[2] = g_strdup (custom_runtime_version);
}
runtime_ref = xdg_app_compose_ref (FALSE,
runtime_parts[0],
runtime_parts[2],
runtime_parts[1],
error);
if (runtime_ref == NULL)
return FALSE;
runtime_deploy = xdg_app_find_deploy_for_ref (runtime_ref, cancellable, error);
if (runtime_deploy == NULL)
@ -2188,8 +2217,6 @@ xdg_app_run_app (const char *app_ref,
command = custom_command;
else
{
g_autoptr(GError) my_error = NULL;
default_command = g_key_file_get_string (metakey, "Application", "command", &my_error);
if (my_error)
{

1
common/xdg-app-run.h
View File

@ -84,6 +84,7 @@ gboolean xdg_app_run_app (const char *app_ref,
XdgAppDeploy *app_deploy,
XdgAppContext *extra_context,
const char *custom_runtime,
const char *custom_runtime_version,
XdgAppRunFlags flags,
const char *custom_command,
char *args[],

14
doc/xdg-app-run.xml
View File

@ -112,7 +112,19 @@
<term><option>--runtime=RUNTIME</option></term>
<listitem><para>
Use this runtime instead of the one that is specified in the application metadata.
Use this runtime instead of the one that is specified in the application metadata.
This is a full tuple, like for example <arg choice="plain">org.freedesktop.Sdk/x86_64/1.2</arg>, but
partial tuples are allowed. Any empty or missing parts are filled in with the corresponding
values specified by the app.
</para></listitem>
</varlistentry>
<varlistentry>
<term><option>--runtime-version=VERSION</option></term>
<listitem><para>
Use this version of the runtime instead of the one that is specified in the application metadata.
This overrides any version specified with the --runtime option.
</para></listitem>
</varlistentry>

2
lib/xdg-app-installation.c
View File

@ -193,7 +193,7 @@ xdg_app_installation_launch (XdgAppInstallation *self,
return xdg_app_run_app (app_ref,
app_deploy,
NULL,
NULL, NULL,
NULL,
XDG_APP_RUN_FLAG_BACKGROUND,
NULL,