diff options
| author | Iñigo Martínez <inigomartinez@gmail.com> | 2019-03-22 08:45:38 +0100 |
|---|---|---|
| committer | Iñigo Martínez <inigomartinez@gmail.com> | 2019-03-30 21:15:44 +0100 |
| commit | 6a2f50c3c98e2a3ee41dde3fdc1655e846f106f0 (patch) | |
| tree | e6aff4e251a5672c990611ed4b560186f44d2d81 | |
| parent | 79bd7e5a84b01e4a50365deca3ef799acd8c998b (diff) | |
| download | glade-6a2f50c3c98e2a3ee41dde3fdc1655e846f106f0.tar.gz | |
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.
| -rw-r--r-- | .gitlab-ci.yml | 11 | ||||
| -rw-r--r-- | 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", |