Browse Source

Add MacOS aarch64

Toni Helenius 2 weeks ago
parent
commit
90fa4c8b3e

+ 1 - 1
.github/workflows/release.yml

@@ -15,7 +15,7 @@ jobs:
         distribution: temurin
         java-version: 21
     - name: Install wine
-      run: sudo dpkg --add-architecture i386 && sudo apt-get update && sudo apt install -y xorg xvfb xfonts-100dpi xfonts-75dpi xfonts-scalable xfonts-cyrillic wine32:i386 wine
+      run: sudo dpkg --add-architecture i386 && sudo apt-get update && sudo apt install -y xorg xvfb xfonts-100dpi xfonts-75dpi xfonts-scalable xfonts-cyrillic wine32:i386 wine makepkg
     - name: Grant execute permission for gradle
       run: chmod +x gradlew
     - name: Build the SDK

+ 2 - 1
.gitignore

@@ -31,4 +31,5 @@ installers/downloads/
 installers/nbpackage/
 installers/linux-x64/jdk-x64_linux.tar.gz
 installers/macos-x64/jdk-x64_macos.tar.gz
-installers/windows-x64/jdk-x64_windows.zip
+installers/windows-x64/jdk-x64_windows.zip
+installers/macos-aarch64/jdk-aarch64_macos.tar.gz

+ 9 - 0
installers/build-installers.sh

@@ -97,6 +97,7 @@ function build_macos_pgk {
     echo "> Building the MacOS pgk"
     
     build_macos_x64_pgk $1
+    build_macos_aarch64_pgk $1
 
     echo "< OK!"
 }
@@ -109,6 +110,14 @@ function build_macos_x64_pgk {
     echo "<< OK!"
 }
 
+function build_macos_aarch64_pgk {
+    echo ">> Building the MacOS aarch64 pgk"
+
+    ./nbpackage/nbpackage-$nbpackage_version/bin/nbpackage --input ../dist/jmonkeyplatform.zip --config macos-aarch64/jmonkeyengine-macos-aarch64.properties --output ../dist/ -v -Ppackage.version=$1
+
+    echo "<< OK!"
+}
+
 echo "Building installers with version tag $1"
 
 versionString=$1

+ 1 - 0
installers/download-jdks.sh

@@ -24,6 +24,7 @@ function build_mac_jdk {
     echo "> Getting the Mac JDK"
 
     download_jdk x64 macos .tar.gz
+    download_jdk aarch64 macos .tar.gz
 
     echo "< OK!"
 }

+ 30 - 0
installers/macos-aarch64/jmonkeyengine-macos-aarch64.properties

@@ -0,0 +1,30 @@
+# Application name (required).
+package.name=jMonkeyEngine SDK
+# Packaging type.
+package.type=macos-pkg
+# Path to Java runtime to include in the package (default none).
+package.runtime=${CONFIG}/jdk-aarch64_macos.tar.gz
+# A single-line description of the package. Not all packagers will display this.
+package.description=A complete 3D game development suite written purely in Java.
+# Application publisher. Not all packagers will display this.
+package.publisher=${package.name}
+# Link to application / publisher website. Not all packagers will display this.
+package.url=https://jmonkeyengine.org
+# Value for CFBundleIdentifier.
+package.macos.bundleid=org.jmonkeyengine.sdk
+# Path to icon file (*.icns). Defaults to Apache NetBeans logo.
+package.macos.icon=${CONFIG}/jmonkeyplatform.icns
+# Optional path to Info.plist template.
+package.macos.info-template=
+# Optional path to launcher (main.swift) template.
+package.macos.launcher-template=
+# Optional path to codesign entitlements template.
+package.macos.entitlements-template=
+# Search pattern for native binaries that need to be code signed.
+package.macos.codesign-files={*.dylib,*.jnilib,**/nativeexecution/MacOSX-*/*,Contents/Home/bin/*,Contents/Home/lib/jspawnhelper}
+# Search pattern for JARs that bundle native binaries that need to be code signed.
+package.macos.codesign-jars={flatlaf-*.jar,jna-5*.jar,junixsocket-native-common-*.jar,launcher-common-*.jar,jansi-*.jar,nbi-engine.jar,truffle-runtime-*.jar}
+# Code signing identity as passed to Codesign.
+package.macos.codesign-id=
+# Installer signing identity as passed to Pkgbuild.
+package.macos.pkgbuild-id=

BIN
installers/macos-aarch64/jmonkeyplatform.icns