From fa8ffe3e56e2f39283ff1cca046c9f5cad77112f Mon Sep 17 00:00:00 2001 From: Michael Vetter Date: Fri, 12 Apr 2019 16:11:27 +0200 Subject: [PATCH] Update travis Add OMEMO dependencies. Build with and without OMEMO enabled. --- .travis.yml | 2 +- travis-build.sh | 24 ++++++++++++++++++++---- 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3e1b576a..bbe3eb8d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ install: - lsb_release -a - uname -a - sudo apt-get update - - sudo apt-get -y install libssl-dev libexpat1-dev libncursesw5-dev libglib2.0-dev libnotify-dev libcurl3-dev libxss-dev libotr5-dev libgpgme11-dev autoconf-archive expect-dev tcl-dev libtool python-dev libgtk2.0-dev + - sudo apt-get -y install libssl-dev libexpat1-dev libncursesw5-dev libglib2.0-dev libnotify-dev libcurl3-dev libxss-dev libotr5-dev libgpgme11-dev autoconf-archive expect-dev tcl-dev libtool python-dev libgtk2.0-dev libgcrypt20-dev libsignal-protocol-c-dev - git clone git://github.com/boothj5/libmesode.git - cd libmesode - mkdir m4 diff --git a/travis-build.sh b/travis-build.sh index 984d3afe..bc01a721 100755 --- a/travis-build.sh +++ b/travis-build.sh @@ -14,17 +14,17 @@ trap error_handler ERR ./bootstrap.sh echo -echo "--> Building with ./configure --enable-notifications --enable-icons --enable-otr --enable-pgp --enable-plugins --enable-c-plugins --enable-python-plugins --with-xscreensaver" +echo "--> Building with ./configure --enable-notifications --enable-icons --enable-otr --enable-pgp --enable-omemo --enable-plugins --enable-c-plugins --enable-python-plugins --with-xscreensaver" echo -./configure --enable-notifications --enable-icons --enable-otr --enable-pgp --enable-plugins --enable-c-plugins --enable-python-plugins --with-xscreensaver +./configure --enable-notifications --enable-icons --enable-otr --enable-pgp --enable-omemo --enable-plugins --enable-c-plugins --enable-python-plugins --with-xscreensaver make ./profanity -v make clean echo -echo "--> Building with ./configure --disable-notifications --disable-icons --disable-otr --disable-pgp --disable-plugins --disable-c-plugins --disable-python-plugins --without-xscreensaver" +echo "--> Building with ./configure --disable-notifications --disable-icons --disable-otr --disable-pgp --disable-omemo --disable-plugins --disable-c-plugins --disable-python-plugins --without-xscreensaver" echo -./configure --disable-notifications --disable-icons --disable-otr --disable-pgp --disable-plugins --disable-c-plugins --disable-python-plugins --without-xscreensaver +./configure --disable-notifications --disable-icons --disable-otr --disable-pgp --disable-omemo --disable-plugins --disable-c-plugins --disable-python-plugins --without-xscreensaver make ./profanity -v make clean @@ -61,6 +61,14 @@ make ./profanity -v make clean +echo +echo "--> Building with ./configure --disable-omemo" +echo +./configure --disable-omemo +make +./profanity -v +make clean + echo echo "--> Building with ./configure --disable-pgp --disable-otr" echo @@ -69,6 +77,14 @@ make ./profanity -v make clean +echo +echo "--> Building with ./configure --disable-pgp --disable-otr --disable-omemo" +echo +./configure --disable-pgp --disable-otr --disable-omemo +make +./profanity -v +make clean + echo echo "--> Building with ./configure --disable-plugins" echo