diff options
| author | Eric Engestrom <eric.engestrom@intel.com> | 2019-12-24 10:33:54 +0000 |
|---|---|---|
| committer | Harry Jeffery <harry@exec64.co.uk> | 2020-02-08 00:29:25 +0000 |
| commit | 04ef9440fb079736020d796142de18008da3ba62 (patch) | |
| tree | 014e98965acaa95cd7ebf4569e5d052f4ef33833 /.builds | |
| parent | 2dd0c1469e2d87c5263fb513c331b82617ca2e12 (diff) | |
| download | imv-04ef9440fb079736020d796142de18008da3ba62.tar.gz | |
drop the old Makefile and update the docs
Diffstat (limited to '.builds')
| -rw-r--r-- | .builds/archlinux.yml | 16 | ||||
| -rw-r--r-- | .builds/debian.yml | 21 | ||||
| -rw-r--r-- | .builds/fedora.yml | 19 | ||||
| -rw-r--r-- | .builds/freebsd.yml | 7 | ||||
| -rw-r--r-- | .builds/ubuntu.yml | 19 |
5 files changed, 13 insertions, 69 deletions
diff --git a/.builds/archlinux.yml b/.builds/archlinux.yml index 1dc2585..4038414 100644 --- a/.builds/archlinux.yml +++ b/.builds/archlinux.yml @@ -22,21 +22,9 @@ packages: sources: - https://git.sr.ht/~exec64/imv tasks: - - configure: | - cd imv - sed -i -e 's/BACKEND_\(.*\)=no/BACKEND_\1=yes/' config.mk - cat config.mk - - make_gcc: | - cd imv - CC=gcc BUILDDIR=gcc make - CC=gcc BUILDDIR=gcc make check - - make_clang: | - cd imv - CC=clang BUILDDIR=clang make - CC=clang BUILDDIR=clang make check - - meson_gcc: | + - gcc: | CC=gcc meson imv build_gcc -D auto_features=enabled CC=gcc ninja -C build_gcc test - - meson_clang: | + - 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 2a379ac..08bc065 100644 --- a/.builds/debian.yml +++ b/.builds/debian.yml @@ -22,27 +22,16 @@ packages: sources: - https://git.sr.ht/~exec64/imv tasks: - - configure: | - cd imv - sed -i -e 's/BACKEND_\(.*\)=no/BACKEND_\1=yes/' config.mk - # libnsgif isn't packaged by debian - sed -i -e 's/BACKEND_LIBNSGIF=yes/BACKEND_LIBNSGIF=no/' config.mk - cat config.mk - - make_gcc: | - cd imv - CC=gcc BUILDDIR=gcc make - CC=gcc BUILDDIR=gcc make check - - make_clang: | - cd imv - CC=clang BUILDDIR=clang make - CC=clang BUILDDIR=clang make check + - dummy: | + true #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: | + # libnsgif isn't packaged by debian +# - gcc: | # CC=gcc meson imv build_gcc -D auto_features=enabled -D libnsgif=disabled # CC=gcc ninja -C build_gcc test -# - meson_clang: | +# - 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 2dea9c8..7e275ed 100644 --- a/.builds/fedora.yml +++ b/.builds/fedora.yml @@ -22,23 +22,10 @@ packages: sources: - https://git.sr.ht/~exec64/imv tasks: - - configure: | - cd imv - sed -i -e 's/BACKEND_\(.*\)=no/BACKEND_\1=yes/' config.mk - # libnsgif isn't packaged by fedora - sed -i -e 's/BACKEND_LIBNSGIF=yes/BACKEND_LIBNSGIF=no/' config.mk - cat config.mk - - make_gcc: | - cd imv - CC=gcc BUILDDIR=gcc make - CC=gcc BUILDDIR=gcc make check - - make_clang: | - cd imv - CC=clang BUILDDIR=clang make - CC=clang BUILDDIR=clang make check - - meson_gcc: | + # libnsgif isn't packaged by fedora + - gcc: | CC=gcc meson imv build_gcc -D auto_features=enabled -D libnsgif=disabled CC=gcc ninja -C build_gcc test - - meson_clang: | + - 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 513652b..97193d7 100644 --- a/.builds/freebsd.yml +++ b/.builds/freebsd.yml @@ -1,6 +1,5 @@ image: freebsd/latest packages: - - devel/gmake - devel/icu - devel/meson - devel/pkgconf @@ -19,12 +18,6 @@ packages: sources: - https://git.sr.ht/~exec64/imv tasks: - - make: | - cd imv - sed -i -e 's/BACKEND_\(.*\)=no/BACKEND_\1=yes/' config.mk - cat config.mk - 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 534573a..cc35286 100644 --- a/.builds/ubuntu.yml +++ b/.builds/ubuntu.yml @@ -22,23 +22,10 @@ packages: sources: - https://git.sr.ht/~exec64/imv tasks: - - configure: | - cd imv - sed -i -e 's/BACKEND_\(.*\)=no/BACKEND_\1=yes/' config.mk - # libnsgif isn't packaged by ubuntu - sed -i -e 's/BACKEND_LIBNSGIF=yes/BACKEND_LIBNSGIF=no/' config.mk - cat config.mk - - make_gcc: | - cd imv - CC=gcc BUILDDIR=gcc make - CC=gcc BUILDDIR=gcc make check - - make_clang: | - cd imv - CC=clang BUILDDIR=clang make - CC=clang BUILDDIR=clang make check - - meson_gcc: | + # libnsgif isn't packaged by ubuntu + - gcc: | CC=gcc meson imv build_gcc -D auto_features=enabled -D libnsgif=disabled CC=gcc ninja -C build_gcc test - - meson_clang: | + - clang: | CC=clang meson imv build_clang -D auto_features=enabled -D libnsgif=disabled CC=clang ninja -C build_clang test |