Commit e04bddab authored by Philip Withnall's avatar Philip Withnall

flatpak: Add flatpak manifests for stable and unstable branches

Drop the old xdg-app based build rules for building a bundle file, in
favour of the new flatpak manifests which can be used to generate a
repository with the command:
   flatpak-builder --repo=repo build-dir flatpak/org.gnome.Hitori-stable.json

This repository can then be turned into a bundle using the instructions
at
http://docs.flatpak.org/en/latest/distributing-applications.html#single-file-bundles.

The use of manifest files means it should now be possible for Hitori to
be built nightly:

https://wiki.gnome.org/Projects/SandboxedApps/BuildingSigned-off-by: Philip Withnall's avatarPhilip Withnall <withnall@endlessm.com>
parent abd2bdfa
......@@ -185,19 +185,4 @@ CHANGELOG_START = V_0_2_2^
@GENERATE_CHANGELOG_RULES@
dist-hook: dist-ChangeLog
# xdg-app bundle
org.gnome.Hitori.bundle:
$(MKDIR_P) $(abs_top_builddir)/xdg-app-build/hitori
$(MKDIR_P) $(abs_top_builddir)/xdg-app-repos/hitori
(cd $(top_srcdir) && \
xdg-app build-init $(abs_top_builddir)/xdg-app-build/hitori org.gnome.Hitori org.gnome.Sdk org.gnome.Platform 3.18 && \
xdg-app build $(abs_top_builddir)/xdg-app-build/hitori ./configure --prefix=/app && \
xdg-app build $(abs_top_builddir)/xdg-app-build/hitori make && \
xdg-app build $(abs_top_builddir)/xdg-app-build/hitori make install && \
xdg-app build-finish --command=hitori --socket=x11 --socket=session-bus --talk-name=ca.desrt.dconf --filesystem=home $(abs_top_builddir)/xdg-app-build/hitori)
xdg-app build-export $(abs_top_builddir)/xdg-app-repos/hitori $(abs_top_builddir)/xdg-app-build/hitori
xdg-app repo-update $(abs_top_builddir)/xdg-app-repos/hitori
.PHONY: org.gnome.Hitori.bundle
-include $(top_srcdir)/git.mk
{
"app-id": "org.gnome.Hitori",
"runtime": "org.gnome.Platform",
"runtime-version": "3.22",
"sdk": "org.gnome.Sdk",
"command": "hitori",
"finish-args":
[
/* X11 + XShm access */
"--share=ipc", "--socket=x11",
/* Wayland access */
"--socket=wayland",
/* Needed for dconf to work */
"--filesystem=xdg-run/dconf",
"--filesystem=~/.config/dconf:ro",
"--talk-name=ca.desrt.dconf",
"--env=DCONF_USER_CONFIG_DIR=.config/dconf"
],
"build-options" :
{
"cflags": "-O2 -g",
"cxxflags": "-O2 -g"
},
"cleanup":
[
"/include", "/lib/pkgconfig",
"/share/pkgconfig", "/share/aclocal",
"/man", "/share/man", "/share/gtk-doc",
"*.la", "*.a",
"/lib/girepository-1.0",
"/share/dbus-1", "/share/doc", "/share/gir-1.0"
],
"modules":
[
{
"name": "hitori",
"sources":
[
{
"type": "git",
"url": "https://git.gnome.org/browse/hitori",
"branch": "gnome-3-22"
}
]
}
]
}
{
"app-id": "org.gnome.Hitori",
"runtime": "org.gnome.Platform",
"runtime-version": "master",
"sdk": "org.gnome.Sdk",
"command": "hitori",
"tags": ["nightly"],
"desktop-file-name-prefix": "(Nightly) ",
"finish-args":
[
/* X11 + XShm access */
"--share=ipc", "--socket=x11",
/* Wayland access */
"--socket=wayland",
/* Needed for dconf to work */
"--filesystem=xdg-run/dconf",
"--filesystem=~/.config/dconf:ro",
"--talk-name=ca.desrt.dconf",
"--env=DCONF_USER_CONFIG_DIR=.config/dconf"
],
"build-options" :
{
"cflags": "-O2 -g",
"cxxflags": "-O2 -g"
},
"cleanup":
[
"/include", "/lib/pkgconfig",
"/share/pkgconfig", "/share/aclocal",
"/man", "/share/man", "/share/gtk-doc",
"*.la", "*.a",
"/lib/girepository-1.0",
"/share/dbus-1", "/share/doc", "/share/gir-1.0"
],
"modules":
[
{
"name": "hitori",
"sources":
[
{
"type": "git",
"url": "https://git.gnome.org/browse/hitori"
}
]
}
]
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment