From 6c86cf775649fe41082f2ec5597260e07ba80be3 Mon Sep 17 00:00:00 2001 From: gcoco Date: Tue, 14 Feb 2017 16:58:34 -0500 Subject: [PATCH] Enhancements to Travis Build Build with QT5.5.1 and WEBKIT. Build with latest brew QT and WEBENGINE. Build with LMFIT installed. --- .travis.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 41f98d054..56fee3bb7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,8 @@ compiler: - gcc env: matrix: - - BRANCH=master QT=qt5 QT_PATH=qt5 QT_VER=5.5.1 + - BRANCH=master QT=qt5 QT_PATH=qt5 QT_VER=5.5.1 WEBKIT=1 + - BRANCH=master QT=qt5 QT_PATH=qt5 WEBKIT=0 global: - secure: iqYW7f3//ZkMVzeCEarYn0S0DqKjFU9juBh0KF6WTlUsKX902Jtsk7dFoJlNDYBf63HLgV+wW2Hc6MxI9sGiUkom0gY9/To/aeGIJFGEX2sLm/e0Ok3qN521FA0Q/OiCFsD0RC6J+yrHxzI+rf8Z1rujceUsz2KgsrfAjYYv+BY= - secure: C6f58PXwvvHeVOjCLbyDRjgyF0tk+bXjCNUDur8VJLhJEGNdnrt+rH+d3azYaX0n348ZnQZ14as4M4rHjN1A/3DRbdUdOS7PQZrkj/n363ck1tvYOG/tzYqkEcVoQyjIJ7ZoTuBXDQry/VJmLxQjM0glTa2upNFHMOMwqZNkF+I= @@ -35,6 +36,7 @@ before_install: - brew install libsamplerate - brew tap homebrew/science - brew install r +- brew install lmfit ## Disable KML for now ##- brew install --HEAD travis/libkml.rb - sudo chmod -R +w /usr/local @@ -61,6 +63,7 @@ before_script: - cp qwt/qwtconfig.pri.in qwt/qwtconfig.pri - cp src/gcconfig.pri.in src/gcconfig.pri - /usr/local/opt/$QT_PATH/bin/lupdate src/src.pro +- if [[ "$WEBKIT" == "0" ]]; then echo DEFINES += NOWEBKIT >> src/gcconfig.pri; fi - sed -i "" "s|#\(CONFIG += release.*\)|\1 static |" src/gcconfig.pri - sed -i "" "s|#\(QMAKE_LRELEASE\).*|\1 += /usr/local/opt/$QT_PATH/bin/lrelease|" src/gcconfig.pri @@ -87,6 +90,7 @@ before_script: - sed -i "" "s|#\(LIBUSB_LIBS =.*\)|\1 -L/usr/local/lib -lusb -lusb-1.0|" src/gcconfig.pri - sed -i "" "s|#\(SAMPLERATE_INSTALL =\).*|\1 /usr/local|" src/gcconfig.pri - sed -i "" "s|#\(SAMPLERATE_LIBS =\).*|\1 -L/usr/local/lib -lsamplerate|" src/gcconfig.pri +- sed -i "" "s|#\(LMFIT_INSTALL =\).*|\1 /usr/local|" src/gcconfig.pri - sed -i "" "s|#\(DEFINES += GC_HAVE_LION*\)|\1|" src/gcconfig.pri - sed -i "" "s|#\(HTPATH = ../httpserver.*\)|\1 |" src/gcconfig.pri - sed -i "" "s|#\(DEFINES += GC_WANT_ROBOT.*\)|\1 |" src/gcconfig.pri