enricobuehler
bfd8c7be93
ci / rust (push) Has been cancelled
The same app now runs on tvOS (target Punktfunk-tvOS, bundle io.unom.punktfunk.tvos), validated live against the box: vkcube at 1280x720@60, 60 fps in the Apple TV 4K simulator, glass HUD with a focusable Disconnect button. - PunktfunkCore.xcframework grows tvOS device + universal-simulator slices. These are TIER-3 Rust targets (no prebuilt std): BUILD_TVOS=1 builds them with nightly and -Zbuild-std from rust-src — the full quic stack (quinn/rustls-ring/tokio) compiles for tvOS unchanged. - The UIKit stream view covers iOS AND tvOS, with pointer interaction, pointer lock, touch forwarding and InputCapture gated to iOS — tvOS is view-only until gamepad capture lands (the natural tvOS input). - SessionAudio on tvOS: .playback session, no mic (no app-accessible microphone). - App chrome gates: keyboardShortcut/textSelection/controlSize/statusBarHidden are iOS/macOS-only; host cards use the focus-native .card button style on tvOS; the Audio settings section hides (system-routed); mode seeding works from the TV screen (1920x1080@60). - Package platforms += .tvOS(.v17); new Xcode target + shared scheme (TARGETED_DEVICE_FAMILY 3, local-network usage description included). Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
97 lines
4.7 KiB
Bash
97 lines
4.7 KiB
Bash
#!/usr/bin/env bash
|
|
# Build PunktfunkCore.xcframework for the Apple clients — run ON A MAC with Xcode + rustup.
|
|
#
|
|
# rustup target add aarch64-apple-darwin x86_64-apple-darwin # + aarch64-apple-ios for iOS
|
|
# bash scripts/build-xcframework.sh
|
|
#
|
|
# Output: clients/apple/PunktfunkCore.xcframework (consumed by clients/apple/Package.swift).
|
|
# The library is built WITH the `quic` feature (the punktfunk/1 connection API), so the bundled
|
|
# header gets PUNKTFUNK_FEATURE_QUIC pre-defined — Swift sees punktfunk_connect & co. unconditionally.
|
|
set -euo pipefail
|
|
cd "$(dirname "$0")/.."
|
|
|
|
TARGETS_MAC=(aarch64-apple-darwin x86_64-apple-darwin)
|
|
BUILD_IOS="${BUILD_IOS:-0}" # BUILD_IOS=1 adds iOS device + simulator slices (rustup targets aarch64-apple-ios{,-sim})
|
|
BUILD_TVOS="${BUILD_TVOS:-0}" # BUILD_TVOS=1 adds tvOS slices — TIER-3 Rust targets: needs `rustup toolchain install nightly` + `rustup component add rust-src --toolchain nightly`
|
|
|
|
# Deployment targets must match Package.swift's platforms, or every consumer link emits
|
|
# "object file was built for newer macOS version" warnings.
|
|
for t in "${TARGETS_MAC[@]}"; do
|
|
MACOSX_DEPLOYMENT_TARGET=14.0 cargo build --release -p punktfunk-core --features quic --target "$t"
|
|
done
|
|
if [[ "$BUILD_IOS" == "1" ]]; then
|
|
IPHONEOS_DEPLOYMENT_TARGET=17.0 cargo build --release -p punktfunk-core --features quic --target aarch64-apple-ios
|
|
IPHONEOS_DEPLOYMENT_TARGET=17.0 cargo build --release -p punktfunk-core --features quic --target aarch64-apple-ios-sim
|
|
IPHONEOS_DEPLOYMENT_TARGET=17.0 cargo build --release -p punktfunk-core --features quic --target x86_64-apple-ios
|
|
fi
|
|
if [[ "$BUILD_TVOS" == "1" ]]; then
|
|
# Tier-3 targets: no prebuilt std — nightly + -Zbuild-std compiles it from rust-src.
|
|
TVOS_DEPLOYMENT_TARGET=17.0 cargo +nightly build --release -p punktfunk-core --features quic \
|
|
-Z build-std=std,panic_abort --target aarch64-apple-tvos
|
|
TVOS_DEPLOYMENT_TARGET=17.0 cargo +nightly build --release -p punktfunk-core --features quic \
|
|
-Z build-std=std,panic_abort --target aarch64-apple-tvos-sim
|
|
TVOS_DEPLOYMENT_TARGET=17.0 cargo +nightly build --release -p punktfunk-core --features quic \
|
|
-Z build-std=std,panic_abort --target x86_64-apple-tvos
|
|
fi
|
|
|
|
STAGE="$(mktemp -d)"
|
|
trap 'rm -rf "$STAGE"' EXIT
|
|
|
|
# Universal macOS static lib.
|
|
mkdir -p "$STAGE/macos"
|
|
lipo -create \
|
|
target/aarch64-apple-darwin/release/libpunktfunk_core.a \
|
|
target/x86_64-apple-darwin/release/libpunktfunk_core.a \
|
|
-output "$STAGE/macos/libpunktfunk_core.a"
|
|
|
|
# Headers dir: the generated C header (with the quic API force-enabled) + a modulemap so
|
|
# Swift can `import PunktfunkCore`.
|
|
mkdir -p "$STAGE/include"
|
|
{
|
|
echo "#define PUNKTFUNK_FEATURE_QUIC 1"
|
|
cat include/punktfunk_core.h
|
|
} > "$STAGE/include/punktfunk_core.h"
|
|
cat > "$STAGE/include/module.modulemap" <<'EOF'
|
|
module PunktfunkCore {
|
|
header "punktfunk_core.h"
|
|
export *
|
|
}
|
|
EOF
|
|
|
|
ARGS=(-library "$STAGE/macos/libpunktfunk_core.a" -headers "$STAGE/include")
|
|
if [[ "$BUILD_IOS" == "1" ]]; then
|
|
# Universal simulator lib (arm64 Macs run arm64 sims, but generic builds link x86_64 too).
|
|
mkdir -p "$STAGE/iossim"
|
|
lipo -create \
|
|
target/aarch64-apple-ios-sim/release/libpunktfunk_core.a \
|
|
target/x86_64-apple-ios/release/libpunktfunk_core.a \
|
|
-output "$STAGE/iossim/libpunktfunk_core.a"
|
|
ARGS+=(-library target/aarch64-apple-ios/release/libpunktfunk_core.a -headers "$STAGE/include")
|
|
ARGS+=(-library "$STAGE/iossim/libpunktfunk_core.a" -headers "$STAGE/include")
|
|
fi
|
|
if [[ "$BUILD_TVOS" == "1" ]]; then
|
|
mkdir -p "$STAGE/tvossim"
|
|
lipo -create \
|
|
target/aarch64-apple-tvos-sim/release/libpunktfunk_core.a \
|
|
target/x86_64-apple-tvos/release/libpunktfunk_core.a \
|
|
-output "$STAGE/tvossim/libpunktfunk_core.a"
|
|
ARGS+=(-library target/aarch64-apple-tvos/release/libpunktfunk_core.a -headers "$STAGE/include")
|
|
ARGS+=(-library "$STAGE/tvossim/libpunktfunk_core.a" -headers "$STAGE/include")
|
|
fi
|
|
|
|
# Cargo does NOT fingerprint MACOSX_DEPLOYMENT_TARGET — units cached from a build without
|
|
# it keep their old minos forever. Refuse to ship anything newer than the package floor
|
|
# (objects BELOW it, e.g. rustup's precompiled std at 11.0, are fine and unavoidable).
|
|
for obj in "$STAGE"/macos/libpunktfunk_core.a; do
|
|
bad=$(otool -l "$obj" 2>/dev/null | awk '/minos/ {print $2}' | sort -uV | awk -F. '$1 > 14' | head -1)
|
|
if [[ -n "$bad" ]]; then
|
|
echo "ERROR: $obj contains objects built for macOS $bad (> 14.0)." >&2
|
|
echo "Stale cache — rm -rf target/{aarch64,x86_64}-apple-darwin and rebuild." >&2
|
|
exit 1
|
|
fi
|
|
done
|
|
|
|
rm -rf clients/apple/PunktfunkCore.xcframework
|
|
xcodebuild -create-xcframework "${ARGS[@]}" -output clients/apple/PunktfunkCore.xcframework
|
|
echo "OK: clients/apple/PunktfunkCore.xcframework"
|