feat: Native Builds für Linux, Windows, macOS und Android
- Web-Export, Web-Preset und Web-Doku entfernt; Zielplattformen sind nur noch Desktop und Android - Export-Presets mit vollständigen Optionssätzen für Linux, Windows, macOS (universal, ad-hoc) und Android (arm64-v8a, minSdk 24, targetSdk 36, Landscape, Immersive Mode, INTERNET-Permission) - tools/export_linux.sh, export_windows.sh, export_macos.sh, export_android.sh mit gemeinsamen Helfern und tools/verify_apk.sh - tools/setup_android.sh richtet JDK 17, Android SDK, Godot-4.7.2- Templates und Debug-Keystore ein und trägt die Pfade in die Editor-Settings ein (mit Backup) - Eigenes App-Icon (SVG) inklusive Android-Launcher-Icons - ETC2/ASTC-Import für Android aktiviert, Tests/Prototyp/Addon aus dem Export ausgeschlossen - docs/builds.md: Bauen, Installieren per adb, Datenpfade, Release-Hinweise
This commit is contained in:
parent
d44a4e1e2f
commit
c4488a8eb5
26 changed files with 1007 additions and 172 deletions
41
tools/_export_common.sh
Normal file
41
tools/_export_common.sh
Normal file
|
|
@ -0,0 +1,41 @@
|
|||
#!/usr/bin/env bash
|
||||
# Gemeinsame Helfer für die Export-Skripte. Wird gesourct, nicht direkt
|
||||
# ausgeführt.
|
||||
|
||||
REPO_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
|
||||
PROJECT_DIR="$REPO_ROOT/rinkplanner"
|
||||
GODOT="${GODOT:-/opt/godot/Godot_v4.7.2-stable_linux.x86_64}"
|
||||
|
||||
require_godot() {
|
||||
if [[ ! -x "$GODOT" ]]; then
|
||||
echo "Godot-Binary nicht gefunden: $GODOT" >&2
|
||||
echo "Setze GODOT=/pfad/zu/godot" >&2
|
||||
exit 1
|
||||
fi
|
||||
}
|
||||
|
||||
# build_preset <preset> <release|debug> <relativer Zielpfad>
|
||||
build_preset() {
|
||||
local preset="$1" mode="$2" relative="$3"
|
||||
local out="$REPO_ROOT/$relative"
|
||||
|
||||
require_godot
|
||||
mkdir -p "$(dirname "$out")"
|
||||
|
||||
"$GODOT" --headless --path "$PROJECT_DIR" --import >/dev/null
|
||||
|
||||
if [[ "$mode" == "debug" ]]; then
|
||||
"$GODOT" --headless --path "$PROJECT_DIR" \
|
||||
--export-debug "$preset" "$out"
|
||||
else
|
||||
"$GODOT" --headless --path "$PROJECT_DIR" \
|
||||
--export-release "$preset" "$out"
|
||||
fi
|
||||
|
||||
if [[ ! -e "$out" ]]; then
|
||||
echo "Export fehlgeschlagen: $out" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo "Build: $out"
|
||||
}
|
||||
43
tools/export_android.sh
Executable file
43
tools/export_android.sh
Executable file
|
|
@ -0,0 +1,43 @@
|
|||
#!/usr/bin/env bash
|
||||
# Baut das Android-APK (arm64-v8a) nach build/android/.
|
||||
#
|
||||
# ./tools/export_android.sh # Debug-APK (Debug-Keystore)
|
||||
# ./tools/export_android.sh release # Release-APK (Release-Keystore nötig)
|
||||
# ./tools/export_android.sh debug --install
|
||||
#
|
||||
# Voraussetzung: ./tools/setup_android.sh wurde einmal ausgeführt.
|
||||
set -euo pipefail
|
||||
source "$(dirname "${BASH_SOURCE[0]}")/_export_common.sh"
|
||||
|
||||
MODE="${1:-debug}"
|
||||
INSTALL="${2:-}"
|
||||
SDK_DIR="${SDK_DIR:-$HOME/Android/Sdk}"
|
||||
|
||||
case "$MODE" in
|
||||
debug) relative="build/android/rinkplanner-debug.apk" ;;
|
||||
release) relative="build/android/rinkplanner-release.apk" ;;
|
||||
*) echo "Unbekannter Modus: $MODE (debug|release)" >&2; exit 1 ;;
|
||||
esac
|
||||
|
||||
if [[ ! -d "$SDK_DIR/build-tools" ]]; then
|
||||
echo "Android SDK nicht gefunden unter $SDK_DIR" >&2
|
||||
echo "Bitte zuerst ./tools/setup_android.sh ausführen." >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
build_preset "Android" "$MODE" "$relative"
|
||||
|
||||
APK="$REPO_ROOT/$relative"
|
||||
ADB="$SDK_DIR/platform-tools/adb"
|
||||
|
||||
if [[ "$INSTALL" == "--install" ]]; then
|
||||
if [[ ! -x "$ADB" ]]; then
|
||||
echo "adb nicht gefunden: $ADB" >&2
|
||||
exit 1
|
||||
fi
|
||||
"$ADB" install -r "$APK"
|
||||
echo "Auf dem Tablet gestartet werden kann es über das App-Symbol 'Rinkplanner'."
|
||||
else
|
||||
echo "Installieren mit:"
|
||||
echo " $ADB install -r \"$APK\""
|
||||
fi
|
||||
6
tools/export_linux.sh
Executable file
6
tools/export_linux.sh
Executable file
|
|
@ -0,0 +1,6 @@
|
|||
#!/usr/bin/env bash
|
||||
# Baut das Linux-Desktop-Binary (x86_64, PCK eingebettet) nach build/linux/.
|
||||
set -euo pipefail
|
||||
source "$(dirname "${BASH_SOURCE[0]}")/_export_common.sh"
|
||||
build_preset "Linux" release "build/linux/rinkplanner.x86_64"
|
||||
chmod +x "$REPO_ROOT/build/linux/rinkplanner.x86_64" 2>/dev/null || true
|
||||
7
tools/export_macos.sh
Executable file
7
tools/export_macos.sh
Executable file
|
|
@ -0,0 +1,7 @@
|
|||
#!/usr/bin/env bash
|
||||
# Baut das macOS-Bundle (universal, ad-hoc signiert) als ZIP nach build/macos/.
|
||||
# Hinweis: Für eine verteilbare App ist zusätzlich Signierung/Notarisierung
|
||||
# auf einem Mac nötig.
|
||||
set -euo pipefail
|
||||
source "$(dirname "${BASH_SOURCE[0]}")/_export_common.sh"
|
||||
build_preset "macOS" release "build/macos/rinkplanner.zip"
|
||||
|
|
@ -1,33 +0,0 @@
|
|||
#!/usr/bin/env bash
|
||||
set -euo pipefail
|
||||
|
||||
REPO_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
|
||||
PROJECT_DIR="$REPO_ROOT/rinkplanner"
|
||||
BUILD_DIR="$REPO_ROOT/build/web"
|
||||
GODOT="${GODOT:-/opt/godot/Godot_v4.7.2-stable_linux.x86_64}"
|
||||
|
||||
if [[ ! -x "$GODOT" ]]; then
|
||||
echo "Godot binary not found: $GODOT" >&2
|
||||
echo "Set GODOT=/path/to/godot" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
"$GODOT" --headless --path "$PROJECT_DIR" --import >/dev/null
|
||||
mkdir -p "$BUILD_DIR"
|
||||
|
||||
if ! "$GODOT" --headless --path "$PROJECT_DIR" \
|
||||
--export-release "Web" "$BUILD_DIR/index.html"; then
|
||||
echo "Web export failed." >&2
|
||||
echo "Check that the Web export templates for this Godot version are installed" >&2
|
||||
echo "(Editor -> Manage Export Templates)." >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [[ ! -f "$BUILD_DIR/index.html" ]]; then
|
||||
echo "Web export produced no index.html." >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo "Web build: $BUILD_DIR/index.html"
|
||||
echo "Serve it with:"
|
||||
echo " python3 -m http.server 8000 --directory \"$BUILD_DIR\""
|
||||
5
tools/export_windows.sh
Executable file
5
tools/export_windows.sh
Executable file
|
|
@ -0,0 +1,5 @@
|
|||
#!/usr/bin/env bash
|
||||
# Baut die Windows-Desktop-EXE (x86_64, PCK eingebettet) nach build/windows/.
|
||||
set -euo pipefail
|
||||
source "$(dirname "${BASH_SOURCE[0]}")/_export_common.sh"
|
||||
build_preset "Windows" release "build/windows/rinkplanner.exe"
|
||||
172
tools/setup_android.sh
Executable file
172
tools/setup_android.sh
Executable file
|
|
@ -0,0 +1,172 @@
|
|||
#!/usr/bin/env bash
|
||||
# Richtet die Android-Toolchain für Godot ein (JDK, Android SDK, Templates,
|
||||
# Debug-Keystore) und trägt die Pfade in die Godot-Editor-Settings ein.
|
||||
#
|
||||
# Aufruf:
|
||||
# ./tools/setup_android.sh
|
||||
#
|
||||
# Das Skript ist idempotent: bereits vorhandene Teile werden übersprungen.
|
||||
# Es lädt ca. 1,6 GB und braucht ca. 3 GB Plattenplatz.
|
||||
#
|
||||
# Getestete Versionen:
|
||||
# Godot 4.7.2, Temurin JDK 17, Android command-line tools 12.0,
|
||||
# build-tools 36.0.0/35.0.0, platforms;android-36
|
||||
set -euo pipefail
|
||||
|
||||
GODOT_VERSION="${GODOT_VERSION:-4.7.2}"
|
||||
TEMPLATE_VERSION="${GODOT_VERSION}.stable"
|
||||
|
||||
JDK_DIR="${JDK_DIR:-$HOME/.jdks/temurin-17}"
|
||||
SDK_DIR="${SDK_DIR:-$HOME/Android/Sdk}"
|
||||
TPL_DIR="${TPL_DIR:-$HOME/.local/share/godot/export_templates/$TEMPLATE_VERSION}"
|
||||
KEYSTORE="${KEYSTORE:-$HOME/.local/share/godot/keystores/debug.keystore}"
|
||||
DOWNLOAD_DIR="${DOWNLOAD_DIR:-$HOME/.cache/rinkplanner-setup}"
|
||||
|
||||
JDK_URL="https://api.adoptium.net/v3/binary/latest/17/ga/linux/x64/jdk/hotspot/normal/eclipse"
|
||||
CMDLINE_TOOLS_URL="https://dl.google.com/android/repository/commandlinetools-linux-11076708_latest.zip"
|
||||
TEMPLATES_URL="https://github.com/godotengine/godot/releases/download/${GODOT_VERSION}-stable/Godot_v${GODOT_VERSION}-stable_export_templates.tpz"
|
||||
|
||||
BUILD_TOOLS_VERSIONS=("36.0.0" "35.0.0")
|
||||
|
||||
log() { printf '\n==> %s\n' "$*"; }
|
||||
need() { command -v "$1" >/dev/null 2>&1 || { echo "Fehlt: $1" >&2; exit 1; }; }
|
||||
|
||||
need curl
|
||||
need unzip
|
||||
need tar
|
||||
need python3
|
||||
|
||||
mkdir -p "$DOWNLOAD_DIR"
|
||||
|
||||
download() {
|
||||
local url="$1" target="$2"
|
||||
if [[ -s "$target" ]]; then
|
||||
echo "vorhanden: $target"
|
||||
return
|
||||
fi
|
||||
echo "lade: $url"
|
||||
curl -fL --retry 3 --progress-bar -o "$target.part" "$url"
|
||||
mv "$target.part" "$target"
|
||||
}
|
||||
|
||||
# --- JDK ---------------------------------------------------------------------
|
||||
if [[ -x "$JDK_DIR/bin/java" ]]; then
|
||||
log "JDK vorhanden: $JDK_DIR"
|
||||
else
|
||||
log "Installiere Temurin JDK 17 nach $JDK_DIR"
|
||||
archive="$DOWNLOAD_DIR/temurin17.tar.gz"
|
||||
download "$JDK_URL" "$archive"
|
||||
tmp="$(mktemp -d)"
|
||||
tar -xzf "$archive" -C "$tmp"
|
||||
rm -rf "$JDK_DIR"
|
||||
mkdir -p "$(dirname "$JDK_DIR")"
|
||||
mv "$tmp"/* "$JDK_DIR"
|
||||
rm -rf "$tmp"
|
||||
fi
|
||||
"$JDK_DIR/bin/java" -version
|
||||
|
||||
# --- Android SDK -------------------------------------------------------------
|
||||
if [[ -x "$SDK_DIR/platform-tools/adb" ]]; then
|
||||
log "Android SDK vorhanden: $SDK_DIR"
|
||||
else
|
||||
log "Installiere Android command-line tools nach $SDK_DIR"
|
||||
archive="$DOWNLOAD_DIR/commandlinetools.zip"
|
||||
download "$CMDLINE_TOOLS_URL" "$archive"
|
||||
rm -rf "$SDK_DIR/cmdline-tools"
|
||||
mkdir -p "$SDK_DIR/cmdline-tools"
|
||||
tmp="$(mktemp -d)"
|
||||
unzip -q "$archive" -d "$tmp"
|
||||
mv "$tmp/cmdline-tools" "$SDK_DIR/cmdline-tools/latest"
|
||||
rm -rf "$tmp"
|
||||
fi
|
||||
|
||||
SDKMANAGER="$SDK_DIR/cmdline-tools/latest/bin/sdkmanager"
|
||||
export JAVA_HOME="$JDK_DIR"
|
||||
export ANDROID_HOME="$SDK_DIR"
|
||||
export ANDROID_SDK_ROOT="$SDK_DIR"
|
||||
|
||||
if [[ ! -x "$SDK_DIR/platform-tools/adb" ]]; then
|
||||
log "Akzeptiere Android-Lizenzen"
|
||||
yes | "$SDKMANAGER" --sdk_root="$SDK_DIR" --licenses >/dev/null || true
|
||||
|
||||
log "Installiere Platform-Tools, Build-Tools und Platform"
|
||||
packages=("platform-tools" "platforms;android-36")
|
||||
for version in "${BUILD_TOOLS_VERSIONS[@]}"; do
|
||||
packages+=("build-tools;$version")
|
||||
done
|
||||
"$SDKMANAGER" --sdk_root="$SDK_DIR" "${packages[@]}"
|
||||
fi
|
||||
|
||||
"$SDK_DIR/platform-tools/adb" version | head -1
|
||||
|
||||
# --- Godot-Export-Templates --------------------------------------------------
|
||||
if [[ -f "$TPL_DIR/android_debug.apk" ]]; then
|
||||
log "Godot-Export-Templates vorhanden: $TPL_DIR"
|
||||
else
|
||||
log "Installiere Godot-$GODOT_VERSION-Export-Templates"
|
||||
archive="$DOWNLOAD_DIR/export_templates.tpz"
|
||||
download "$TEMPLATES_URL" "$archive"
|
||||
rm -rf "$TPL_DIR"
|
||||
mkdir -p "$TPL_DIR"
|
||||
tmp="$(mktemp -d)"
|
||||
unzip -q "$archive" -d "$tmp"
|
||||
cp -a "$tmp/templates/." "$TPL_DIR/"
|
||||
rm -rf "$tmp"
|
||||
fi
|
||||
ls "$TPL_DIR" | sed -n '1,6p'
|
||||
|
||||
# --- Debug-Keystore ----------------------------------------------------------
|
||||
if [[ -f "$KEYSTORE" ]]; then
|
||||
log "Debug-Keystore vorhanden: $KEYSTORE"
|
||||
else
|
||||
log "Erzeuge Debug-Keystore"
|
||||
mkdir -p "$(dirname "$KEYSTORE")"
|
||||
"$JDK_DIR/bin/keytool" -genkeypair -keyalg RSA -keysize 2048 -validity 10000 \
|
||||
-keystore "$KEYSTORE" -storetype PKCS12 -storepass android -alias androiddebugkey \
|
||||
-keypass android -dname "CN=Android Debug,O=Android,C=US" >/dev/null
|
||||
fi
|
||||
|
||||
# --- Godot Editor-Settings ---------------------------------------------------
|
||||
log "Trage Pfade in die Godot-Editor-Settings ein"
|
||||
python3 - "$JDK_DIR" "$SDK_DIR" "$KEYSTORE" <<'PY'
|
||||
import configparser
|
||||
import pathlib
|
||||
import re
|
||||
import shutil
|
||||
import sys
|
||||
|
||||
java_path, sdk_path, keystore = sys.argv[1:4]
|
||||
for name in ("editor_settings-4.7.tres", "editor_settings-4.6.tres"):
|
||||
path = pathlib.Path.home() / ".config" / "godot" / name
|
||||
if not path.exists():
|
||||
continue
|
||||
text = path.read_text()
|
||||
shutil.copy2(path, path.with_suffix(path.suffix + ".bak"))
|
||||
replacements = {
|
||||
"export/android/java_sdk_path": java_path,
|
||||
"export/android/android_sdk_path": sdk_path,
|
||||
"export/android/debug_keystore": keystore,
|
||||
}
|
||||
for key, value in replacements.items():
|
||||
line = f'{key} = "{value}"'
|
||||
if re.search(rf'^{re.escape(key)} = .*$', text, flags=re.M):
|
||||
text = re.sub(rf'^{re.escape(key)} = .*$', line, text, flags=re.M)
|
||||
else:
|
||||
text = text.rstrip() + "\n" + line + "\n"
|
||||
path.write_text(text)
|
||||
print(f"aktualisiert: {path} (Backup: {path}.bak)")
|
||||
PY
|
||||
|
||||
log "Fertig"
|
||||
cat <<EOF
|
||||
|
||||
JDK: $JDK_DIR
|
||||
Android SDK: $SDK_DIR
|
||||
Templates: $TPL_DIR
|
||||
Keystore: $KEYSTORE
|
||||
|
||||
APK bauen:
|
||||
./tools/export_android.sh
|
||||
Auf dem Tablet installieren (USB-Debugging aktiv):
|
||||
adb install -r build/android/rinkplanner-debug.apk
|
||||
EOF
|
||||
55
tools/verify_apk.sh
Executable file
55
tools/verify_apk.sh
Executable file
|
|
@ -0,0 +1,55 @@
|
|||
#!/usr/bin/env bash
|
||||
# Prüft ein gebautes Android-APK: Paketname, Version, SDK-Stufen, ABI,
|
||||
# Landscape-Orientierung und Signatur. Ergänzt tools/export_android.sh.
|
||||
#
|
||||
# ./tools/verify_apk.sh [pfad/zur/app.apk]
|
||||
set -euo pipefail
|
||||
|
||||
REPO_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
|
||||
APK="${1:-$REPO_ROOT/build/android/rinkplanner-debug.apk}"
|
||||
SDK_DIR="${SDK_DIR:-$HOME/Android/Sdk}"
|
||||
JDK_DIR="${JDK_DIR:-$HOME/.jdks/temurin-17}"
|
||||
BUILD_TOOLS="$SDK_DIR/build-tools/36.0.0"
|
||||
|
||||
[[ -f "$APK" ]] || { echo "APK nicht gefunden: $APK" >&2; exit 1; }
|
||||
[[ -x "$BUILD_TOOLS/aapt2" ]] || { echo "aapt2 fehlt: $BUILD_TOOLS" >&2; exit 1; }
|
||||
|
||||
fail=0
|
||||
expect() {
|
||||
local pattern="$1" label="$2" haystack="$3"
|
||||
if grep -qE "$pattern" <<<"$haystack"; then
|
||||
echo "ok $label"
|
||||
else
|
||||
echo "FAIL $label (erwartet: $pattern)" >&2
|
||||
fail=1
|
||||
fi
|
||||
}
|
||||
|
||||
badging="$("$BUILD_TOOLS/aapt2" dump badging "$APK")"
|
||||
echo "APK: $APK"
|
||||
expect "^package: name='de\.rinkplanner\.app'" "Paketname" "$badging"
|
||||
expect "versionName='[0-9]+\.[0-9]+\.[0-9]+'" "Version" "$badging"
|
||||
expect "minSdkVersion:'24'" "minSdk 24" "$badging"
|
||||
expect "native-code: 'arm64-v8a'" "ABI arm64-v8a" "$badging"
|
||||
expect "application-label:'Rinkplanner'" "App-Label" "$badging"
|
||||
|
||||
features="$("$BUILD_TOOLS/aapt2" dump xmltree --file AndroidManifest.xml "$APK" 2>/dev/null)"
|
||||
expect "screenOrientation.*=0" "Landscape" "$features"
|
||||
|
||||
if [[ -d "$JDK_DIR/bin" ]]; then
|
||||
export PATH="$JDK_DIR/bin:$PATH"
|
||||
if "$BUILD_TOOLS/apksigner" verify "$APK" >/dev/null 2>&1; then
|
||||
echo "ok Signatur"
|
||||
else
|
||||
echo "FAIL Signatur" >&2
|
||||
fail=1
|
||||
fi
|
||||
else
|
||||
echo "skip Signatur (JDK nicht gefunden: $JDK_DIR)"
|
||||
fi
|
||||
|
||||
if [[ "$fail" -ne 0 ]]; then
|
||||
echo "APK-Prüfung fehlgeschlagen." >&2
|
||||
exit 1
|
||||
fi
|
||||
echo "APK-Prüfung bestanden."
|
||||
Loading…
Add table
Add a link
Reference in a new issue