From 2c433f93d8bc20f42ad7aa4129706861a57f219a Mon Sep 17 00:00:00 2001 From: EndrII Date: Wed, 31 Oct 2018 18:14:38 +0300 Subject: [PATCH] fix linux build --- CQtDeployer | 2 +- SoundBand.pro | 4 ---- installer/deploy/deploy.sh | 10 ++++++++-- installer/installer.pro | 3 --- 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/CQtDeployer b/CQtDeployer index a80e043..a2f688e 160000 --- a/CQtDeployer +++ b/CQtDeployer @@ -1 +1 @@ -Subproject commit a80e043c4db198497033930e34703fed7d17ad7c +Subproject commit a2f688ebc1b1108c09d3df5d5aa4250cdfc926d4 diff --git a/SoundBand.pro b/SoundBand.pro index 1ef55e5..d4fa06b 100644 --- a/SoundBand.pro +++ b/SoundBand.pro @@ -9,10 +9,6 @@ SUBDIRS += QuasarAppLib/QuasarApp.pro \ SoundBand \ tests -unix:!android:{ - SUBDIRS += CQtDeployer -} - SoundBand.depends = Sync QuasarAppLib/QuasarApp.pro equals( ENABLE_INSTALLER, 1) { diff --git a/installer/deploy/deploy.sh b/installer/deploy/deploy.sh index 581e2ee..4476595 100755 --- a/installer/deploy/deploy.sh +++ b/installer/deploy/deploy.sh @@ -2,10 +2,16 @@ CURRENTDIR=$(dirname "$(readlink -f "$0")") -deploy="$CURRENTDIR/../../CQtDeployer/build/release/cqtdeployer" +CQtDeployer="$CURRENTDIR/../../CQtDeployer" + +deploy="$CQtDeployer/build/release/cqtdeployer.sh" qmldir=$1 qmake=$2 +chmod +x $CQtDeployer/sharedBuild.sh + +$CQtDeployer/sharedBuild.sh $qmake + rm -rdf "$CURRENTDIR/../packages/SoundBand/data" rm -rdf "$CURRENTDIR/../packages/SoundBand.Tests/data" @@ -24,6 +30,6 @@ chmod +x $deploy cp -Rpf "$CURRENTDIR/../../CQtDeployer/QuasarAppLib/build/release/." "$CURRENTDIR/../../CQtDeployer/build/release" -$deploy -qmake $qmake clear -qmldir $qmldir -bin "$CURRENTDIR/../packages/SoundBand/data/SoundBand" +$deploy -qmake "$qmake" clear -qmlDir "$qmldir" -bin "$CURRENTDIR/../packages/SoundBand/data/SoundBand" diff --git a/installer/installer.pro b/installer/installer.pro index 1b27de9..6c7c736 100644 --- a/installer/installer.pro +++ b/installer/installer.pro @@ -19,9 +19,6 @@ QML_DIR = $$PWD/../SoundBand WINDEPLOY = $$QT_DIR/windeployqt.exe WINDEPLOY_RUN = $$PWD/deploy/deploy.bat - - - LINUXDEPLOY = $$PWD/deploy/deploy.sh unix {