diff --git a/.gitmodules b/.gitmodules index 4398afb..9cecd70 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule "QuasarAppLib"] path = QuasarAppLib url = git@github.com:QuasarApp/QuasarAppLib.git +[submodule "CQtDeployer"] + path = CQtDeployer + url = git@github.com:QuasarApp/Console-QtDeployer.git diff --git a/CQtDeployer b/CQtDeployer new file mode 160000 index 0000000..d456ce7 --- /dev/null +++ b/CQtDeployer @@ -0,0 +1 @@ +Subproject commit d456ce7f86f2d4c0cc53442e4b00273815a89d6f diff --git a/SoundBand.pro b/SoundBand.pro index 82107cc..b898b21 100644 --- a/SoundBand.pro +++ b/SoundBand.pro @@ -7,7 +7,8 @@ message( DEPLOY_FILES_MASTER = $$DEPLOY_FILES) SUBDIRS += Sync \ QuasarAppLib/QuasarApp.pro \ - SoundBand + SoundBand \ + CQtDeployer SoundBand.depends = Sync QuasarAppLib/QuasarApp.pro diff --git a/installer/config/config.xml b/installer/config/config.xml index dc99e10..f8759d6 100644 --- a/installer/config/config.xml +++ b/installer/config/config.xml @@ -12,5 +12,5 @@ <Logo>iconInstaller.png</Logo> <InstallerWindowIcon>iconInstaller</InstallerWindowIcon> <InstallerApplicationIcon>iconInstaller</InstallerApplicationIcon> - <RunProgram>@TargetDir@/AppRun</RunProgram> + <RunProgram>@TargetDir@/AppRun.sh</RunProgram> </Installer> diff --git a/installer/deploy/linuxdeployqt-continuous-x86_64.AppImage b/installer/deploy/linuxdeployqt-continuous-x86_64.AppImage deleted file mode 100755 index d596df5..0000000 Binary files a/installer/deploy/linuxdeployqt-continuous-x86_64.AppImage and /dev/null differ diff --git a/installer/installer.pro b/installer/installer.pro index afd038f..a46cc16 100644 --- a/installer/installer.pro +++ b/installer/installer.pro @@ -22,7 +22,7 @@ QML_DIR = $$QT_DIR/../qml WINDEPLY = $$QT_DIR/windeployqt.exe MACDEPLY = $$QT_DIR/macdeployqt -LINUXDEPLOY = $$PWD/deploy/CQtDeployer/build/CQtDeployer +LINUXDEPLOY = $$PWD/../CQtDeployer/build/CQtDeployer message( QML_DIR = $$QML_DIR) message( WINDEPLY = $$WINDEPLY) @@ -49,7 +49,7 @@ win32 { unix { for(command, TARGET_LIST) { - installerApp.commands += $$LINUXDEPLOY -bin $$TARGET_PATH/$$command -qmldir=$$QML_DIR -qmake=$$QMAKE_QMAKE && + installerApp.commands += $$LINUXDEPLOY -bin $$TARGET_PATH/$$command -qmlDir $$QML_DIR -qmake $$QMAKE_QMAKE && } commands += "chmod +x $$LINUXDEPLOY" } diff --git a/installer/packages/app/meta/installscript.js b/installer/packages/app/meta/installscript.js index d6737cc..4a7031b 100644 --- a/installer/packages/app/meta/installscript.js +++ b/installer/packages/app/meta/installscript.js @@ -52,7 +52,7 @@ Component.prototype.createOperations = function() "Version=@Version@\n Type=Application\n Terminal=false\n - Exec=@TargetDir@/AppRun\n + Exec=@TargetDir@/AppRun.sh\n Name=@Name@\n Icon=@TargetDir@/icons/icon.png\n Name[en_US]=@Name@");