From 1852c6207c303846781b0f77ed2b5cfb68002344 Mon Sep 17 00:00:00 2001
From: Hylke Bons <hi@planetpeanut.uk>
Date: Mon, 19 Feb 2018 17:51:30 +0000
Subject: [PATCH] travis: Update build script for meson

---
 .travis.yml           |  4 ++--
 scripts/ci/Dockerfile | 17 ++++++++++++-----
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 4f2e59c6..ee55910f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,12 +9,12 @@ matrix:
       sudo: required
 
 before_install:
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker pull ubuntu:xenial ; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker pull ubuntu:17.10 ; fi
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]];   then wget https://dl.xamarin.com/XamarinforMac/Mac/xamarin.mac-3.0.0.393.pkg ; fi
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]];   then sudo installer -pkg xamarin.mac*.pkg -target / ; fi
 
 script:
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker build --file build/ci/Dockerfile --tag sparkleshare:nightly . ; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker build --file scripts/ci/Dockerfile --tag sparkleshare:nightly . ; fi
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]];   then msbuild /p:Configuration=ReleaseMac SparkleShare.sln ; fi
 
 before_deploy:
diff --git a/scripts/ci/Dockerfile b/scripts/ci/Dockerfile
index b4f7b72c..3d675c85 100644
--- a/scripts/ci/Dockerfile
+++ b/scripts/ci/Dockerfile
@@ -1,11 +1,12 @@
-FROM ubuntu:16.04
+FROM ubuntu:17.10
 
 RUN apt-get update
 RUN apt-get install -y \
+  automake \
+  autoconf \
   desktop-file-utils \
   git \
   gtk-sharp3-gapi \
-  intltool \
   libappindicator3-0.1-cil-dev \
   libdbus-glib2.0-cil-dev \
   libgtk3.0-cil-dev \
@@ -14,9 +15,12 @@ RUN apt-get install -y \
   libwebkit2gtk-4.0 \
   mono-devel \
   mono-mcs \
-  nant \
+  ninja-build \
+  python3-pip \
   xsltproc
 
+RUN pip3 install meson
+
 RUN git clone https://github.com/hbons/notify-sharp && \
   cd notify-sharp/ && \
   ./autogen.sh --disable-docs && \
@@ -39,6 +43,9 @@ RUN git clone https://github.com/hbons/webkit2gtk-sharp && \
 RUN cd ../
 
 COPY ./ ./
-RUN ./autogen.sh && \
-  make && make install 
+RUN mkdir build/
+
+RUN meson build/ && \
+  cd build/ && \
+  ninja && ninja install