From 2dd0c1469e2d87c5263fb513c331b82617ca2e12 Mon Sep 17 00:00:00 2001
From: Eric Engestrom <eric.engestrom@intel.com>
Date: Mon, 23 Dec 2019 21:41:44 +0000
Subject: test meson in the CI

---
 .builds/archlinux.yml | 11 +++++++++--
 .builds/debian.yml    | 15 +++++++++++++--
 .builds/fedora.yml    | 11 +++++++++--
 .builds/freebsd.yml   |  8 +++++---
 .builds/ubuntu.yml    | 11 +++++++++--
 5 files changed, 45 insertions(+), 11 deletions(-)

diff --git a/.builds/archlinux.yml b/.builds/archlinux.yml
index 3bc134a..1dc2585 100644
--- a/.builds/archlinux.yml
+++ b/.builds/archlinux.yml
@@ -16,6 +16,7 @@ packages:
   - libxcb
   - libxkbcommon
   - libxkbcommon-x11
+  - meson
   - pango
   - wayland
 sources:
@@ -25,11 +26,17 @@ tasks:
       cd imv
       sed -i -e 's/BACKEND_\(.*\)=no/BACKEND_\1=yes/' config.mk
       cat config.mk
-  - gcc: |
+  - make_gcc: |
       cd imv
       CC=gcc BUILDDIR=gcc make
       CC=gcc BUILDDIR=gcc make check
-  - clang: |
+  - make_clang: |
       cd imv
       CC=clang BUILDDIR=clang make
       CC=clang BUILDDIR=clang make check
+  - meson_gcc: |
+      CC=gcc meson imv build_gcc -D auto_features=enabled
+      CC=gcc ninja -C build_gcc test
+  - meson_clang: |
+      CC=clang meson imv build_clang -D auto_features=enabled
+      CC=clang ninja -C build_clang test
diff --git a/.builds/debian.yml b/.builds/debian.yml
index 35acb08..2a379ac 100644
--- a/.builds/debian.yml
+++ b/.builds/debian.yml
@@ -18,6 +18,7 @@ packages:
   - libxkbcommon-dev
   - libxkbcommon-x11-dev
   - mesa-common-dev
+  - meson
 sources:
   - https://git.sr.ht/~exec64/imv
 tasks:
@@ -27,11 +28,21 @@ tasks:
       # libnsgif isn't packaged by debian
       sed -i -e 's/BACKEND_LIBNSGIF=yes/BACKEND_LIBNSGIF=no/' config.mk
       cat config.mk
-  - gcc: |
+  - make_gcc: |
       cd imv
       CC=gcc BUILDDIR=gcc make
       CC=gcc BUILDDIR=gcc make check
-  - clang: |
+  - make_clang: |
       cd imv
       CC=clang BUILDDIR=clang make
       CC=clang BUILDDIR=clang make check
+#FIXME:
+# the old meson package in debian has a bug and crashes with
+# our meson.build; re-enable this once debian packages a version
+# newer than 0.49.2
+# - meson_gcc: |
+#     CC=gcc meson imv build_gcc -D auto_features=enabled -D libnsgif=disabled
+#     CC=gcc ninja -C build_gcc test
+# - meson_clang: |
+#     CC=clang meson imv build_clang -D auto_features=enabled -D libnsgif=disabled
+#     CC=clang ninja -C build_clang test
diff --git a/.builds/fedora.yml b/.builds/fedora.yml
index 28c46aa..2dea9c8 100644
--- a/.builds/fedora.yml
+++ b/.builds/fedora.yml
@@ -15,6 +15,7 @@ packages:
   - mesa-libEGL-devel
   - mesa-libGL-devel
   - mesa-libGLU-devel
+  - meson
   - pango-devel
   - turbojpeg-devel
   - wayland-devel
@@ -27,11 +28,17 @@ tasks:
       # libnsgif isn't packaged by fedora
       sed -i -e 's/BACKEND_LIBNSGIF=yes/BACKEND_LIBNSGIF=no/' config.mk
       cat config.mk
-  - gcc: |
+  - make_gcc: |
       cd imv
       CC=gcc BUILDDIR=gcc make
       CC=gcc BUILDDIR=gcc make check
-  - clang: |
+  - make_clang: |
       cd imv
       CC=clang BUILDDIR=clang make
       CC=clang BUILDDIR=clang make check
+  - meson_gcc: |
+      CC=gcc meson imv build_gcc -D auto_features=enabled -D libnsgif=disabled
+      CC=gcc ninja -C build_gcc test
+  - meson_clang: |
+      CC=clang meson imv build_clang -D auto_features=enabled -D libnsgif=disabled
+      CC=clang ninja -C build_clang test
diff --git a/.builds/freebsd.yml b/.builds/freebsd.yml
index edf0171..513652b 100644
--- a/.builds/freebsd.yml
+++ b/.builds/freebsd.yml
@@ -2,6 +2,7 @@ image: freebsd/latest
 packages:
   - devel/gmake
   - devel/icu
+  - devel/meson
   - devel/pkgconf
   - graphics/freeimage
   - graphics/libGLU
@@ -18,11 +19,12 @@ packages:
 sources:
   - https://git.sr.ht/~exec64/imv
 tasks:
-  - configure: |
+  - make: |
       cd imv
       sed -i -e 's/BACKEND_\(.*\)=no/BACKEND_\1=yes/' config.mk
       cat config.mk
-  - build: |
-      cd imv
       gmake
       gmake check
+  - meson: |
+      meson imv build -D auto_features=enabled -D c_link_args='-L/usr/local/lib'
+      ninja -C build test
diff --git a/.builds/ubuntu.yml b/.builds/ubuntu.yml
index 3bf8d19..534573a 100644
--- a/.builds/ubuntu.yml
+++ b/.builds/ubuntu.yml
@@ -18,6 +18,7 @@ packages:
   - libxkbcommon-dev
   - libxkbcommon-x11-dev
   - mesa-common-dev
+  - meson
 sources:
   - https://git.sr.ht/~exec64/imv
 tasks:
@@ -27,11 +28,17 @@ tasks:
       # libnsgif isn't packaged by ubuntu
       sed -i -e 's/BACKEND_LIBNSGIF=yes/BACKEND_LIBNSGIF=no/' config.mk
       cat config.mk
-  - gcc: |
+  - make_gcc: |
       cd imv
       CC=gcc BUILDDIR=gcc make
       CC=gcc BUILDDIR=gcc make check
-  - clang: |
+  - make_clang: |
       cd imv
       CC=clang BUILDDIR=clang make
       CC=clang BUILDDIR=clang make check
+  - meson_gcc: |
+      CC=gcc meson imv build_gcc -D auto_features=enabled -D libnsgif=disabled
+      CC=gcc ninja -C build_gcc test
+  - meson_clang: |
+      CC=clang meson imv build_clang -D auto_features=enabled -D libnsgif=disabled
+      CC=clang ninja -C build_clang test
-- 
cgit v1.2.3