From e188d930db5ad186153480b0fdc14ce7c935a7dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Sawicz?= <michal@sawicz.net>
Date: Wed, 27 Jan 2021 07:34:25 +0100
Subject: [PATCH] [snap] refresh snap

- move to packaging/ubuntu/snap similar to the others
- use `snapcraftctl` to set the snap version
- define the supported architectures
- use command-chain to improve debugging
---
 .../ubuntu/snap/snapcraft.yaml                   | 16 ++++++++++++----
 snap                                             |  1 +
 2 files changed, 13 insertions(+), 4 deletions(-)
 rename snapcraft.yaml => packaging/ubuntu/snap/snapcraft.yaml (88%)
 create mode 120000 snap

diff --git a/snapcraft.yaml b/packaging/ubuntu/snap/snapcraft.yaml
similarity index 88%
rename from snapcraft.yaml
rename to packaging/ubuntu/snap/snapcraft.yaml
index 40ed4496..4ffe133a 100644
--- a/snapcraft.yaml
+++ b/packaging/ubuntu/snap/snapcraft.yaml
@@ -1,5 +1,4 @@
 name: nymea-app
-version: developer-build
 summary: Control app for nymea
 description: | 
   The nymea daemon is a plugin based IoT (Internet of Things) server. 
@@ -9,12 +8,19 @@ description: |
   scenes and behaviors for your environment.
 
 grade: stable
-base: core18
+base: core20
 confinement: strict
+adopt-info: nymea-app
+
+architectures:
+- build-on: amd64
+- build-on: arm64
+- build-on: armhf
 
 apps:
   nymea-app:
-    command: desktop-launch nymea-app
+    command-chain: [ bin/desktop-launch ]
+    command: usr/bin/nymea-app
     desktop: usr/share/applications/nymea-app.desktop
     plugs:
     - avahi-observe
@@ -55,7 +61,6 @@ parts:
     plugin: qmake
     source: .
     after: [desktop-qt5]
-    project-files: [ nymea-app.pro ]
     build-packages:
       - execstack
       - qt5-default
@@ -90,3 +95,6 @@ parts:
       - libavahi-common3
       - qtvirtualkeyboard-plugin
       - qtwayland5
+    override-build: |
+      snapcraftctl set-version $( git -C ${SNAPCRAFT_PART_SRC} describe --tags )
+      snapcraftctl build
diff --git a/snap b/snap
new file mode 120000
index 00000000..c7c77b20
--- /dev/null
+++ b/snap
@@ -0,0 +1 @@
+packaging/ubuntu/snap
\ No newline at end of file