diff options
| author | Jon Turney <jon.turney@dronecode.org.uk> | 2019-04-19 15:37:22 +0100 |
|---|---|---|
| committer | Adam Jackson <ajax@nwnk.net> | 2019-05-02 15:42:58 +0000 |
| commit | f0e22a76c93c98d67dbd5c966812b2901de5ed49 (patch) | |
| tree | f3164a4d1a2d8796e030dec64bc5559ec9984297 /test | |
| parent | 0bdfa5bc0ab050ce74c2289178f2f89790e2c8ef (diff) | |
| download | xserver-f0e22a76c93c98d67dbd5c966812b2901de5ed49.tar.gz | |
travis: Add OSX meson build to matrix
Unfortunately, a 'brew update' is currently needed to get the meson >=
0.46.0 required by xserver.
Diffstat (limited to 'test')
| -rwxr-xr-x | test/scripts/build-travis-osx.sh | 31 |
1 files changed, 23 insertions, 8 deletions
diff --git a/test/scripts/build-travis-osx.sh b/test/scripts/build-travis-osx.sh index 193a8851d..800fafcb2 100755 --- a/test/scripts/build-travis-osx.sh +++ b/test/scripts/build-travis-osx.sh @@ -30,14 +30,29 @@ export PATH="/usr/local/opt/ccache/libexec:$PATH" pushd $HOME git clone git://anongit.freedesktop.org/git/xorg/proto/xorgproto cd xorgproto -autoreconf -fvi -./configure --prefix=/opt/X11 -sudo make install +if [[ "$1" == "autotools" ]]; then + autoreconf -fvi + ./configure --prefix=/opt/X11 + sudo make install +elif [[ "$1" == "meson" ]]; then + meson _build/ -Dprefix=/opt/X11 + ninja -C _build/ + sudo ninja -C _build/ install +else + echo "Unknown build tool $1" + exit 1 +fi popd # build -autoreconf -fvi -./configure --prefix=/opt/X11 --disable-dependency-tracking --with-apple-application-name=XQuartz --with-bundle-id-prefix=org.macosforge.xquartz -make -make check -make install DESTDIR=$(pwd)/staging +if [[ "$1" == "autotools" ]]; then + autoreconf -fvi + ./configure --prefix=/opt/X11 --disable-dependency-tracking --with-apple-application-name=XQuartz --with-bundle-id-prefix=org.macosforge.xquartz + make + make check + make install DESTDIR=$(pwd)/staging +elif [[ "$1" == "meson" ]]; then + meson _build/ -Dprefix=/opt/X11 -Dsecure-rpc=false + DESTDIR=$(pwd)/staging ninja -C _build/ install + ninja -C _build/ test +fi |