Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bundle mir_flutter_app into mir-test-tools snap #76

Merged
merged 2 commits into from
May 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions mir-flutter-app/mir_flutter_app.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#!/bin/bash
${SNAP}/mir_flutter_app&
pid=$!
trap 'kill -s SIGTERM $pid && exit 0' SIGTERM
wait $pid
exit -1
24 changes: 23 additions & 1 deletion snap/snapcraft.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,14 @@ apps:
environment:
PATH: $SNAP/bin/:$SNAP/usr/bin/:${SNAP}/usr/games:${PATH}

# Reference application for Mir window semantics
mir-flutter-app:
command-chain:
- bin/server-wrapper
- bin/wrapper
- bin/graphics-core22-wrapper
command: usr/bin/mir_demo_server --test-client $SNAP/mir_flutter_app.sh --test-timeout 120

performance-test:
command-chain:
- bin/performance-env.sh
Expand Down Expand Up @@ -201,6 +209,20 @@ parts:
"/usr/lib/$CRAFT_ARCH_TRIPLET/gdk-pixbuf-2.0/gdk-pixbuf-query-loaders" > "$CRAFT_PRIME/usr/lib/$CRAFT_ARCH_TRIPLET/gdk-pixbuf-2.0/2.10.0/loaders.cache"
sed s!$CRAFT_PRIME!!g --in-place "$CRAFT_PRIME/usr/lib/$CRAFT_ARCH_TRIPLET/gdk-pixbuf-2.0/2.10.0/loaders.cache"

mir-flutter-app:
plugin: flutter
flutter-target: lib/main.dart
source: https://github.com/hbatagelo/mir_flutter_app.git
build-packages: [libgtk-3-dev, ninja-build]
stage-packages:
- fonts-ubuntu
- libgtk-3-0
- libgl1

mir-flutter-app-launcher:
plugin: dump
source: mir-flutter-app

performance:
plugin: dump
source: performance
Expand All @@ -221,7 +243,7 @@ parts:
- libbz2-1.0

graphics-core22:
after: [mir-test-tools, icons, sdl2-apps, qmldemo, gtk3app, performance, wrapper, xwayland]
after: [mir-test-tools, icons, sdl2-apps, qmldemo, gtk3app, mir-flutter-app, performance, wrapper, xwayland]
source: https://github.com/MirServer/graphics-core22.git
plugin: dump
override-prime: |
Expand Down
Loading