Merge pull request #2532 from bryanthaboi/dev

This commit is contained in:
bryanthaboi
2026-09-28 07:51:49 -04:00
committed by GitHub
7 changed files with 18 additions and 9 deletions
+2 -2
View File
@@ -136,7 +136,7 @@ rm -f "$WORK/game-payload.zip"
tools/rom_manifest.json tools/rom_manifest_blue.json \
tools/rom_manifest_yellow.json tools/rom_manifest_gold.json \
tools/rom_manifest_silver.json tools/rom_manifest_crystal.json \
tools/rom_manifest_firered.json tools/rom_manifest_leafgreen.json \
tools/rom_manifest_firered.json tools/rom_manifest_leafgreen.json tools/rom_manifest_emerald.json \
-x '*.DS_Store' 'data/generated/*' 'assets/generated/*')
unzip -Z1 "$WORK/game-payload.zip" > "$WORK/payload-listing.txt"
if grep -Eq '^(data|assets)/generated/[^/]+|^(data|assets)/generated/.+/' "$WORK/payload-listing.txt"; then
@@ -144,7 +144,7 @@ if grep -Eq '^(data|assets)/generated/[^/]+|^(data|assets)/generated/.+/' "$WORK
fi
for manifest in rom_manifest.json rom_manifest_blue.json rom_manifest_yellow.json \
rom_manifest_gold.json rom_manifest_silver.json rom_manifest_crystal.json \
rom_manifest_firered.json rom_manifest_leafgreen.json; do
rom_manifest_firered.json rom_manifest_leafgreen.json rom_manifest_emerald.json; do
grep -qxF "tools/$manifest" "$WORK/payload-listing.txt" \
|| fail "payload is missing tools/$manifest"
done
+2 -2
View File
@@ -94,7 +94,7 @@ rm -f "$WORK/game-payload.zip"
tools/rom_manifest.json tools/rom_manifest_blue.json \
tools/rom_manifest_yellow.json tools/rom_manifest_gold.json \
tools/rom_manifest_silver.json tools/rom_manifest_crystal.json \
tools/rom_manifest_firered.json tools/rom_manifest_leafgreen.json \
tools/rom_manifest_firered.json tools/rom_manifest_leafgreen.json tools/rom_manifest_emerald.json \
-x '*.DS_Store' 'data/generated/*' 'assets/generated/*')
unzip -Z1 "$WORK/game-payload.zip" > "$WORK/payload-listing.txt"
if grep -Eq '^(data|assets)/generated/[^/]+|^(data|assets)/generated/.+/' "$WORK/payload-listing.txt"; then
@@ -102,7 +102,7 @@ if grep -Eq '^(data|assets)/generated/[^/]+|^(data|assets)/generated/.+/' "$WORK
fi
for manifest in rom_manifest.json rom_manifest_blue.json rom_manifest_yellow.json \
rom_manifest_gold.json rom_manifest_silver.json rom_manifest_crystal.json \
rom_manifest_firered.json rom_manifest_leafgreen.json; do
rom_manifest_firered.json rom_manifest_leafgreen.json rom_manifest_emerald.json; do
grep -qxF "tools/$manifest" "$WORK/payload-listing.txt" \
|| fail "payload is missing tools/$manifest"
done
+2 -2
View File
@@ -80,7 +80,7 @@ else
tools/rom_manifest.json tools/rom_manifest_blue.json \
tools/rom_manifest_yellow.json tools/rom_manifest_gold.json \
tools/rom_manifest_silver.json tools/rom_manifest_crystal.json \
tools/rom_manifest_firered.json tools/rom_manifest_leafgreen.json \
tools/rom_manifest_firered.json tools/rom_manifest_leafgreen.json tools/rom_manifest_emerald.json \
-x '*.DS_Store' 'data/generated/*' 'assets/generated/*')
fi
# Materialize the listing once and grep the file: piping unzip straight into
@@ -104,7 +104,7 @@ for required in tools/save-editor/App.lua tools/save-editor/Kit.lua \
tools/rom_manifest_yellow.json tools/rom_manifest_gold.json \
tools/rom_manifest_silver.json \
tools/rom_manifest_crystal.json \
tools/rom_manifest_firered.json tools/rom_manifest_leafgreen.json; do
tools/rom_manifest_firered.json tools/rom_manifest_leafgreen.json tools/rom_manifest_emerald.json; do
grep -qxF "$required" "$LOVE_LISTING" \
|| fail "game.love is missing $required"
done
+6 -1
View File
@@ -449,6 +449,7 @@ pack_game_love() {
ensure_crystal_manifest
ensure_firered_manifest
[ -f "$ROOT/tools/rom_manifest_leafgreen.json" ] || fail "LeafGreen import manifest is missing"
[ -f "$ROOT/tools/rom_manifest_emerald.json" ] || fail "Emerald import manifest is missing"
mkdir -p "$EMBED_ASSETS"
rm -f "$LOVE_FILE"
# tools/save-editor ships with the app: the launcher's Edit button on a save
@@ -464,7 +465,7 @@ pack_game_love() {
tools/rom_manifest.json tools/rom_manifest_blue.json \
tools/rom_manifest_yellow.json tools/rom_manifest_gold.json \
tools/rom_manifest_silver.json tools/rom_manifest_crystal.json \
tools/rom_manifest_firered.json tools/rom_manifest_leafgreen.json \
tools/rom_manifest_firered.json tools/rom_manifest_leafgreen.json tools/rom_manifest_emerald.json \
-x '*.DS_Store' -x '*/.git/*' -x '*/.DS_Store' \
-x 'data/generated/*' -x 'assets/generated/*')
# List once and match against the captured text: piping unzip straight into
@@ -492,6 +493,10 @@ pack_game_love() {
|| fail "game.love is missing the Crystal ROM import manifest"
grep -qx "$FIRERED_MANIFEST_RELATIVE" <<< "$archive_entries" \
|| fail "game.love is missing the FireRed ROM import manifest"
grep -qx 'tools/rom_manifest_leafgreen.json' <<< "$archive_entries" \
|| fail "game.love is missing the LeafGreen ROM import manifest"
grep -qx 'tools/rom_manifest_emerald.json' <<< "$archive_entries" \
|| fail "game.love is missing the Emerald ROM import manifest"
# This gate exists because the launcher's UI toolkit once lived outside
# src/ (libs/flexlove) and was added to scripts/build.sh's payload and to
# no other packager, so Android and iOS built an APK/IPA whose launcher
+2
View File
@@ -382,6 +382,8 @@ grep -qxF "tools/rom_manifest_firered.json" "$WORK/love-listing.txt" \
|| fail "game.love is missing tools/rom_manifest_firered.json"
grep -qxF "tools/rom_manifest_leafgreen.json" "$WORK/love-listing.txt" \
|| fail "game.love is missing tools/rom_manifest_leafgreen.json"
grep -qxF "tools/rom_manifest_emerald.json" "$WORK/love-listing.txt" \
|| fail "game.love is missing tools/rom_manifest_emerald.json"
# The .desktop's Icon= resolves against the AppDir root by basename, and
# .DirIcon is what appimaged and file-manager thumbnailers read.
cp "$IN/icon.png" "$APPDIR/$APP_NAME.png"
@@ -177,5 +177,7 @@ grep -qxF "tools/rom_manifest_firered.json" "$temp_dir/love-listing.txt" \
|| fail "shared payload is missing tools/rom_manifest_firered.json"
grep -qxF "tools/rom_manifest_leafgreen.json" "$temp_dir/love-listing.txt" \
|| fail "shared payload is missing tools/rom_manifest_leafgreen.json"
grep -qxF "tools/rom_manifest_emerald.json" "$temp_dir/love-listing.txt" \
|| fail "shared payload is missing tools/rom_manifest_emerald.json"
say "Linux arm64 self-test passed"
+2 -2
View File
@@ -51,7 +51,7 @@ rm -f "$OUTPUT"
tools/rom_manifest.json tools/rom_manifest_blue.json \
tools/rom_manifest_yellow.json tools/rom_manifest_gold.json \
tools/rom_manifest_silver.json tools/rom_manifest_crystal.json \
tools/rom_manifest_firered.json tools/rom_manifest_leafgreen.json \
tools/rom_manifest_firered.json tools/rom_manifest_leafgreen.json tools/rom_manifest_emerald.json \
-x '*.DS_Store' 'data/generated/*' 'assets/generated/*')
if [ -f "$ROOT/PATCH_NOTES.md" ]; then
(cd "$ROOT" && zip -q "$OUTPUT" PATCH_NOTES.md)
@@ -98,7 +98,7 @@ for required in tools/save-editor/App.lua tools/save-editor/Kit.lua \
tools/rom_manifest_yellow.json tools/rom_manifest_gold.json \
tools/rom_manifest_silver.json \
tools/rom_manifest_crystal.json \
tools/rom_manifest_firered.json tools/rom_manifest_leafgreen.json \
tools/rom_manifest_firered.json tools/rom_manifest_leafgreen.json tools/rom_manifest_emerald.json \
src/ui/kit/Kit.lua \
src/import/LauncherView.lua; do
grep -qxF "$required" "$LISTING" \