[polari/wip/fmuellner/meson: 9/10] flatpak: Build with meson
- From: Florian Müllner <fmuellner src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [polari/wip/fmuellner/meson: 9/10] flatpak: Build with meson
- Date: Sun, 5 Mar 2017 23:16:58 +0000 (UTC)
commit 708258857fe5a60c4636fc3bf907b6f1cbd7cdec
Author: Florian Müllner <fmuellner gnome org>
Date: Fri Mar 3 02:43:27 2017 +0100
flatpak: Build with meson
Meson is a fast-moving project, and while we don't require the very
latest version, the requirement is still recent enough to not
assume its general availability. However when building the flatpak,
we can easily ensure a recent enough version by bundling, so switch
the manifest to meson builds.
https://bugzilla.gnome.org/show_bug.cgi?id=779599
build-aux/flatpak/setuptools-makefile | 5 +++++
org.gnome.Polari.json | 23 +++++++++++++++++++++--
2 files changed, 26 insertions(+), 2 deletions(-)
---
diff --git a/build-aux/flatpak/setuptools-makefile b/build-aux/flatpak/setuptools-makefile
new file mode 100644
index 0000000..96c28f0
--- /dev/null
+++ b/build-aux/flatpak/setuptools-makefile
@@ -0,0 +1,5 @@
+all:
+ python3 ./setup.py build
+
+install:
+ python3 ./setup.py install --prefix=/app --skip-build --optimize=1
diff --git a/org.gnome.Polari.json b/org.gnome.Polari.json
index 9c12795..cd6c325 100644
--- a/org.gnome.Polari.json
+++ b/org.gnome.Polari.json
@@ -40,8 +40,8 @@
"build-options": {
"cflags": "-O2 -g"
},
- "cleanup": ["/bin/mc*","/include","/lib/*.la","/lib/*.a",
- "/lib/pkgconfig","/lib/polari/*.la",
+ "cleanup": ["/bin/m*","/bin/wraptool","/include","/lib/*.la","/lib/*.a",
+ "/lib/pkgconfig","/lib/polari/*.la","/lib/python*",
"/share/aclocal", "/share/autoconf-archive",
"/share/dbus-1/services/org.freedesktop*", "/share/gir-1.0",
"/share/gtk-doc", "/share/info", "/share/man",
@@ -59,6 +59,22 @@
]
},
{
+ "name": "meson",
+ "no-autogen": true,
+ "sources": [
+ {
+ "type": "archive",
+ "url":
"https://github.com/mesonbuild/meson/releases/download/0.38.1/meson-0.38.1.tar.gz",
+ "sha256": "dcb05349b32427924fa2a258a5e23e40e09c1bf9dd09919198c3a2ae1c38ba53"
+ },
+ {
+ "type": "file",
+ "path": "build-aux/flatpak/setuptools-makefile",
+ "dest-filename": "Makefile"
+ }
+ ]
+ },
+ {
"name": "telepathy-glib",
"sources": [
{
@@ -118,6 +134,9 @@
},
{
"name": "polari",
+ "buildsystem": "meson",
+ "builddir": true,
+ "config-opts": ["--libdir=lib"],
"sources": [
{
"type": "git",
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]