Merge branch 'release-1.1'

.gitattributes

@@ -0,0 +1,2 @@
+# Normalize all auto-detected text files in the repository to LF line ending
+* text=auto

.gitignore

@@ -1,2 +1,9 @@
 *~
 
+prefix.sh
+starviewer.deb
+sdk-download*
+sdk-build*
+sdk-install*
+starviewer-build*
+build-starviewer*

.travis.yml

@@ -1,72 +1,67 @@
-language: cpp
-
-os:
- - linux
- - osx
-
-sudo: required
-dist: trusty
-
-compiler:
- - gcc
- - clang
-
-matrix:
- exclude:
- - os: osx
- compiler: gcc
-
-env:
- global:
- - SDK_INSTALL_PREFIX="$HOME/uroot/usr/local"
- - LD_LIBRARY_PATH="$SDK_INSTALL_PREFIX/lib:$SDK_INSTALL_PREFIX/lib/x86_64-linux-gnu:$LD_LIBRARY_PATH"
-
-before_install:
- - if [ "${TRAVIS_OS_NAME}" = "linux" ]; then
- sudo apt-add-repository -y ppa:beineri/opt-qt542-trusty &&
- sudo apt-get update -qq &&
- sudo apt-get install -qq qt54base qt54quick1 qt54tools qt54webkit qt54xmlpatterns &&
- sudo apt-get install -qq liblog4cxx10 liblog4cxx10-dev &&
- sudo apt-get install -qq libwrap0 libwrap0-dev ;
- else
- brew update > /dev/null &&
- cd `brew --prefix` &&
- echo "Install Qt 5.4." &&
- git checkout 00e46351980ad915424aad9316abffc19936809c Library/Formula/qt5.rb &&
- cd - &&
- brew install qt5 &&
- chmod -R 755 /usr/local/opt/qt5/* &&
- brew install log4cxx ;
- fi
-
-install:
- - if [ "${TRAVIS_OS_NAME}" = "linux" ]; then
- . /opt/qt54/bin/qt54-env.sh &&
- wget --directory-prefix=$HOME http:https://trueta.udg.edu/apt/ubuntu/devel/0.13/Starviewer-sdk-linux-0.13-0.tar.xz &&
- mkdir ~/uroot &&
- tar xf ~/Starviewer-sdk-linux-0.13-0.tar.xz -C ~/uroot ;
- else
- QTDIR="/usr/local/opt/qt5" &&
- PATH="$QTDIR/bin:$PATH" &&
- LDFLAGS=-L$QTDIR/lib &&
- CPPFLAGS=-I$QTDIR/include &&
- wget --directory-prefix=$HOME http:https://trueta.udg.edu/apt/macosx/devel/Starviewer-sdk-macosx-0.13-0.tar.xz &&
- tar xf ~/Starviewer-sdk-macosx-0.13-0.tar.xz -C /usr/local --strip-components 2 ;
- fi
-
-before_script:
- - if [ "${TRAVIS_OS_NAME}" = "linux" ]; then
- export DISPLAY=:99.0 &&
- sh -e /etc/init.d/xvfb start ;
- fi
-
-script:
- - cd starviewer
- - if [ "${TRAVIS_OS_NAME}" = "linux" ] && [ "${CC}" = "clang" ]; then
- qmake -spec linux-clang ;
- else
- qmake ;
- fi
- - make -j3
- - cd tests/auto
- - ./autotests -silent
+language: cpp
+
+matrix:
+ include:
+ # Linux (gcc)
+ - os: linux
+ dist: trusty
+ sudo: required
+ services: docker
+ compiler: gcc
+
+ install:
+ - docker build -t ubuntu - < Dockerfile
+
+ script:
+ - docker run --rm -v $(pwd):/starviewer -e CC -e CXX ubuntu qmake
+ - docker run --rm -v $(pwd):/starviewer -e CC -e CXX ubuntu make -j3
+ - docker run --rm -v $(pwd):/starviewer -e TRAVIS_OS_NAME -w /starviewer/starviewer/tests/auto ubuntu
+ sh -c 'xvfb-run -s "-screen 0 640x480x24" ./autotests -silent'
+
+ # Linux (clang)
+ - os: linux
+ dist: trusty
+ sudo: required
+ services: docker
+ compiler: clang
+
+ install:
+ - docker build -t ubuntu - < Dockerfile
+
+ script:
+ - docker run --rm -v $(pwd):/starviewer -e CC -e CXX ubuntu qmake -spec linux-clang
+ - docker run --rm -v $(pwd):/starviewer -e CC -e CXX ubuntu make -j3
+ - docker run --rm -v $(pwd):/starviewer -e TRAVIS_OS_NAME -w /starviewer/starviewer/tests/auto ubuntu
+ sh -c 'xvfb-run -s "-screen 0 640x480x24" ./autotests -silent'
+
+ # Mac (clang)
+ - os: osx
+ osx_image: xcode8.3
+ compiler: clang
+ env:
+ - SDK_INSTALL_PREFIX="$HOME/sdk-0.15/usr/local"
+ - DYLD_LIBRARY_PATH="$SDK_INSTALL_PREFIX/lib"
+ - DYLD_FRAMEWORK_PATH="/usr/local/opt/qt/lib"
+
+ before_install:
+ - brew update > /dev/null
+ - echo "Install Qt 5.9."
+ - cp qt.rb $(brew --prefix)/Homebrew/Library/Taps/homebrew/homebrew-core/Formula
+ - brew install qt
+ - chmod -R 755 /usr/local/opt/qt/*
+
+ install:
+ - QTDIR="/usr/local/opt/qt"
+ - PATH="$QTDIR/bin:$PATH"
+ - LDFLAGS=-L$QTDIR/lib
+ - CPPFLAGS=-I$QTDIR/include
+ - wget -nv --directory-prefix=$HOME http:https://trueta.udg.edu/apt/macos/devel/0.15/starviewer-sdk-macos-0.15-4.tar.xz
+ - mkdir ~/sdk-0.15
+ - tar xf ~/starviewer-sdk-macos-0.15-4.tar.xz -C ~/sdk-0.15
+
+ script:
+ - cd starviewer
+ - qmake
+ - make -j3 | sed 's/\/Applications\/Xcode\.app\/Contents\/Developer/[xcode]/g' | sed -E 's/\/(Users|home)\/travis\/sdk-0.15/[sdk]/g'
+ - cd tests/auto
+ - ./autotests -silent