[glade/tintou/annotations: 2/4] flatpak: Set meson as buildsystem

[Corentin Noël <corentinnoel src gnome org>]

commit 1bf706a0e87ff7ba3b108266860e3d1df48ae8fc
Author: Iñigo Martínez <inigomartinez gmail com>
Date:   Fri Mar 22 08:45:38 2019 +0100

    flatpak: Set meson as buildsystem
    
    Following glade's port to meson the build system in the flatpak
    manifest has been also been moved to meson.
    
    The CI-built has also been changed to use it.

 .gitlab-ci.yml       | 11 ++++++-----
 org.gnome.Glade.json |  6 +++---
 2 files changed, 9 insertions(+), 8 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4f996064..f57b1cef 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -14,21 +14,22 @@ flatpak:
         MANIFEST_PATH: "org.gnome.Glade.json"
         RUNTIME_REPO: "https://sdk.gnome.org/gnome-nightly.flatpakrepo";
         FLATPAK_MODULE: "glade"
-        CONFIGURE_ARGS: "--disable-man-pages"
+        CONFIGURE_ARGS: "-Dman=false"
         DBUS_ID: "org.gnome.Glade"
 
     script:
         - flatpak-builder --stop-at=${FLATPAK_MODULE} app ${MANIFEST_PATH}
-        - flatpak build app ./autogen.sh --prefix=/app --libdir=/app/lib ${CONFIGURE_ARGS}
-        - flatpak build app make install
+        - flatpak build app meson --prefix=/app --libdir=/app/lib ${CONFIGURE_ARGS} _build
+        - flatpak build app ninja -C _build install
         - flatpak-builder --finish-only --repo=repo app ${MANIFEST_PATH}
-        - xvfb-run -a -s "-screen 0 1024x768x24" flatpak build app make VERBOSE=1 check
+        - xvfb-run -a -s "-screen 0 1024x768x24" flatpak build app meson test -C _build
         - flatpak build-bundle repo ${BUNDLE} --runtime-repo=${RUNTIME_REPO} ${DBUS_ID}
 
     artifacts:
         paths:
             - ${BUNDLE}
-            - config.log
+            - _build/meson-logs/meson-log.txt
+            - _build/meson-logs/install-log.txt
         expire_in: 30 days
 
     cache:
diff --git a/org.gnome.Glade.json b/org.gnome.Glade.json
index 29ba9e83..27917269 100644
--- a/org.gnome.Glade.json
+++ b/org.gnome.Glade.json
@@ -43,9 +43,9 @@
     "modules" : [
         {
             "name" : "glade",
-            "config-opts" : [
-                "--disable-man-pages"
-            ],
+            "buildsystem": "meson",
+            "builddir": true,
+            "config-opts" : ["-Dman=false"],
             "sources" : [
                 {
                     "type" : "git",