From c71c3378e7dcef07c3680e0f77d364963c4d8636 Mon Sep 17 00:00:00 2001 From: dav Date: Sat, 18 Nov 2023 11:17:56 -0800 Subject: [PATCH] Update Flatpak Build Files --- burrow-gtk/com.hackclub.burrow.devel.json | 18 ++++-------------- burrow-gtk/com.hackclub.burrow.json | 21 +++++++-------------- 2 files changed, 11 insertions(+), 28 deletions(-) diff --git a/burrow-gtk/com.hackclub.burrow.devel.json b/burrow-gtk/com.hackclub.burrow.devel.json index 18a7fb40..c8086880 100644 --- a/burrow-gtk/com.hackclub.burrow.devel.json +++ b/burrow-gtk/com.hackclub.burrow.devel.json @@ -1,7 +1,7 @@ { "app-id" : "com.hackclub.burrow-devel", "runtime" : "org.gnome.Platform", - "runtime-version" : "44", + "runtime-version" : "45", "sdk" : "org.gnome.Sdk", "sdk-extensions" : [ "org.freedesktop.Sdk.Extension.rust-stable" @@ -36,26 +36,16 @@ "*.a" ], "modules" : [ - { - "name": "blueprint-compiler", - "buildsystem": "meson", - "sources": [ - { - "type": "git", - "url": "https://gitlab.gnome.org/jwestman/blueprint-compiler", - "tag": "v0.8.1" - } - ] - }, { "name" : "burrow-gtk", "builddir" : true, "subdir" : "burrow-gtk", - "buildsystem" : "meson", + "buildsystem" : "simple", + "build-commands": ["cargo build"], "sources" : [ { "type": "dir", - "path": "./" + "path": "../" } ] } diff --git a/burrow-gtk/com.hackclub.burrow.json b/burrow-gtk/com.hackclub.burrow.json index d7ac2439..e8daff86 100644 --- a/burrow-gtk/com.hackclub.burrow.json +++ b/burrow-gtk/com.hackclub.burrow.json @@ -1,7 +1,7 @@ { "app-id" : "com.hackclub.burrow", "runtime" : "org.gnome.Platform", - "runtime-version" : "44", + "runtime-version" : "45", "sdk" : "org.gnome.Sdk", "sdk-extensions" : [ "org.freedesktop.Sdk.Extension.rust-stable" @@ -36,26 +36,19 @@ "*.a" ], "modules" : [ - { - "name": "blueprint-compiler", - "buildsystem": "meson", - "sources": [ - { - "type": "git", - "url": "https://gitlab.gnome.org/jwestman/blueprint-compiler", - "tag": "v0.8.1" - } - ] - }, { "name" : "burrow-gtk", "builddir" : true, "subdir" : "burrow-gtk", - "buildsystem" : "meson", + "buildsystem" : "simple", + "build-commands": [ + "cargo build --release", + "cp target/release/burrow-gtk /app/bin" + ], "sources" : [ { "type": "dir", - "path": "./" + "path": "../" } ] }