QuasarApp/SoundBand
4
0
Fork 0
mirror of https://github.com/QuasarApp/SoundBand.git synced 2025-04-26 15:24:31 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #83 from QuasarApp/alpha1

Browse Source 
Alpha1
This commit is contained in:
Andrei Yankovich 2018-10-27 00:27:53 +03:00 committed by GitHub
commit b1109d25d8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 44 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -35,7 +35,7 @@ qrc_*.cpp
ui_*.h
Makefile*
*build-*
*build*
*.snap
installer/packages/SoundBand/parts
installer/packages/SoundBand/prime

2
CQtDeployer

@ -1 +1 @@
Subproject commit 7c3b80c6600fe883df0331682dcdb9931542ad82
Subproject commit a80e043c4db198497033930e34703fed7d17ad7c

15
SoundBand.pro
View File

@ -2,8 +2,6 @@
TEMPLATE = subdirs
CONFIG += ordered
ENABLE_SNAP = 1 #only linux
ENABLE_INSTALLER = 1 #only desctop
SUBDIRS += QuasarAppLib/QuasarApp.pro \
@ -31,16 +29,3 @@ equals( ENABLE_INSTALLER, 1) {
}
}
equals( ENABLE_SNAP, 1) {
unix:!android:{
message(desktopVersion: enabled)
CONFIG(release, debug|release): {
SUBDIRS += installer/packages/SoundBand/snap.pro
} else {
message( Selected Debug mode. The snap will not be created )
}
}
}

29
installer/deploy/deploy.sh Executable file
View File

@ -0,0 +1,29 @@
#!/bin/bash
CURRENTDIR=$(dirname "$(readlink -f "$0")")
deploy="$CURRENTDIR/../../CQtDeployer/build/release/cqtdeployer"
qmldir=$1
qmake=$2
rm -rdf "$CURRENTDIR/../packages/SoundBand/data"
rm -rdf "$CURRENTDIR/../packages/SoundBand.Tests/data"
mkdir "$CURRENTDIR/../packages/SoundBand/data"
mkdir "$CURRENTDIR/../packages/SoundBand.Tests/data"
cp -R "$CURRENTDIR/../packages/SoundBand/extra/." "$CURRENTDIR/../packages/SoundBand/data"
cp -Rp "$CURRENTDIR/../../SoundBand/build/release/SoundBand" "$CURRENTDIR/../packages/SoundBand/data/"
cp -Rpf "$CURRENTDIR/../../QuasarAppLib/build/release/." "$CURRENTDIR/../packages/SoundBand/data"
cp -Rpf "$CURRENTDIR/../../Sync/build/release/." "$CURRENTDIR/../packages/SoundBand/data/"
cp -Rp "$CURRENTDIR/../../tests/build/release/test" "$CURRENTDIR/../packages/SoundBand.Tests/data/"
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"

8
installer/deploy/deployFiles.pri
View File

@ -1,8 +0,0 @@
TARGET_PATH = $$PWD/../packages/SoundBand/data
equals( TEMPLATE, app) {
DESTDIR = $$PWD/../packages/SoundBand/data
}
equals( TEMPLATE, lib) {
DESTDIR = $$PWD/../packages/SoundBand/data
}

19
installer/deploy/targetList.pri
View File

@ -1,19 +0,0 @@
# Here you need to specify a list of end targets for each platform.
# windows
win32 {
TARGET_LIST += SoundBand.exe
TARGET_LIST += Sync.dll
TARGET_LIST += QUasarApp.dll
}
# linux
# by default installer create shortcut for last binary file of the list
unix {
TARGET_LIST += SoundBand
}
# os X
macx {
TARGET_LIST += SoundBand
}

20
installer/installer.pro
View File

@ -1,4 +1,3 @@
include($$PWD/deploy/targetList.pri)
TEMPLATE = aux
@ -21,7 +20,13 @@ QML_DIR = $$PWD/../SoundBand
WINDEPLOY = $$QT_DIR/windeployqt.exe
WINDEPLOY_RUN = $$PWD/deploy/deploy.bat
LINUXDEPLOY = $$PWD/../CQtDeployer/build/cqtdeployer
LINUXDEPLOY = $$PWD/deploy/deploy.sh
unix {
installerApp.commands += chmod +x $$LINUXDEPLOY &&
}
win32 {
OUT_FILE = SoundBandInstaller.exe
@ -34,18 +39,16 @@ win32 {
win32 {
installerApp.commands += $$WINDEPLOY_RUN $$WINDEPLOY $$QML_DIR $$shell_path($$PWD) &&
}
#prepare end
unix {
for(command, TARGET_LIST) {
installerApp.commands += $$LINUXDEPLOY -bin $$DESTDIR/$$command clear -qmlDir $$QML_DIR -qmake $$QMAKE_QMAKE &&
}
installerApp.commands += $$LINUXDEPLOY $$QML_DIR $$QMAKE_QMAKE &&
}
#prepare end
installerApp.commands += $$QT_DIR/../../../Tools/QtInstallerFramework/3.0/bin/binarycreator --offline-only -c $$PWD/config/config.xml -p $$PWD/packages $$PWD/$$OUT_FILE --verbose -f
installerApp.CONFIG += target_predeps no_link combine
message( installComands = "$$installerApp.commands")
commands += "$$LUPDATE $$PWD/packages/SoundBand/meta/installscript.js -ts $$PWD/packages/SoundBand/meta/ru.ts"
commands += "$$LRELEASE $$PWD/packages/SoundBand/meta/ru.ts"
@ -70,5 +73,6 @@ DISTFILES += \
packages/SoundBand.Tests/meta/installscript.js \
packages/SoundBand.Tests/meta/package.xml \
packages/SoundBand.Tests/meta/ru.ts \
deploy/deploy.bat
deploy/deploy.bat \
deploy/deploy.sh

5
installer/packages/SoundBand/snap.pro
View File

@ -1,6 +1,3 @@
include($$PWD/../../deploy/targetList.pri)
include($$PWD/../../../deploy.pri)
TEMPLATE = aux
@ -11,7 +8,7 @@ DESTDIR = $$PWD
INPUT = $$PWD/snap/snapcraft.yaml
snapApp.input = INPUT
snapApp.output = $$SNAPCRAFT
LINUXDEPLOY = $$PWD/../../../CQtDeployer/build/CQtDeployer
LINUXDEPLOY = $$PWD/../../../CQtDeployer/build/release/CQtDeployer
QT_DIR = $$dirname(QMAKE_QMAKE)
QML_DIR = $$PWD/../../../SoundBand