Mercurial > hg > sonic-visualiser
changeset 1730:7aa88d988abb vext
Some build and CI fixes
| author | Chris Cannam |
|---|---|
| date | Mon, 10 Jul 2017 11:54:33 +0100 |
| parents | 81c92307f0d3 |
| children | 5185ee58c44b |
| files | .appveyor.yml .travis.yml base.pri |
| diffstat | 3 files changed, 8 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/.appveyor.yml Mon Jul 10 10:10:19 2017 +0100 +++ b/.appveyor.yml Mon Jul 10 11:54:33 2017 +0100 @@ -15,7 +15,8 @@ - set QTDIR=C:\Qt\5.8\msvc2015_64 - set PATH=%PATH%;%QTDIR%\bin;C:\Program Files (x86)\SMLNJ\bin - vext install - - qmake -r -tp vc + - qmake -r -tp vc sonic-visualiser.pro + - sv-dependency-builds\win64-msvc\bin\capnp -Isv-dependency-builds/win64-msvc/include compile --src-prefix=piper/capnp -osv-dependency-builds/win64-msvc/bin/capnpc-c++:piper-cpp/vamp-capnp piper/capnp/piper.capnp - dir build:
--- a/.travis.yml Mon Jul 10 10:10:19 2017 +0100 +++ b/.travis.yml Mon Jul 10 11:54:33 2017 +0100 @@ -23,8 +23,10 @@ - ( cd ../ ; git clone https://github.com/sandstorm-io/capnproto ) - ( cd ../capnproto/c++ ; ./setup-autotools.sh && autoreconf -i ) - ( cd ../capnproto/c++ ; ./configure && make && sudo make install ) - + +before_script: + - if [[ "$TRAVIS_OS_NAME" = "linux" ]] ; then ./configure ; else ./vext install && qmake -r sonic-visualiser.pro ; fi + script: - - if [[ "$TRAVIS_OS_NAME" = "linux" ]] ; then ./configure ; else ./vext install && qmake -r ; fi - - make + - make -j3
--- a/base.pri Mon Jul 10 10:10:19 2017 +0100 +++ b/base.pri Mon Jul 10 11:54:33 2017 +0100 @@ -69,7 +69,7 @@ capnpc.target = piper-cpp/vamp-capnp/piper-capnp.h capnpc.depends = $$PWD/piper/capnp/piper.capnp -capnpc.commands = capnp compile --src-prefix=piper/capnp -oc++:piper-cpp/vamp-capnp $$capnpc.depends +capnpc.commands = capnp compile --src-prefix=$$PWD/piper/capnp -oc++:$$PWD/piper-cpp/vamp-capnp $$capnpc.depends macx* { capnpc.commands=$$PWD/sv-dependency-builds/osx/bin/capnp -I$$PWD/sv-dependency-builds/osx/include compile --src-prefix=$$PWD/piper/capnp -o$$PWD/sv-dependency-builds/osx/bin/capnpc-c++:$$PWD/piper-cpp/vamp-capnp $$capnpc.depends