From 83b539e872ec3ce1e3bb1669b55dabb930020587 Mon Sep 17 00:00:00 2001 From: minjaesong Date: Mon, 17 Jun 2024 23:41:19 +0900 Subject: [PATCH] build inst update --- buildapp/appimagetool-aarch64.AppImage | Bin buildapp/build_app_linux_arm.sh | 4 ++-- buildapp/instructions.md | 20 ++++++++++---------- 3 files changed, 12 insertions(+), 12 deletions(-) mode change 100644 => 100755 buildapp/appimagetool-aarch64.AppImage diff --git a/buildapp/appimagetool-aarch64.AppImage b/buildapp/appimagetool-aarch64.AppImage old mode 100644 new mode 100755 diff --git a/buildapp/build_app_linux_arm.sh b/buildapp/build_app_linux_arm.sh index 0a67831da..bc2d21379 100755 --- a/buildapp/build_app_linux_arm.sh +++ b/buildapp/build_app_linux_arm.sh @@ -2,7 +2,7 @@ if (( $EUID == 0 )); then echo "The build process is not meant to be run with root privilege, exiting now." >&2; exit 1; fi cd "${0%/*}" -APPIMAGETOOL="appimagetool-aarch64.AppImage" # Note to self: run this on Asahi +APPIMAGETOOL="appimagetool-x86_64.AppImage" # Note to self: run this on Asahi SRCFILES="terrarumlinux_arm" DESTDIR="TerrarumLinux.arm" RUNTIME="runtime-linux-arm" @@ -35,7 +35,7 @@ mv $DESTDIR/assets_release $DESTDIR/assets cp "../out/$JARNAME" $DESTDIR/out/ # Pack everything to AppImage -"./$APPIMAGETOOL" $DESTDIR "out/$DESTDIR.AppImage" || { echo 'Building AppImage failed' >&2; exit 1; } +ARCH=aarch64 "./$APPIMAGETOOL" $DESTDIR "out/$DESTDIR.AppImage" || { echo 'Building AppImage failed' >&2; exit 1; } chmod +x "out/$DESTDIR.AppImage" rm -rf $DESTDIR || true echo "Build successful: $DESTDIR" diff --git a/buildapp/instructions.md b/buildapp/instructions.md index 9498c602a..ac85b477a 100644 --- a/buildapp/instructions.md +++ b/buildapp/instructions.md @@ -6,20 +6,20 @@ The filenames must be: | Target OS/Arch | filename | |---------------------|--------------------| -| Linux AMD64 | jdk-17.0.1-x86 | -| Linux Aarch64 | jdk-17.0.1-arm | -| Windows AMD64 | jdk-17.0.1-windows | -| macOS Apple Silicon | jdk-17.0.1.jdk-arm | -| macOS Intel | jdk-17.0.1.jdk-x86 | +| Linux AMD64 | jdk-21.0.2-x86 | +| Linux Aarch64 | jdk-21.0.2-arm | +| Windows AMD64 | jdk-21.0.2-windows | +| macOS Apple Silicon | jdk-21.0.2.jdk-arm | +| macOS Intel | jdk-21.0.2.jdk-x86 | Then, on the terminal, run following commands: ``` -jlink --module-path ~/Documents/openjdk/jdk-17.0.1-x86/jmods:mods --add-modules java.base,java.desktop,java.net.http,jdk.crypto.ec,java.logging,java.scripting,jdk.unsupported --output ~/Documents/Terrarum/out/runtime-linux-x86 --no-header-files --no-man-pages --strip-debug --compress=2 -jlink --module-path ~/Documents/openjdk/jdk-17.0.1-arm/jmods:mods --add-modules java.base,java.desktop,java.net.http,jdk.crypto.ec,java.logging,java.scripting,jdk.unsupported --output ~/Documents/Terrarum/out/runtime-linux-arm --no-header-files --no-man-pages --strip-debug --compress=2 -jlink --module-path ~/Documents/openjdk/jdk-17.0.1-windows/jmods:mods --add-modules java.base,java.desktop,java.net.http,jdk.crypto.ec,java.logging,java.scripting,jdk.unsupported --output ~/Documents/Terrarum/out/runtime-windows-x86 --no-header-files --no-man-pages --strip-debug --compress=2 -jlink --module-path ~/Documents/openjdk/jdk-17.0.1.jdk-arm/Contents/Home/jmods:mods --add-modules java.base,java.desktop,java.net.http,jdk.crypto.ec,java.logging,java.scripting,jdk.unsupported --output ~/Documents/Terrarum/out/runtime-osx-arm --no-header-files --no-man-pages --strip-debug --compress=2 -jlink --module-path ~/Documents/openjdk/jdk-17.0.1.jdk-x86/Contents/Home/jmods:mods --add-modules java.base,java.desktop,java.net.http,jdk.crypto.ec,java.logging,java.scripting,jdk.unsupported --output ~/Documents/Terrarum/out/runtime-osx-x86 --no-header-files --no-man-pages --strip-debug --compress=2 +jlink --module-path ~/Documents/openjdk/jdk-21.0.2-x86/jmods:mods --add-modules java.base,java.desktop,java.net.http,jdk.crypto.ec,java.logging,java.scripting,jdk.unsupported --output ~/Documents/Terrarum/out/runtime-linux-x86 --no-header-files --no-man-pages --strip-debug --compress=2 +jlink --module-path ~/Documents/openjdk/jdk-21.0.2-arm/jmods:mods --add-modules java.base,java.desktop,java.net.http,jdk.crypto.ec,java.logging,java.scripting,jdk.unsupported --output ~/Documents/Terrarum/out/runtime-linux-arm --no-header-files --no-man-pages --strip-debug --compress=2 +jlink --module-path ~/Documents/openjdk/jdk-21.0.2-windows/jmods:mods --add-modules java.base,java.desktop,java.net.http,jdk.crypto.ec,java.logging,java.scripting,jdk.unsupported --output ~/Documents/Terrarum/out/runtime-windows-x86 --no-header-files --no-man-pages --strip-debug --compress=2 +jlink --module-path ~/Documents/openjdk/jdk-21.0.2.jdk-arm/Contents/Home/jmods:mods --add-modules java.base,java.desktop,java.net.http,jdk.crypto.ec,java.logging,java.scripting,jdk.unsupported --output ~/Documents/Terrarum/out/runtime-osx-arm --no-header-files --no-man-pages --strip-debug --compress=2 +jlink --module-path ~/Documents/openjdk/jdk-21.0.2.jdk-x86/Contents/Home/jmods:mods --add-modules java.base,java.desktop,java.net.http,jdk.crypto.ec,java.logging,java.scripting,jdk.unsupported --output ~/Documents/Terrarum/out/runtime-osx-x86 --no-header-files --no-man-pages --strip-debug --compress=2 ``` **Note: due to Apple being Apple, macOS runtimes must be created from the macOS**