Merge pull request #71 from QuasarApp/snap

Snap

.gitignore

@@ -36,6 +36,10 @@ ui_*.h
 Makefile*
 *build-*
 
+*.snap
+installer/packages/SoundBand/parts
+installer/packages/SoundBand/prime
+installer/packages/SoundBand/stage
 # QtCreator
 
 *.autosave

CQtDeployer

@@ -1 +1 @@
-Subproject commit d456ce7f86f2d4c0cc53442e4b00273815a89d6f
+Subproject commit 941478e99bb8817f540d49a3426c7686253b8aac

SoundBand.pro

@@ -4,6 +4,8 @@ CONFIG += ordered
 include($$PWD/installer/deploy/deployFiles.pri)
 message( DEPLOY_FILES_MASTER = $$DEPLOY_FILES)
 
+ENABLE_SNAP = 1 #only linux
+ENABLE_INSTALLER = 0 #only desctop
 
 SUBDIRS += Sync \
         QuasarAppLib/QuasarApp.pro \
@@ -13,14 +15,30 @@ SUBDIRS += Sync \
 
 SoundBand.depends = Sync QuasarAppLib/QuasarApp.pro
 
-!android:{
-    message(desktopVersion: enabled)
-    CONFIG(release, debug|release): {
+equals( ENABLE_INSTALLER, 1) {
+    !android:{
+        message(desktopVersion: enabled)
+        CONFIG(release, debug|release): {
 
-        SUBDIRS += installer
+            SUBDIRS += installer
 
-    } else {
-        message( Selected Debug mode. The installer will not be created )
+        } else {
+            message( Selected Debug mode. The installer will not be created )
 
+        }
+    }
+}
+
+equals( ENABLE_SNAP, 1) {
+    !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 )
+
+        }
     }
 }

installer/packages/SoundBand/runSnap.sh

@@ -0,0 +1,15 @@
+#!/bin/sh
+OLD_DIR=$PWD
+BASE_DIR=$(dirname $0)
+TARGET_DIR="$BASE_DIR/../../"
+echo "selected target dir $TARGET_DIR"
+echo "cd to snapcraft dir $BASE_DIR"
+cd $BASE_DIR
+
+snapcraft
+
+echo "return to old dir $OLD_DIR"
+cd $OLD_DIR
+
+rm -f $TARGET_DIR/*.snap
+mv $BASE_DIR/*.snap $TARGET_DIR

installer/packages/SoundBand/snap.pro

@@ -0,0 +1,41 @@
+include($$PWD/../../deploy/targetList.pri)
+include($$PWD/../../deploy/deployFiles.pri)
+
+
+TEMPLATE = aux
+
+SNAPCRAFT = runSnap.sh
+
+DESTDIR = $$PWD
+
+INPUT = $$PWD/snap/snapcraft.yaml
+snapApp.input = INPUT
+snapApp.output = $$SNAPCRAFT
+LINUXDEPLOY = $$PWD/../../../CQtDeployer/build/CQtDeployer
+
+QT_DIR = $$dirname(QMAKE_QMAKE)
+QML_DIR = $$QT_DIR/../qml
+
+unix {
+    message($$DESTDIR);
+    message($$TARGET_LIST);
+
+    for(command, TARGET_LIST) {
+        snapApp.commands += $$LINUXDEPLOY -bin $$TARGET_PATH/$$command -qmlDir $$QML_DIR -qmake $$QMAKE_QMAKE &&
+    }
+
+    snapApp.commands += $$DESTDIR/$$SNAPCRAFT
+    snapApp.CONFIG += target_predeps no_link combine
+
+    message( snapComands = "$$snapApp.commands")
+}
+
+
+QMAKE_EXTRA_COMPILERS += snapApp
+
+DISTFILES += \
+
+unix:extraclean.commands = $$SNAPCRAFT clean soundband
+
+distclean.depends = extraclean
+QMAKE_EXTRA_TARGETS += distclean extraclean

installer/packages/SoundBand/snap/.snapcraft/state

@@ -0,0 +1,4 @@
+!GlobalState
+assets:
+  build-packages: []
+  build-snaps: []

installer/packages/SoundBand/snap/gui/QtDeployer.desktop

@@ -0,0 +1,15 @@
+[Desktop Entry]
+Version=1.0
+Name=SoundBand
+Comment=Mobile and desktop song sync audio player. working on wifi.
+Exec=sound-band
+Icon=/snap/soundband/current/meta/gui/icon.png
+Terminal=false
+Type=Application
+Categories=utils;Application;
+X-GNOME-Bugzilla-Bugzilla=GNOME
+X-GNOME-Bugzilla-Product=sound-band
+X-GNOME-Bugzilla-Component=General
+X-GNOME-Bugzilla-Version=1.0
+StartupNotify=true
+Name[ru_RU]=SoundBand

installer/packages/SoundBand/snap/snapcraft.yaml

@@ -0,0 +1,28 @@
+name: soundband
+version: '1.0'
+summary: Mobile and desktop song sync audio player. working on wifi. 
+description: |
+  SoundBand is a cross-platform application for synchronous music playback on all your devices. supported platform:
+    Linux
+    Android
+    Windows
+
+
+grade: stable # must be 'stable' to release into candidate/stable channels
+confinement: strict # use 'strict' once you have the right plugs and slots
+
+
+icon: data/icons/icon.png
+
+apps:
+  soundband:
+    command: desktop-launch $SNAP/AppRun.sh
+
+    plugs: [desktop, unity7, home, opengl, x11, wayland, gsettings, pulseaudio, alsa]
+
+parts:
+  soundband:
+    plugin: dump
+    source: data/
+
+    after: [desktop-qt5]