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

builder: Support writable-sdk option

tingping/wmclass
Alexander Larsson 2015-12-15 19:34:52 +01:00
parent 1baa77f107
commit 739b5ab6db
2 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
builder/builder-manifest.c
View File

@ -49,6 +49,7 @@ struct BuilderManifest {
gboolean copy_icon;
char *desktop_file_name_prefix;
char *desktop_file_name_suffix;
gboolean writable_sdk;
gboolean strip;
char *command;
BuilderOptions *build_options;
@ -76,6 +77,7 @@ enum {
PROP_MODULES,
PROP_CLEANUP,
PROP_STRIP,
PROP_WRITABLE_SDK,
PROP_FINISH_ARGS,
PROP_RENAME_DESKTOP_FILE,
PROP_RENAME_ICON,
@ -162,6 +164,10 @@ builder_manifest_get_property (GObject *object,
g_value_set_boolean (value, self->strip);
break;
case PROP_WRITABLE_SDK:
g_value_set_boolean (value, self->writable_sdk);
break;
case PROP_COPY_ICON:
g_value_set_boolean (value, self->copy_icon);
break;
@ -254,6 +260,10 @@ builder_manifest_set_property (GObject *object,
self->strip = g_value_get_boolean (value);
break;
case PROP_WRITABLE_SDK:
self->writable_sdk = g_value_get_boolean (value);
break;
case PROP_COPY_ICON:
self->copy_icon = g_value_get_boolean (value);
break;
@ -368,6 +378,13 @@ builder_manifest_class_init (BuilderManifestClass *klass)
"",
TRUE,
G_PARAM_READWRITE));
g_object_class_install_property (object_class,
PROP_WRITABLE_SDK,
g_param_spec_boolean ("writable-sdk",
"",
"",
FALSE,
G_PARAM_READWRITE));
g_object_class_install_property (object_class,
PROP_RENAME_DESKTOP_FILE,
g_param_spec_string ("rename-desktop-file",
@ -574,6 +591,7 @@ builder_manifest_init_app_dir (BuilderManifest *self,
self->sdk,
self->runtime,
builder_manifest_get_runtime_version (self),
self->writable_sdk ? "-w" : NULL,
NULL);
if (subp == NULL ||
@ -614,6 +632,7 @@ builder_manifest_checksum_for_cleanup (BuilderManifest *self,
builder_cache_checksum_str (cache, self->desktop_file_name_prefix);
builder_cache_checksum_str (cache, self->desktop_file_name_suffix);
builder_cache_checksum_boolean (cache, self->strip);
builder_cache_checksum_boolean (cache, self->writable_sdk);
for (l = self->modules; l != NULL; l = l->next)
{

4
doc/xdg-app-builder.xml
View File

@ -122,6 +122,10 @@
<term><option>command</option></term>
<listitem><para>The filename or path to the main binary of the application.</para></listitem>
</varlistentry>
<varlistentry>
<term><option>writable-sdk</option></term>
<listitem><para>If true, use a writable copy of the sdk for /usr.</para></listitem>
</varlistentry>
<varlistentry>
<term><option>build-options</option></term>
<listitem><para>object specifying the build environment. See below for details.</para></listitem>