a

1 files changed, 37 insertions, 41 deletions

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 7974f9f..3cac6aa 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -8,9 +8,9 @@ issues: https://codeberg.org/hurrycurry/hurrycurry/issues
 source-code: https://codeberg.org/hurrycurry/hurrycurry
 title: Hurry Curry!
 description: |
-     Hurry Curry! is a multiplayer game about cooking. Your goal is to run
-     a restaurant and gain points by serving meals you've cooked.
-     The game is completely free software, licenced AGPL 3.0 only.
+    Hurry Curry! is a multiplayer game about cooking. Your goal is to run
+    a restaurant and gain points by serving meals you've cooked.
+    The game is completely free software, licenced AGPL 3.0 only.
 
 grade: devel
 confinement: strict
@@ -20,8 +20,9 @@ layout:
         bind: $SNAP/usr/share/libdrm
 
 apps:
-    # bash:
-    #     command: bin/bash
+    bash:
+        command: bin/bash
+
     server:
         command: bin/hurrycurry-server --data-dir $SNAP/usr/share/hurrycurry/data
         plugs:
@@ -43,50 +44,53 @@ apps:
             - x11
 
 parts:
-    # godot-editor:
-    #     plugin: nil
-    #     source: https://github.com/godotengine/godot/releases/download/4.3-stable/godot-4.3-stable.tar.xz
-    #     build-packages:
-    #         - build-essential
-    #         - libasound2-dev
-    #         - libgl1-mesa-dev
-    #         - libglu1-mesa-dev
-    #         - libpulse-dev
-    #         - libudev-dev
-    #         - libx11-dev
-    #         - libxcursor-dev
-    #         - libxi-dev
-    #         - libxinerama-dev
-    #         - libxrandr-dev
-    #         - pkg-config
-    #         - scons
-    #     override-build: |
-    #         scons platform=x11 use_lto=yes target=editor
-    #     organize:
-    #         bin/godot.*: bin/godot
-    #     stage:
-    #         - bin/godot
+    bash:
+        plugin: nil
+        override-build: |
+            cp /usr/bin/bash $CRAFT_PART_INSTALL/bash
+        organize: { bash: bin/bash }
+        prime: [bin/bash]
 
-    godot-runtime:
+    godot-build-profile:
+        plugin: dump
+        source: .
+        source-type: local
+        organize: { "snap/godot_profile.py": godot_profile.py }
+
+    godot:
         plugin: nil
+        after: [godot-build-profile]
         source: https://github.com/godotengine/godot/releases/download/4.3-stable/godot-4.3-stable.tar.xz
         build-packages:
             - build-essential
             - libasound2-dev
+            # - libfreetype-dev
             - libgl1-mesa-dev
             - libglu1-mesa-dev
+            # - libharfbuzz-dev
+            # - libogg-dev
             - libpulse-dev
+            # - libtheora-dev
             - libudev-dev
+            # - libvorbis-dev
+            # - libvpx-dev
+            # - libwebp-dev
             - libx11-dev
             - libxcursor-dev
             - libxi-dev
             - libxinerama-dev
             - libxrandr-dev
+            # - libgraphite2-dev
+            # - zlib1g-dev
             - pkg-config
             - scons
         override-build: |
-            scons platform=linuxbsd use_lto=yes target=template_release
-        organize: { "bin/godot.*": bin/godot }
+            scons profile=$CRAFT_STAGE/godot_profile.py target=editor
+            scons profile=$CRAFT_STAGE/godot_profile.py target=template_release
+        organize:
+            "bin/godot.linuxbsd.template_release.*": bin/godot
+            "bin/godot.linuxbsd.editor.*": bin/godot-editor
+        stage: [bin/godot, bin/godot-editor]
         prime: [bin/godot]
 
     # godot-editor:
@@ -122,15 +126,14 @@ parts:
 
     client:
         plugin: nil
-        # after: [godot-editor]
+        after: [godot]
         source: https://codeberg.org/hurrycurry/hurrycurry.git
         stage-packages:
             - libglu1-mesa
-        build-snaps: [godot-4]
         build-packages: [rustup]
         override-build: |
             make client
-            GODOT_SILENCE_ROOT_WARNING=true godot-4 --headless --export-pack wasm32-unknown-unknown $CRAFT_PART_INSTALL/client.pck client/project.godot
+            GODOT_SILENCE_ROOT_WARNING=true $CRAFT_STAGE/bin/godot-editor --headless --export-pack wasm32-unknown-unknown $CRAFT_PART_INSTALL/client.pck client/project.godot
         organize: { "client.pck": usr/share/hurrycurry/client.pck }
         prime: [usr/share/hurrycurry/client.pck]
 
@@ -154,10 +157,3 @@ parts:
             cp -vr data/maps/*.yaml $CRAFT_PART_INSTALL/data/maps
         organize: { "data": usr/share/hurrycurry/data }
         prime: [usr/share/hurrycurry/data]
-
-    # bash:
-    #     plugin: nil
-    #     override-build: |
-    #         cp /usr/bin/bash $CRAFT_PART_INSTALL/bash
-    #     organize: { bash: bin/bash }
-    #     prime: [bin/bash]