diff --git a/.gitignore b/.gitignore index ff0ec83..98a56e0 100644 --- a/.gitignore +++ b/.gitignore @@ -51,3 +51,7 @@ installer/packages/SoundBand/stage # QtCtreator CMake CMakeLists.txt.user* installer/installerApp + +*.log + +*.dat diff --git a/CQtDeployer b/CQtDeployer index def5caf..7492728 160000 --- a/CQtDeployer +++ b/CQtDeployer @@ -1 +1 @@ -Subproject commit def5cafdaad6aa2b2c91e878d872121038b225cf +Subproject commit 7492728b745ec644f8abe6af002de1aeba1e8518 diff --git a/QuasarAppLib b/QuasarAppLib index 920ca5e..381518d 160000 --- a/QuasarAppLib +++ b/QuasarAppLib @@ -1 +1 @@ -Subproject commit 920ca5e046dea200682dbc1a2a0be931468e8d72 +Subproject commit 381518d52a122f6892e12d8480de40d61ed44e2c diff --git a/SoundBand.pro b/SoundBand.pro index c150994..4f48b18 100644 --- a/SoundBand.pro +++ b/SoundBand.pro @@ -1,7 +1,7 @@ + TEMPLATE = subdirs CONFIG += ordered -include($$PWD/installer/deploy/deployFiles.pri) message( DEPLOY_FILES_MASTER = $$DEPLOY_FILES) ENABLE_SNAP = 0 #only linux diff --git a/SoundBand/SoundBand.pro b/SoundBand/SoundBand.pro index 4445f4b..1d7e5f2 100644 --- a/SoundBand/SoundBand.pro +++ b/SoundBand/SoundBand.pro @@ -52,7 +52,7 @@ HEADERS += \ playlistsmodel.h \ currentplaylistmodel.h -include($$PWD/../installer/deploy/deployFiles.pri) +include($$PWD/../deploy.pri) include($$PWD/../Sync/Sync.pri) QMAKE_LFLAGS += -Wl,-rpath,"'$$DESTDIR'" diff --git a/Sync/Sync.pri b/Sync/Sync.pri index ab9a95d..b695787 100644 --- a/Sync/Sync.pri +++ b/Sync/Sync.pri @@ -9,7 +9,15 @@ SYNC_LIB = 1 #DEPENDS +OLD_DEST_DIR=$$DESTDIR +OLD_SOUND=$$SOUND_BAND_MODULE; -LIBS += -L"$$PWD/../installer/packages/SoundBand/data/" -lSync +SOUND_BAND_MODULE = sync +include($$PWD/../deploy.pri) + +LIBS += -L"$$DESTDIR/" -lSync + +SOUND_BAND_MODULE = $$OLD_SOUND +DESTDIR = $$OLD_DEST_DIR INCLUDEPATH += "$$PWD/" diff --git a/Sync/Sync.pro b/Sync/Sync.pro index be61878..15e7d6a 100644 --- a/Sync/Sync.pro +++ b/Sync/Sync.pro @@ -8,7 +8,7 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets TARGET = Sync TEMPLATE = lib -include($$PWD/../installer/deploy/deployFiles.pri) +include($$PWD/../deploy.pri); DISTFILES += \ sql/InitLacaleDataBase.sql diff --git a/deploy.pri b/deploy.pri new file mode 100755 index 0000000..6785fc8 --- /dev/null +++ b/deploy.pri @@ -0,0 +1,5 @@ +DESTDIR=$$PWD/installer/packages/SoundBand/data + +equals(SOUND_BAND_MODULE, "test" ) { + DESTDIR=$$PWD/installer/packages/SoundBand.Tests/data +} diff --git a/installer/installer.pro b/installer/installer.pro index 6f9bd39..4421e72 100644 --- a/installer/installer.pro +++ b/installer/installer.pro @@ -22,7 +22,7 @@ QML_DIR = $$PWD/../SoundBand WINDEPLY = $$QT_DIR/windeployqt.exe MACDEPLY = $$QT_DIR/macdeployqt -LINUXDEPLOY = $$PWD/../CQtDeployer/build/CQtDeployer +LINUXDEPLOY = $$PWD/../CQtDeployer/build/cqtdeployer message( QML_DIR = $$QML_DIR) message( WINDEPLY = $$WINDEPLY) diff --git a/installer/packages/SoundBand/snap.pro b/installer/packages/SoundBand/snap.pro index 75c46fb..f57fe57 100644 --- a/installer/packages/SoundBand/snap.pro +++ b/installer/packages/SoundBand/snap.pro @@ -14,7 +14,7 @@ snapApp.output = $$SNAPCRAFT LINUXDEPLOY = $$PWD/../../../CQtDeployer/build/CQtDeployer QT_DIR = $$dirname(QMAKE_QMAKE) -QML_DIR = $$QT_DIR/../qml +QML_DIR = $$PWD/../../../SoundBand unix { message($$DESTDIR); diff --git a/tests/tests.pro b/tests/tests.pro index c751ed2..cd0fc5c 100644 --- a/tests/tests.pro +++ b/tests/tests.pro @@ -5,6 +5,9 @@ CONFIG += qt console warn_on depend_includepath testcase CONFIG -= app_bundle TEMPLATE = app +TARGET = test + +SOUND_BAND_MODULE=test SOURCES += \ tst_synctest.cpp @@ -13,6 +16,5 @@ SOURCES += \ RESOURCES += \ res.qrc -DESTDIR = $$PWD/../installer/packages/SoundBand.Tests/data - +include($$PWD/../deploy.pri) include($$PWD/../Sync/Sync.pri)