From bd4a93c1d7436b10dedac47d5977501445e56775 Mon Sep 17 00:00:00 2001 From: Lukas W Date: Thu, 15 Jan 2015 22:05:10 +0100 Subject: [PATCH] Travis: Outsource build scripts --- .travis.yml | 33 ++++----------------------- .travis/linux..before_install.sh | 2 ++ .travis/linux..install.sh | 4 ++++ .travis/linux..script.sh | 1 + .travis/linux.win32.before_install.sh | 2 ++ .travis/linux.win32.install.sh | 7 ++++++ .travis/linux.win32.script.sh | 1 + .travis/linux.win64.before_install.sh | 1 + .travis/linux.win64.install.sh | 7 ++++++ .travis/linux.win64.script.sh | 1 + .travis/osx..before_install.sh | 1 + .travis/osx..install.sh | 1 + .travis/osx..script.sh | 1 + 13 files changed, 33 insertions(+), 29 deletions(-) create mode 100644 .travis/linux..before_install.sh create mode 100644 .travis/linux..install.sh create mode 100644 .travis/linux..script.sh create mode 100644 .travis/linux.win32.before_install.sh create mode 100644 .travis/linux.win32.install.sh create mode 100644 .travis/linux.win32.script.sh create mode 100644 .travis/linux.win64.before_install.sh create mode 100644 .travis/linux.win64.install.sh create mode 100644 .travis/linux.win64.script.sh create mode 100644 .travis/osx..before_install.sh create mode 100644 .travis/osx..install.sh create mode 100644 .travis/osx..script.sh diff --git a/.travis.yml b/.travis.yml index 9f74a9087..52e6cc645 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,45 +1,20 @@ language: cpp compiler: gcc matrix: - exclude: - - os: linux include: - - env: TARGET_OS=linux - env: TARGET_OS=win32 - env: TARGET_OS=win64 - os: osx before_install: - - if [ $TRAVIS_OS_NAME == linux ]; then - if [ $TARGET_OS != linux ]; then sudo add-apt-repository ppa:tobydox/mingw -y; fi; - if [ $TARGET_OS == linux ]; then sudo add-apt-repository ppa:kalakris/cmake -y; fi; - sudo apt-get update -qq; - fi - - if [ $TRAVIS_OS_NAME == osx ]; then brew update; fi + - sh ./travis/${TRAVIS_OS_NAME}.${TARGET_OS}.before_install.sh install: - - if [ $TRAVIS_OS_NAME == linux ]; then - if [ $TARGET_OS == linux ]; then - sudo apt-get install -y cmake libqt4-dev libsndfile-dev fftw3-dev libvorbis-dev libogg-dev libasound2-dev libjack-dev libsdl-dev libsamplerate0-dev libstk0-dev libfluidsynth-dev portaudio19-dev wine-dev g++-multilib libfltk1.3-dev libgig-dev; - fi; - if [ $TARGET_OS != linux ]; then sudo apt-get install -y nsis cloog-isl libmpc2 mingw32; fi; - if [ $TARGET_OS != linux ]; then sudo apt-get install -y mingw32-x-qt mingw32-x-sdl mingw32-x-libvorbis mingw32-x-fluidsynth mingw32-x-stk mingw32-x-glib2 mingw32-x-portaudio mingw32-x-libsndfile mingw32-x-fftw mingw32-x-flac mingw32-x-fltk mingw32-x-libsamplerate mingw32-x-pkgconfig mingw32-x-binutils mingw32-x-gcc mingw32-x-runtime mingw32-x-libgig; fi; - if [ $TARGET_OS == win64 ]; then sudo apt-get install -y mingw64-x-qt mingw64-x-sdl mingw64-x-libvorbis mingw64-x-fluidsynth mingw64-x-stk mingw64-x-glib2 mingw64-x-portaudio mingw64-x-libsndfile mingw64-x-fftw mingw64-x-flac mingw64-x-fltk mingw64-x-libsamplerate mingw64-x-pkgconfig mingw64-x-binutils mingw64-x-gcc mingw64-x-runtime mingw64-x-libgig; fi; - fi - - if [ $TRAVIS_OS_NAME == osx ]; then - brew install qt libsndfile fftw libvorbis libogg jack sdl libsamplerate stk fluid-synth portaudio fltk; - fi + - sh ./travis/${TRAVIS_OS_NAME}.${TARGET_OS}.install.sh before_script: - mkdir build && cd build script: - - if [ $TRAVIS_OS_NAME == linux ]; then - if [ $TARGET_OS == win32 ]; then ../build_mingw32 || ../build_mingw32; fi; - if [ $TARGET_OS == win64 ]; then ../build_mingw64 || ../build_mingw64; fi; - if [ $TARGET_OS == linux ]; then cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo ..; fi - fi - - if [ $TRAVIS_OS_NAME == osx ]; then - cmake ..; - fi + - sh ./travis/${TRAVIS_OS_NAME}.${TARGET_OS}.script.sh - make -j4 VERBOSE=1 - - if [ $TARGET_OS == linux ]; then make tests && ./tests/tests; fi; + - if [[ $TARGET_OS != win* ]]; then make tests && ./tests/tests; fi; before_deploy: make package deploy: provider: releases diff --git a/.travis/linux..before_install.sh b/.travis/linux..before_install.sh new file mode 100644 index 000000000..233bd784f --- /dev/null +++ b/.travis/linux..before_install.sh @@ -0,0 +1,2 @@ +sudo add-apt-repository ppa:kalakris/cmake -y; +sudo apt-get update -qq diff --git a/.travis/linux..install.sh b/.travis/linux..install.sh new file mode 100644 index 000000000..49a6ea466 --- /dev/null +++ b/.travis/linux..install.sh @@ -0,0 +1,4 @@ +sudo apt-get install -y cmake libqt4-dev libsndfile-dev fftw3-dev libvorbis-dev \ + libogg-dev libasound2-dev libjack-dev libsdl-dev libsamplerate0-dev \ + libstk0-dev libfluidsynth-dev portaudio19-dev wine-dev g++-multilib \ + libfltk1.3-dev libgig-dev diff --git a/.travis/linux..script.sh b/.travis/linux..script.sh new file mode 100644 index 000000000..d89b130db --- /dev/null +++ b/.travis/linux..script.sh @@ -0,0 +1 @@ +cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo .. diff --git a/.travis/linux.win32.before_install.sh b/.travis/linux.win32.before_install.sh new file mode 100644 index 000000000..02a9be79d --- /dev/null +++ b/.travis/linux.win32.before_install.sh @@ -0,0 +1,2 @@ +sudo add-apt-repository ppa:tobydox/mingw -y +sudo apt-get update -qq diff --git a/.travis/linux.win32.install.sh b/.travis/linux.win32.install.sh new file mode 100644 index 000000000..86babb1b7 --- /dev/null +++ b/.travis/linux.win32.install.sh @@ -0,0 +1,7 @@ +sudo apt-get install -y nsis cloog-isl libmpc2 mingw32 + +sudo apt-get install -y mingw32-x-qt mingw32-x-sdl mingw32-x-libvorbis \ + mingw32-x-fluidsynth mingw32-x-stk mingw32-x-glib2 mingw32-x-portaudio \ + mingw32-x-libsndfile mingw32-x-fftw mingw32-x-flac mingw32-x-fltk \ + mingw32-x-libsamplerate mingw32-x-pkgconfig mingw32-x-binutils \ + mingw32-x-gcc mingw32-x-runtime mingw32-x-libgig diff --git a/.travis/linux.win32.script.sh b/.travis/linux.win32.script.sh new file mode 100644 index 000000000..3831a842f --- /dev/null +++ b/.travis/linux.win32.script.sh @@ -0,0 +1 @@ +../build_mingw32 || ../build_mingw32 diff --git a/.travis/linux.win64.before_install.sh b/.travis/linux.win64.before_install.sh new file mode 100644 index 000000000..a598ff1ca --- /dev/null +++ b/.travis/linux.win64.before_install.sh @@ -0,0 +1 @@ +sh .travis/linux.win32.before_install.sh diff --git a/.travis/linux.win64.install.sh b/.travis/linux.win64.install.sh new file mode 100644 index 000000000..75cc3bcf1 --- /dev/null +++ b/.travis/linux.win64.install.sh @@ -0,0 +1,7 @@ +sh .travis/linux.win32.install.sh + +sudo apt-get install -y mingw64-x-qt mingw64-x-sdl mingw64-x-libvorbis \ + mingw64-x-fluidsynth mingw64-x-stk mingw64-x-glib2 mingw64-x-portaudio \ + mingw64-x-libsndfile mingw64-x-fftw mingw64-x-flac mingw64-x-fltk \ + mingw64-x-libsamplerate mingw64-x-pkgconfig mingw64-x-binutils mingw64-x-gcc\ + mingw64-x-runtime mingw64-x-libgig diff --git a/.travis/linux.win64.script.sh b/.travis/linux.win64.script.sh new file mode 100644 index 000000000..7c6c4f96a --- /dev/null +++ b/.travis/linux.win64.script.sh @@ -0,0 +1 @@ +../build_mingw64 || ../build_mingw64 diff --git a/.travis/osx..before_install.sh b/.travis/osx..before_install.sh new file mode 100644 index 000000000..3387d7dcf --- /dev/null +++ b/.travis/osx..before_install.sh @@ -0,0 +1 @@ +brew update diff --git a/.travis/osx..install.sh b/.travis/osx..install.sh new file mode 100644 index 000000000..af530b225 --- /dev/null +++ b/.travis/osx..install.sh @@ -0,0 +1 @@ +brew install qt libsndfile fftw libvorbis libogg jack sdl libsamplerate stk fluid-synth portaudio fltk diff --git a/.travis/osx..script.sh b/.travis/osx..script.sh new file mode 100644 index 000000000..d89b130db --- /dev/null +++ b/.travis/osx..script.sh @@ -0,0 +1 @@ +cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo ..