mirror of
https://git.triforceproject.com/triforce/source
synced 2026-11-19 16:20:01 -04:00
Triforce v0.3.4
The slowdown in fights and the controller whose buttons stopped arriving are fixed; the checks' file names; groundwork for Linux. Co-Authored-By: Claude Fable 5.2 <noreply@anthropic.com>
This commit is contained in:
@@ -3,7 +3,7 @@
|
||||
# nothing made from it is in it: the game is built from the player's own copy, as on Windows.
|
||||
#
|
||||
# scripts/linux/deps.sh (first: the compiler, Python, FFmpeg, SDL2, headers into build-linux/deps)
|
||||
# scripts/linux/appimage.sh -> build-linux/Hookshot-<version>-x86_64.AppImage
|
||||
# scripts/linux/appimage.sh -> build-linux/Triforce-<version>-x86_64.AppImage
|
||||
# The same image builds the game and, with --play, starts the one it saved.
|
||||
#
|
||||
# Built on the oldest system it is for (CI: Ubuntu 22.04): the sysroot it carries is that system's C library, so the
|
||||
@@ -21,10 +21,10 @@ PY=$DEPS/python/bin/python3
|
||||
|
||||
# ---- the Vulkan back end, built here once (it needs no game) ----
|
||||
VKW=$B/vk-work
|
||||
rm -rf "$VKW/sa/build/hookshot_vk.so"
|
||||
rm -rf "$VKW/sa/build/triforce_vk.so"
|
||||
OOT_WORK=$VKW RX_MARCH=x86-64-v3 RX_VK_ONLY=1 RX_RELEASE=1 "$PY" -I nx2/build.py --standalone --jobs "${JOBS:-$(nproc)}"
|
||||
VK=$VKW/sa/build/hookshot_vk.so
|
||||
[ -f "$VK" ] || { echo "hookshot_vk.so was not built"; exit 1; }
|
||||
VK=$VKW/sa/build/triforce_vk.so
|
||||
[ -f "$VK" ] || { echo "triforce_vk.so was not built"; exit 1; }
|
||||
|
||||
# ---- the tools' native helpers, built now: the AppImage is read-only. a64emit with its C++ runtime inside (the one this system
|
||||
# builds with is newer than older systems have), and the stamp build_emit.py checks, so it is not built again ----
|
||||
@@ -142,14 +142,14 @@ cp assets/hookshot.png "$APPDIR/hookshot.png"
|
||||
mkdir -p "$APPDIR/usr/share/icons/hicolor/256x256/apps"
|
||||
cp assets/hookshot.png "$APPDIR/usr/share/icons/hicolor/256x256/apps/hookshot.png"
|
||||
|
||||
# (the update list, beside AppRun and not inside a hashed part: hookshot-linux.txt names each part's checksum)
|
||||
# (the update list, beside AppRun and not inside a hashed part: triforce-linux.txt names each part's checksum)
|
||||
# (the parts are served from the linux-parts release of the repository this is built in, where
|
||||
# scripts/linux/publish_parts.sh uploads them: without --base the list named NotRexed/Hookshot's release, which a fork's
|
||||
# CI does not upload to, so a fork's update list named parts that were not there)
|
||||
python3 scripts/linux/make_parts.py "$APPDIR" "$VERSION" "$B/parts" \
|
||||
--base "https://github.com/${GITHUB_REPOSITORY:-NotRexed/Hookshot}/releases/download/linux-parts"
|
||||
|
||||
OUT=$B/Hookshot-$VERSION-x86_64.AppImage
|
||||
OUT=$B/Triforce-$VERSION-x86_64.AppImage
|
||||
rm -f "$OUT"
|
||||
ARCH=x86_64 APPIMAGE_EXTRACT_AND_RUN=1 "$DEPS/appimagetool" --runtime-file "$DEPS/runtime-x86_64" --comp zstd "$APPDIR" "$OUT"
|
||||
echo "$OUT: $(du -h "$OUT" | cut -f1)"
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
# made nx2/build.py write the menu's fonts from third_party/fonts at every build start, the AppImage does not carry that
|
||||
# folder, and every Linux build stopped at LibertinusSans-Regular.ttf while CI stayed green (2026-11-10, #1567).
|
||||
#
|
||||
# scripts/linux/check_player_build.sh [<Hookshot-...-x86_64.AppImage>] (default: the newest in build-linux/)
|
||||
# scripts/linux/check_player_build.sh [<Triforce-...-x86_64.AppImage>] (default: the newest in build-linux/)
|
||||
#
|
||||
# The image is extracted, as its runtime does, and run with AppRun's own environment (the AppImage's Python, compiler,
|
||||
# sysroot, FFmpeg and the prebuilt Vulkan back end, HOOKSHOT_VK_PREBUILT) in an otherwise empty one, so nothing of the
|
||||
@@ -15,7 +15,7 @@
|
||||
# Neither may write into the image's tree: on a player's PC it is read-only.
|
||||
set -euo pipefail
|
||||
cd "$(dirname "$0")/../.."
|
||||
IMAGE=${1:-$(ls -t build-linux/Hookshot-*-x86_64.AppImage 2>/dev/null | head -1 || true)}
|
||||
IMAGE=${1:-$(ls -t build-linux/Triforce-*-x86_64.AppImage 2>/dev/null | head -1 || true)}
|
||||
[ -n "$IMAGE" ] && [ -f "$IMAGE" ] || { echo "no AppImage to check (scripts/linux/appimage.sh makes one)"; exit 1; }
|
||||
IMAGE=$(readlink -f "$IMAGE")
|
||||
TMP=$(mktemp -d)
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
Each directory that changes on its own is one zip: the tools (every release), Python, clang, FFmpeg, the sysroot, and
|
||||
the two libraries beside them. A zip is deterministic, so a directory whose files did not change has the same SHA-256
|
||||
next time and the builder copies the one it already has. The zips are uploaded to the linux-parts release; the version's
|
||||
own release carries hookshot-linux.txt, which names them.
|
||||
own release carries triforce-linux.txt, which names them.
|
||||
|
||||
The list is not inside a zip (it names the zips' checksums).
|
||||
"""
|
||||
@@ -106,10 +106,10 @@ def main():
|
||||
lines.append("tree" if files is None else "\n".join("file %s" % name for name in files))
|
||||
print("%-32s %5d MB %s" % (dest, size >> 20, digest[:16]), flush=True)
|
||||
text = "\n".join(lines) + "\n"
|
||||
with open(os.path.join(args.out, "hookshot-linux.txt"), "w", encoding="utf-8", newline="\n") as handle:
|
||||
with open(os.path.join(args.out, "triforce-linux.txt"), "w", encoding="utf-8", newline="\n") as handle:
|
||||
handle.write(text)
|
||||
# (beside AppRun, not inside a hashed part: the list names those checksums)
|
||||
with open(os.path.join(root, "hookshot-linux.txt"), "w", encoding="utf-8", newline="\n") as handle:
|
||||
with open(os.path.join(root, "triforce-linux.txt"), "w", encoding="utf-8", newline="\n") as handle:
|
||||
handle.write(text)
|
||||
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#!/bin/bash
|
||||
# Upload the Linux builder's parts (scripts/linux/make_parts.py) to the linux-parts release, which is not "latest".
|
||||
# A zip whose name is already there is left (its checksum is in the name). hookshot-linux.txt itself goes on the
|
||||
# A zip whose name is already there is left (its checksum is in the name). triforce-linux.txt itself goes on the
|
||||
# version release, with the AppImage. Run from CI on a tag, with GH_TOKEN and GITHUB_REPOSITORY.
|
||||
set -euo pipefail
|
||||
ROOT=$(cd "$(dirname "$0")/../.." && pwd)
|
||||
|
||||
Reference in New Issue
Block a user