Merge pull request #5 from sugarlabs/electron-flatpak

switch to electron for app viewer

Author: Clue88

README.md

@@ -16,7 +16,7 @@ $ flatpak install flathub org.gnome.Platform//3.36 org.gnome.Sdk//3.36
 
 ```
 $ flatpak-builder --force-clean --repo=repo build org.sugarlabs.MusicBlocks.json
-$ flatpak build-bundle repo musicblocks.flatpak org.sugarlabs.MusicBlocks
+$ flatpak build-bundle repo musicblocks.flatpak org.sugarlabs.MusicBlocks stable
 $ flatpak install musicblocks.flatpak
 ```
 

data/org.sugarlabs.MusicBlocks.desktop

@@ -1,6 +1,6 @@
 [Desktop Entry]
 Name=Music Blocks
-Exec=launcher
+Exec=run.sh
 Type=Application
 Icon=org.sugarlabs.MusicBlocks
 Categories=Education;ComputerScience;Art;Music;

data/org.sugarlabs.MusicBlocks.json

@@ -1,20 +1,50 @@
 {
     "app-id": "org.sugarlabs.MusicBlocks",
-    "runtime": "org.gnome.Platform",
-    "runtime-version": "3.36",
-    "sdk": "org.gnome.Sdk",
-    "command": "launcher",
+    "runtime": "org.freedesktop.Platform",
+    "runtime-version": "19.08",
+    "branch": "stable",
+    "sdk": "org.freedesktop.Sdk",
+    "base": "io.atom.electron.BaseApp",
+    "base-version": "stable",
+    "command": "run.sh",
+    "separate-locales": false,
     "finish-args": [
         "--share=network",
-        "--socket=wayland",
-        "--socket=fallback-x11",
+        "--socket=x11",
         "--socket=pulseaudio",
         "--device=dri",
+        "--filesystem=home",
         "--env=MUSICBLOCKS_PATH=/app/share/musicblocks"
     ],
+    "build-options" : {
+        "cflags": "-O2 -g",
+        "cxxflags": "-O2 -g",
+        "env": {
+            "NPM_CONFIG_LOGLEVEL": "info"
+        }
+    },
     "modules": [
         {
-            "name": "launcher",
+            "name": "nodejs",
+            "cleanup": [
+                "/include",
+                "/share",
+                "/app/lib/node_modules/npm/changelogs",
+                "/app/lib/node_modules/npm/doc",
+                "/app/lib/node_modules/npm/html",
+                "/app/lib/node_modules/npm/man",
+                "/app/lib/node_modules/npm/scripts"
+            ],
+            "sources": [
+                {
+                    "type": "archive",
+                    "url": "https://nodejs.org/dist/v14.7.0/node-v14.7.0.tar.xz",
+                    "sha256": "ca2f1c63f3f2bf22247d7386bfc31e0295caa953f39f7079210170a886288e6f"
+                }
+            ]
+        },
+        {
+            "name": "mb-launcher",
             "buildsystem": "simple",
             "build-commands": [
                 "python3 setup.py install --prefix=${FLATPAK_DEST}"
@@ -38,21 +68,59 @@
                 "rm -rf musicblocks/charts",
                 "rm -rf musicblocks/mouse-art",
                 "rm -rf musicblocks/screenshots",
+                "rm musicblocks/package*",
+                "mkdir /app/share/musicblocks",
                 "cp -ra musicblocks/* /app/share/musicblocks"
             ],
             "sources": [
                 {
                     "type": "git",
                     "url": "https://github.com/sugarlabs/musicblocks",
-                    "tag": "v3.1",
-                    "commit": "5a0e5fc244acd8fa806f78a937165cc2a528e68e",
+                    "tag": "v3.2",
+                    "commit": "010d7f90cd68ac25c3c07886f1f5955ef2f196dc",
                     "dest": "musicblocks"
                 },
                 {
                     "type": "patch",
                     "path": "save-interface.patch"
                 }
             ]
+        },
+        {
+            "name": "electron-app",
+            "build-options": {
+                "env": {
+                    "electron_config_cache": "/run/build/electron-app/flatpak-node/npm-cache"
+                },
+                "build-args": [ "--share=network" ]
+            },
+            "buildsystem": "simple",
+            "build-commands": [
+                "npm install --prefix=main --offline --cache=/run/build/electron-app/flatpak-node/npm-cache/",
+                "cp -ra main/* /app/share/musicblocks/",
+                "install run.sh /app/bin/"
+            ],
+            "sources": [
+                {
+                    "type": "git",
+                    "url": "https://github.com/srevinsaju/musicblocks-app",
+                    "tag": "continuous",
+                    "commit": "844eabe9b9e668f9f645a9af49517e83cb738d80",
+                    "dest": "main"
+                },
+                {
+                    "type": "patch",
+                    "path": "electron-app.patch"
+                },
+                "generated-sources.json",
+                {
+                    "type": "script",
+                    "dest-filename": "run.sh",
+                    "commands": [
+                        "npm start --prefix=/app/share/musicblocks"
+                    ]
+                }
+            ]
         }
     ]
 }

data/org.sugarlabs.MusicBlocks.ui

@@ -2,14 +2,12 @@
 import os
 
 setup(name='Music Blocks Launcher',
-    version='1.0',
+    version='1.1.0',
     description='Flatpak launcher for Music Blocks',
     url="https://github.com/sugarlabs/musicblocks-launcher",
     data_files=[
         ('share/metainfo', ['data/org.sugarlabs.MusicBlocks.appdata.xml']),
         ('share/icons/hicolor/scalable/apps', ['data/org.sugarlabs.MusicBlocks.svg']),
         ('share/applications', ['data/org.sugarlabs.MusicBlocks.desktop']),
-        ('share/musicblocks', ['data/org.sugarlabs.MusicBlocks.ui']),
-        ('bin', ['launcher'])
         ]
     )