Mercurial > hg > sonic-visualiser
changeset 1332:587c0e53ea86 3.0-integration
Rearrange svcore tests so they can all be built from the top level
| author | Chris Cannam |
|---|---|
| date | Mon, 14 Nov 2016 17:53:16 +0000 |
| parents | 7b46591ba12d |
| children | fe5fb6027aea |
| files | .hgsubstate base.pri sonic-visualiser.pro sv.pro test-svcore-base.pro test-svcore-data-fileio.pro test-svcore-data-model.pro |
| diffstat | 7 files changed, 158 insertions(+), 63 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgsubstate Mon Nov 14 15:00:29 2016 +0000 +++ b/.hgsubstate Mon Nov 14 17:53:16 2016 +0000 @@ -7,6 +7,6 @@ ca39a12af53b71e13596a930b828eb1a920238e4 piper-cpp e1712f7d74a455337591091a57beba2f0443b9dd sv-dependency-builds 47db3b8f406360cbcfd7bef087ccf893b3c1c0e2 svapp -a4554bf41367d1d30e78081d846bc816dba25b64 svcore +24c0d4c5356ec2257cd96d80452458089cc394c7 svcore f2f43802718b0016d5579e9e3b0c6ab8f3e9d785 svgui 8e846c1aed96189f020024cdadd0d37bf69d3e3a vamp-plugin-sdk
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/base.pri Mon Nov 14 17:53:16 2016 +0000 @@ -0,0 +1,66 @@ + +SV_INCLUDEPATH = \ + . \ + bqvec \ + bqvec/bqvec \ + bqresample \ + bqaudioio \ + bqaudioio/bqaudioio \ + piper-cpp \ + checker \ + checker/checker \ + dataquay \ + dataquay/dataquay \ + svcore \ + svcore/data \ + svcore/plugin/api/alsa \ + svgui \ + svapp \ + vamp-plugin-sdk + +DEPENDPATH += $$SV_INCLUDEPATH +INCLUDEPATH += $$SV_INCLUDEPATH + +# Platform defines for RtMidi +linux*: DEFINES += __LINUX_ALSASEQ__ +macx*: DEFINES += __MACOSX_CORE__ +win*: DEFINES += __WINDOWS_MM__ +solaris*: DEFINES += __RTMIDI_DUMMY_ONLY__ + +# Defines for Dataquay +DEFINES += USE_SORD + +CONFIG += qt thread warn_on stl rtti exceptions c++11 + +include(bq-files.pri) +include(vamp-plugin-sdk-files.pri) +include(svcore/files.pri) + +DATAQUAY_SOURCES=$$fromfile(dataquay/lib.pro, SOURCES) +DATAQUAY_HEADERS=$$fromfile(dataquay/lib.pro, HEADERS) + +CHECKER_SOURCES=$$fromfile(checker/checker.pri, SOURCES) +CHECKER_HEADERS=$$fromfile(checker/checker.pri, HEADERS) + +CLIENT_HEADERS=$$fromfile(piper-cpp/vamp-client/client.pro, HEADERS) + +for (file, BQ_SOURCES) { SOURCES += $$file } +for (file, BQ_HEADERS) { HEADERS += $$file } + +for (file, VAMP_SOURCES) { SOURCES += $$file } +for (file, VAMP_HEADERS) { HEADERS += $$file } + +for (file, DATAQUAY_SOURCES) { SOURCES += $$sprintf("dataquay/%1", $$file) } +for (file, DATAQUAY_HEADERS) { HEADERS += $$sprintf("dataquay/%1", $$file) } + +for (file, CHECKER_SOURCES) { SOURCES += $$sprintf("checker/%1", $$file) } +for (file, CHECKER_HEADERS) { HEADERS += $$sprintf("checker/%1", $$file) } + +for (file, SVCORE_SOURCES) { SOURCES += $$sprintf("svcore/%1", $$file) } +for (file, SVCORE_HEADERS) { HEADERS += $$sprintf("svcore/%1", $$file) } + +for (file, CLIENT_HEADERS) { + HEADERS += $$sprintf("piper-cpp/vamp-client/%1", $$file) +} + +SOURCES += piper-cpp/vamp-capnp/piper-capnp.cpp
--- a/sonic-visualiser.pro Mon Nov 14 15:00:29 2016 +0000 +++ b/sonic-visualiser.pro Mon Nov 14 17:53:16 2016 +0000 @@ -5,7 +5,10 @@ # We should build and run the tests on any platform, # but doing it automatically doesn't work so well from # within an IDE on Windows, so remove that from here - SUBDIRS += svcore/base/test svcore/data/fileio/test svcore/data/model/test + SUBDIRS += \ + sub_test_svcore_base \ + sub_test_svcore_data_fileio \ + sub_test_svcore_data_model } SUBDIRS += \ @@ -14,6 +17,10 @@ sub_convert \ sub_sv +sub_test_svcore_base.file = test-svcore-base.pro +sub_test_svcore_data_fileio.file = test-svcore-data-fileio.pro +sub_test_svcore_data_model.file = test-svcore-data-model.pro + sub_server.file = server.pro sub_convert.file = convert.pro sub_sv.file = sv.pro
--- a/sv.pro Mon Nov 14 15:00:29 2016 +0000 +++ b/sv.pro Mon Nov 14 17:53:16 2016 +0000 @@ -9,7 +9,8 @@ include(noconfig.pri) } -CONFIG += qt thread warn_on stl rtti exceptions c++11 +include(base.pri) + QT += network xml gui widgets svg TARGET = "Sonic Visualiser" @@ -22,15 +23,6 @@ i18n/sonic-visualiser_en_US.ts \ i18n/sonic-visualiser_cs_CZ.ts -# Platform defines for RtMidi -linux*: DEFINES += __LINUX_ALSASEQ__ -macx*: DEFINES += __MACOSX_CORE__ -win*: DEFINES += __WINDOWS_MM__ -solaris*: DEFINES += __RTMIDI_DUMMY_ONLY__ - -# Defines for Dataquay -DEFINES += USE_SORD - OBJECTS_DIR = o MOC_DIR = o @@ -42,65 +34,14 @@ # Mac integration QMAKE_INFO_PLIST = deploy/osx/Info.plist -SV_INCLUDEPATH = \ - . \ - bqvec \ - bqvec/bqvec \ - bqresample \ - bqaudioio \ - bqaudioio/bqaudioio \ - piper-cpp \ - checker \ - checker/checker \ - dataquay \ - dataquay/dataquay \ - svcore \ - svcore/data \ - svcore/plugin/api/alsa \ - svgui \ - svapp \ - vamp-plugin-sdk - -DEPENDPATH += $$SV_INCLUDEPATH -INCLUDEPATH += $$SV_INCLUDEPATH - -include(bq-files.pri) -include(vamp-plugin-sdk-files.pri) -include(svcore/files.pri) include(svgui/files.pri) include(svapp/files.pri) -DATAQUAY_SOURCES=$$fromfile(dataquay/lib.pro, SOURCES) -DATAQUAY_HEADERS=$$fromfile(dataquay/lib.pro, HEADERS) - -CHECKER_SOURCES=$$fromfile(checker/checker.pri, SOURCES) -CHECKER_HEADERS=$$fromfile(checker/checker.pri, HEADERS) - -CLIENT_HEADERS=$$fromfile(piper-cpp/vamp-client/client.pro, HEADERS) - -for (file, BQ_SOURCES) { SOURCES += $$file } -for (file, BQ_HEADERS) { HEADERS += $$file } - -for (file, VAMP_SOURCES) { SOURCES += $$file } -for (file, VAMP_HEADERS) { HEADERS += $$file } - -for (file, SVCORE_SOURCES) { SOURCES += $$sprintf("svcore/%1", $$file) } for (file, SVGUI_SOURCES) { SOURCES += $$sprintf("svgui/%1", $$file) } for (file, SVAPP_SOURCES) { SOURCES += $$sprintf("svapp/%1", $$file) } -for (file, DATAQUAY_SOURCES) { SOURCES += $$sprintf("dataquay/%1", $$file) } -for (file, CHECKER_SOURCES) { SOURCES += $$sprintf("checker/%1", $$file) } -for (file, SVCORE_HEADERS) { HEADERS += $$sprintf("svcore/%1", $$file) } for (file, SVGUI_HEADERS) { HEADERS += $$sprintf("svgui/%1", $$file) } for (file, SVAPP_HEADERS) { HEADERS += $$sprintf("svapp/%1", $$file) } -for (file, DATAQUAY_HEADERS) { HEADERS += $$sprintf("dataquay/%1", $$file) } -for (file, CHECKER_HEADERS) { HEADERS += $$sprintf("checker/%1", $$file) } - -for (file, CLIENT_HEADERS) { - HEADERS += $$sprintf("piper-cpp/vamp-client/%1", $$file) -} - -SOURCES += piper-cpp/vamp-capnp/piper-capnp.cpp HEADERS += \ main/MainWindow.h \
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test-svcore-base.pro Mon Nov 14 17:53:16 2016 +0000 @@ -0,0 +1,27 @@ + +TEMPLATE = app + +exists(config.pri) { + include(config.pri) +} + +!exists(config.pri) { + include(noconfig.pri) +} + +include(base.pri) + +CONFIG += console +QT += network xml testlib +QT -= gui + +TARGET = test-svcore-base + +OBJECTS_DIR = o +MOC_DIR = o + +include(svcore/base/test/files.pri) + +for (file, TEST_SOURCES) { SOURCES += $$sprintf("svcore/base/test/%1", $$file) } +for (file, TEST_HEADERS) { HEADERS += $$sprintf("svcore/base/test/%1", $$file) } +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test-svcore-data-fileio.pro Mon Nov 14 17:53:16 2016 +0000 @@ -0,0 +1,27 @@ + +TEMPLATE = app + +exists(config.pri) { + include(config.pri) +} + +!exists(config.pri) { + include(noconfig.pri) +} + +include(base.pri) + +CONFIG += console +QT += network xml testlib +QT -= gui + +TARGET = test-svcore-data-fileio + +OBJECTS_DIR = o +MOC_DIR = o + +include(svcore/data/fileio/test/files.pri) + +for (file, TEST_SOURCES) { SOURCES += $$sprintf("svcore/data/fileio/test/%1", $$file) } +for (file, TEST_HEADERS) { HEADERS += $$sprintf("svcore/data/fileio/test/%1", $$file) } +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test-svcore-data-model.pro Mon Nov 14 17:53:16 2016 +0000 @@ -0,0 +1,27 @@ + +TEMPLATE = app + +exists(config.pri) { + include(config.pri) +} + +!exists(config.pri) { + include(noconfig.pri) +} + +include(base.pri) + +CONFIG += console +QT += network xml testlib +QT -= gui + +TARGET = test-svcore-data-model + +OBJECTS_DIR = o +MOC_DIR = o + +include(svcore/data/model/test/files.pri) + +for (file, TEST_SOURCES) { SOURCES += $$sprintf("svcore/data/model/test/%1", $$file) } +for (file, TEST_HEADERS) { HEADERS += $$sprintf("svcore/data/model/test/%1", $$file) } +