From 844a7e426aa8ef27544a19348b0df1d270d9461a Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Wed, 30 Dec 2015 18:03:53 +0100 Subject: [PATCH] Extract Travis before install script steps into a separate file This allows to do make these steps more complicated, e.g. avoid using apt-get under non-Linux (and even non-Debian/Ubuntu) platforms. Also install GTK+ development package explicitly, while it's already available on the older Travis Ubuntu 12.04 VMs, this is not the case for the newer 14.04 ones. --- .travis.yml | 4 +--- build/tools/before_install.sh | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 3 deletions(-) create mode 100755 build/tools/before_install.sh diff --git a/.travis.yml b/.travis.yml index c0f5ba5e8d..d82a6af109 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,9 +19,7 @@ notifications: on_success: change on_failure: change -before_install: - - sudo apt-get update - - sudo apt-get install -y libcppunit-dev +before_install: ./build/tools/before_install.sh env: - wxCONFIGURE_FLAGS= diff --git a/build/tools/before_install.sh b/build/tools/before_install.sh new file mode 100755 index 0000000000..1fd3fe1209 --- /dev/null +++ b/build/tools/before_install.sh @@ -0,0 +1,16 @@ +#!/bin/sh +# +# This script is used by Travis CI to install the dependencies before building +# wxWidgets but can also be run by hand if necessary but currently it only +# works for Ubuntu 12.04 and 14.04 used by Travis. + +SUDO=sudo + +case $(uname -s) in + Linux) + if [ -f /etc/apt/sources.list ]; then + $SUDO apt-get update + $SUDO apt-get install -y libcppunit-dev libgtk2.0-dev libnotify-dev + fi + ;; +esac