Apple: Update build script for Xcode 26.1.1 SDKs (#144)

Follow-up to https://github.com/godotengine/build-containers/pull/159.

.gitignore

@@ -3,6 +3,7 @@ config.sh
 *.jks
 *.pfx
 *.pkcs12
+/*.json
 
 # Generated by build scripts
 angle/

build-android/build.sh

@@ -4,16 +4,22 @@ set -e
 
 # Config
 
-export SCONS="scons -j${NUM_CORES} verbose=yes warnings=no progress=no"
-export OPTIONS="production=yes"
+# Debug symbols are enabled for the Android builds so we can generate a separate debug symbols file.
+# Gradle will strip them out of the final artifacts.
+export SCONS="scons -j${NUM_CORES} verbose=yes warnings=no progress=no redirect_build_objects=no"
+export OPTIONS="production=yes debug_symbols=yes"
 export OPTIONS_MONO="module_mono_enabled=yes"
+export OPTIONS_DOTNET="module_dotnet_enabled=yes"
 export TERM=xterm
 
-rm -rf godot
-mkdir godot
-cd godot
-tar xf /root/godot.tar.gz --strip-components=1
-cp -rf /root/swappy/* thirdparty/swappy-frame-pacing/
+prepare_source() {
+  cd /root
+  rm -rf godot
+  mkdir godot
+  cd godot
+  tar xf /root/godot.tar.gz --strip-components=1
+  cp -rf /root/swappy/* thirdparty/swappy-frame-pacing/
+}
 
 # Environment variables and keystore needed for signing store editor build,
 # as well as signing and publishing to MavenCentral.
@@ -30,10 +36,12 @@ fi
 if [ "${CLASSICAL}" == "1" ]; then
   echo "Starting classical build for Android..."
 
+  prepare_source
+
   $SCONS platform=android arch=arm32 $OPTIONS target=editor store_release=${store_release}
   $SCONS platform=android arch=arm64 $OPTIONS target=editor store_release=${store_release}
   $SCONS platform=android arch=x86_32 $OPTIONS target=editor store_release=${store_release}
-  $SCONS platform=android arch=x86_64 $OPTIONS target=editor store_release=${store_release}
+  $SCONS platform=android arch=x86_64 $OPTIONS target=editor store_release=${store_release} separate_debug_symbols=yes # Generate native debug symbols.
 
   pushd platform/android/java
   # Generate the regular Android editor.
@@ -45,38 +53,44 @@ if [ "${CLASSICAL}" == "1" ]; then
   popd
 
   mkdir -p /root/out/tools
-  # Copy the generated Android editor binaries (apk & aab).
+
   if [ "$store_release" == "yes" ]; then
+    # Copy the native debug symbols, a single one cover all editor builds.
+    cp bin/android-editor-release-native-symbols.zip /root/out/tools/android_editor_native_debug_symbols.zip
+
+    # Copy the generated Android editor binaries (apk & aab).
     cp bin/android_editor_builds/android_editor-android-release.apk /root/out/tools/android_editor.apk
     cp bin/android_editor_builds/android_editor-android-release.aab /root/out/tools/android_editor.aab
+
     # For the HorizonOS and PicoOS builds, we only copy the apk.
     cp bin/android_editor_builds/android_editor-horizonos-release.apk /root/out/tools/android_editor_horizonos.apk
     cp bin/android_editor_builds/android_editor-picoos-release.apk /root/out/tools/android_editor_picoos.apk
   else
+    # Copy the native debug symbols, a single one cover all editor builds.
+    cp bin/android-editor-debug-native-symbols.zip /root/out/tools/android_editor_native_debug_symbols.zip
+
+    # Copy the generated Android editor binaries (apk & aab).
     cp bin/android_editor_builds/android_editor-android-debug.apk /root/out/tools/android_editor.apk
     cp bin/android_editor_builds/android_editor-android-debug.aab /root/out/tools/android_editor.aab
+
     # For the HorizonOS and PicoOS build, we only copy the apk.
     cp bin/android_editor_builds/android_editor-horizonos-debug.apk /root/out/tools/android_editor_horizonos.apk
     cp bin/android_editor_builds/android_editor-picoos-debug.apk /root/out/tools/android_editor_picoos.apk
   fi
 
-  # Restart from a clean tarball, as we'll copy all the contents
-  # outside the container for the MavenCentral upload.
-  rm -rf /root/godot/*
-  tar xf /root/godot.tar.gz --strip-components=1
-  cp -rf /root/swappy/* thirdparty/swappy-frame-pacing/
+  # Template builds
+
+  prepare_source
+
+  $SCONS platform=android arch=arm32 $OPTIONS target=template_release
+  $SCONS platform=android arch=arm64 $OPTIONS target=template_release
+  $SCONS platform=android arch=x86_32 $OPTIONS target=template_release
+  $SCONS platform=android arch=x86_64 $OPTIONS target=template_release separate_debug_symbols=yes # Generate native debug symbols only for the release templates.
 
   $SCONS platform=android arch=arm32 $OPTIONS target=template_debug
-  $SCONS platform=android arch=arm32 $OPTIONS target=template_release
-
   $SCONS platform=android arch=arm64 $OPTIONS target=template_debug
-  $SCONS platform=android arch=arm64 $OPTIONS target=template_release
-
   $SCONS platform=android arch=x86_32 $OPTIONS target=template_debug
-  $SCONS platform=android arch=x86_32 $OPTIONS target=template_release
-
   $SCONS platform=android arch=x86_64 $OPTIONS target=template_debug
-  $SCONS platform=android arch=x86_64 $OPTIONS target=template_release
 
   pushd platform/android/java
   ./gradlew generateGodotTemplates
@@ -95,6 +109,7 @@ if [ "${CLASSICAL}" == "1" ]; then
   cp bin/android_debug.apk /root/out/templates/
   cp bin/android_release.apk /root/out/templates/
   cp bin/godot-lib.template_release.aar /root/out/templates/
+  cp bin/android-template-release-native-symbols.zip /root/out/templates/android_release_template_native_debug_symbols.zip
 fi
 
 # Mono
@@ -102,6 +117,8 @@ fi
 if [ "${MONO}" == "1" ]; then
   echo "Starting Mono build for Android..."
 
+  prepare_source
+
   cp -r /root/mono-glue/GodotSharp/GodotSharp/Generated modules/mono/glue/GodotSharp/GodotSharp/
 
   $SCONS platform=android arch=arm32 $OPTIONS $OPTIONS_MONO target=template_debug
@@ -127,4 +144,34 @@ if [ "${MONO}" == "1" ]; then
   cp bin/godot-lib.template_release.aar /root/out/templates-mono/
 fi
 
+# .NET
+
+if [ "${DOTNET}" == "1" ]; then
+  echo "Starting .NET build for Android..."
+
+  prepare_source
+
+  $SCONS platform=android arch=arm32 $OPTIONS $OPTIONS_DOTNET target=template_debug
+  $SCONS platform=android arch=arm32 $OPTIONS $OPTIONS_DOTNET target=template_release
+
+  $SCONS platform=android arch=arm64 $OPTIONS $OPTIONS_DOTNET target=template_debug
+  $SCONS platform=android arch=arm64 $OPTIONS $OPTIONS_DOTNET target=template_release
+
+  $SCONS platform=android arch=x86_32 $OPTIONS $OPTIONS_DOTNET target=template_debug
+  $SCONS platform=android arch=x86_32 $OPTIONS $OPTIONS_DOTNET target=template_release
+
+  $SCONS platform=android arch=x86_64 $OPTIONS $OPTIONS_DOTNET target=template_debug
+  $SCONS platform=android arch=x86_64 $OPTIONS $OPTIONS_DOTNET target=template_release
+
+  pushd platform/android/java
+  ./gradlew generateGodotMonoTemplates
+  popd
+
+  mkdir -p /root/out/templates-dotnet
+  cp bin/android_source.zip /root/out/templates-dotnet/
+  cp bin/android_monoDebug.apk /root/out/templates-dotnet/android_debug.apk
+  cp bin/android_monoRelease.apk /root/out/templates-dotnet/android_release.apk
+  cp bin/godot-lib.template_release.aar /root/out/templates-dotnet/
+fi
+
 echo "Android build successful"

build-android/playstore_upload_script.py

@@ -0,0 +1,109 @@
+import sys, socket
+from google.oauth2 import service_account
+from googleapiclient.discovery import build
+
+PACKAGE_NAME = "org.godotengine.editor.v4"
+
+def main(aab_path, nds_path, key_path, version_name):
+    version_base = version_name.split("-")[0]
+    version_parts = version_base.split(".")
+    major = version_parts[0]
+    minor = version_parts[1]
+    patch = int(version_parts[2]) if len(version_parts) > 2 else 0
+    channel = version_name.split("-")[1]
+
+    release_note = f"Godot Engine {version_name} has arrived!\nNote: This is a pre-release piece of software so be sure to make backups."
+    track = "alpha"
+
+    if "stable" in channel:
+        if patch == 0:
+            release_url = f"https://godotengine.org/releases/{major}.{minor}/"
+        else:
+            release_url = f"https://godotengine.org/article/maintenance-release-godot-{major}-{minor}-{patch}/"
+        release_note = f"Godot Engine {version_name} has arrived!\nRelease page: {release_url}"
+        track = "beta"
+    elif "rc" in channel:
+        channel_url = channel.replace("rc", "rc-")
+        if patch == 0:
+            release_url = f"https://godotengine.org/article/release-candidate-godot-{major}-{minor}-{channel_url}/"
+        else:
+            release_url = f"https://godotengine.org/article/release-candidate-godot-{major}-{minor}-{patch}-{channel_url}/"
+        release_note += f"\nRelease page: {release_url}"
+    else:
+        # No need to handle patch versions here: maintenance releases go straight to RC and stable.
+        # There are no 4.5.1-dev or 4.5.1-beta builds.
+        if "beta" in channel:
+            channel_url = channel.replace("beta", "beta-")
+        else:
+            channel_url = channel.replace("dev", "dev-")
+        release_url = f"https://godotengine.org/article/dev-snapshot-godot-{major}-{minor}-{channel_url}/"
+        release_note += f"\nRelease page: {release_url}"
+
+    scopes = ["https://www.googleapis.com/auth/androidpublisher"]
+    credentials = service_account.Credentials.from_service_account_file(key_path, scopes=scopes)
+
+    initial_timeout = socket.getdefaulttimeout()
+    socket.setdefaulttimeout(900)
+    service = build("androidpublisher", "v3", credentials=credentials)
+
+    print("Creating a new edit")
+    edit = service.edits().insert(body={}, packageName=PACKAGE_NAME).execute()
+    edit_id = edit["id"]
+
+    print(f"Uploading {aab_path}")
+    bundle_response = service.edits().bundles().upload(
+        editId=edit_id,
+        packageName=PACKAGE_NAME,
+        media_body=aab_path,
+        media_mime_type="application/octet-stream"
+    ).execute()
+
+    version_code = bundle_response["versionCode"]
+    print(f"Uploaded AAB with versionCode: {version_code}")
+
+    print(f"Uploading native debug symbols {nds_path}")
+    service.edits().deobfuscationfiles().upload(
+        editId=edit_id,
+        packageName=PACKAGE_NAME,
+        apkVersionCode=version_code,
+        deobfuscationFileType="nativeCode",
+        media_body=nds_path,
+        media_mime_type="application/octet-stream"
+    ).execute()
+
+    release_name = f"v{version_name} ({version_code})"
+    print(f"Assigning {release_name} to {track} track")
+
+    service.edits().tracks().update(
+        editId=edit_id,
+        packageName=PACKAGE_NAME,
+        track=track,
+        body={
+            "releases": [{
+                "name": release_name,
+                "versionCodes": [str(version_code)],
+                "status": "completed",
+                "releaseNotes": [{
+                    "language": "en-US",
+                    "text": release_note
+                }]
+            }]
+        }
+    ).execute()
+
+    service.edits().commit(editId=edit_id, packageName=PACKAGE_NAME).execute()
+    print("Release uploaded and published successfully!")
+    socket.setdefaulttimeout(initial_timeout)
+
+if __name__ == "__main__":
+    if len(sys.argv) != 5:
+        print("Usage: python3 upload_playstore.py <aab-path> <native-debug-symbols-path> <json-key-path> <version-name>")
+        print("version-name format: <major>.<minor>[.<patch>]-<channel> (e.g. 4.4.1-stable, 4.5-stable, 4.6-dev1)")
+        sys.exit(1)
+
+    aab_path = sys.argv[1]
+    nds_path = sys.argv[2]
+    key_path = sys.argv[3]
+    version_name = sys.argv[4]
+
+    main(aab_path, nds_path, key_path, version_name)

build-android/upload-horizon.sh

@@ -0,0 +1,55 @@
+#!/bin/bash
+
+if [ "$#" -ne 2 ]; then
+  echo "Usage: $0 <version-name> <latest-stable>"
+  exit 1
+fi
+
+VERSION_NAME="$1"
+LATEST_STABLE="$2"
+
+BASEDIR="$(pwd)"
+
+source ${BASEDIR}/config.sh
+
+TMPDIR=$(mktemp -d)
+cleanup() {
+  rm -rf "$TMPDIR"
+}
+trap cleanup EXIT
+
+OVR_PLATFORM_UTIL_DOWNLOAD_URL="https://www.oculus.com/download_app/?id=5159709737372459"
+OVR_PLATFORM_UTIL="$TMPDIR/ovr-platform-util"
+
+APK_FILE="${BASEDIR}/out/android/tools/android_editor_horizonos.apk"
+NDS_FILE="${BASEDIR}/out/android/tools/android_editor_native_debug_symbols.zip"
+NDS_OUTPUT_DIR="$TMPDIR/nds"
+
+STATUS=$(echo "$VERSION_NAME" | sed -e 's/^.*-\([a-z][a-z]*\)[0-9]*$/\1/')
+if [ "$STATUS" = "stable" -a "$LATEST_STABLE" = "1" ]; then
+  HORIZON_STORE_CHANNEL="LIVE"
+elif [ "$STATUS" = "dev" ]; then
+  HORIZON_STORE_CHANNEL="ALPHA"
+elif [ "$STATUS" = "beta" ]; then
+  HORIZON_STORE_CHANNEL="BETA"
+elif [ "$STATUS" = "rc" ]; then
+  HORIZON_STORE_CHANNEL="RC"
+else
+  echo "Unable to determine Horizon store channel from version status: $STATUS" >/dev/stderr
+  exit 1
+fi
+
+mkdir -p "$NDS_OUTPUT_DIR"
+(cd "$NDS_OUTPUT_DIR" && unzip "$NDS_FILE")
+
+echo "Downloading ovr-platform-util..."
+if ! curl -fL -o "$OVR_PLATFORM_UTIL" "$OVR_PLATFORM_UTIL_DOWNLOAD_URL"; then
+  exit 1
+fi
+
+chmod +x "$OVR_PLATFORM_UTIL"
+
+echo "Uploading $VERSION_NAME to Horizon store on channel $HORIZON_STORE_CHANNEL..."
+if ! $OVR_PLATFORM_UTIL upload-quest-build --app-id "$GODOT_ANDROID_HORIZON_APP_ID" --app-secret "$GODOT_ANDROID_HORIZON_APP_SECRET" --apk "$APK_FILE" --channel "$HORIZON_STORE_CHANNEL" --debug-symbols-dir "$NDS_OUTPUT_DIR/arm64-v8a/" --debug-symbols-pattern '*.so'; then
+  exit 1
+fi

build-android/upload-mavencentral.sh

@@ -15,4 +15,4 @@ ${PODMAN} run -it --rm \
     "source /root/keystore/config.sh && \
     cp -r /root/godot/.gradle /root && \
     cd /root/godot/platform/android/java && \
-    ./gradlew publishTemplateReleasePublicationToSonatypeRepository --max-workers 1 closeAndReleaseSonatypeStagingRepository"
+    ./gradlew publishAllPublicationToSonatypeRepository --max-workers 1 closeAndReleaseSonatypeStagingRepository"

build-android/upload-playstore.sh

@@ -0,0 +1,29 @@
+#!/bin/bash
+
+if [ "$#" -ne 1 ]; then
+  echo "Usage: $0 <version-name>"
+  exit 1
+fi
+
+VERSION_NAME="$1"
+
+BASEDIR="$(pwd)"
+
+source ${BASEDIR}/config.sh
+
+VENV_DIR="${BASEDIR}/venv"
+PYTHON_SCRIPT="${BASEDIR}/build-android/playstore_upload_script.py"
+AAB_FILE="${BASEDIR}/out/android/tools/android_editor.aab"
+NDS_FILE="${BASEDIR}/out/android/tools/android_editor_native_debug_symbols.zip"
+JSON_KEY_FILE="${BASEDIR}/${GODOT_ANDROID_UPLOAD_JSON_KEY}"
+
+echo "Creating virtual environment"
+rm -rf "$VENV_DIR"
+python3 -m venv "$VENV_DIR"
+source "$VENV_DIR/bin/activate"
+
+echo "Installing google-api-python-client"
+pip install --upgrade google-api-python-client
+
+echo "Uploading editor to Google Play Store..."
+python3 "$PYTHON_SCRIPT" "$AAB_FILE" "$NDS_FILE" "$JSON_KEY_FILE" "$VERSION_NAME"

build-dotnet/build.sh

@@ -0,0 +1,71 @@
+#!/bin/bash
+
+set -e
+
+if [ "${DOTNET}" != "1" ]; then
+  exit 0
+fi
+
+dnf install -y clang python-unversioned-command
+
+git clone https://github.com/raulsntos/godot-dotnet
+cd godot-dotnet
+git checkout upgrade-assistant-plus-source-code-plugin-wip
+
+echo "Building and generating .NET extension..."
+
+# TODO: Get rid of this when we fix all these trimming warnings in godot-dotnet.
+cat << EOF >> .editorconfig
+# Disable trimming warnings because it spams the output too much.
+dotnet_diagnostics.IL2111.severity = none
+EOF
+
+prerelease_label="${GODOT_VERSION#*-}"
+version_prefix="${GODOT_VERSION%-*}"
+
+if [[ "${prerelease_label}" == "${GODOT_VERSION}" ]]; then
+  prerelease_label=""
+fi
+
+# TODO: Ensure we don't accidentally make stable releases. We can remove this when we're ready for a stable release.
+if [[ -z "$prerelease_label" ]]; then
+  echo "YOU ARE NOT SUPPOSED TO MAKE A STABLE RELEASE WITH THIS"
+  exit -1
+fi
+
+version_component_count=$(grep -o "\." <<< "$version_prefix" | wc -l)
+
+if [ "$version_component_count" -eq 0 ]; then
+  version_prefix="${version_prefix}.0.0"
+elif [ "$version_component_count" -eq 1 ]; then
+  version_prefix="${version_prefix}.0"
+fi
+
+if [[ -n "$prerelease_label" ]]; then
+  if [[ "$prerelease_label" =~ ^dev ]]; then
+    prerelease_label="${prerelease_label/dev/alpha}"
+  fi
+
+  prerelease_label=$(echo "$prerelease_label" | sed -E 's/([^0-9])([0-9])/\1.\2/g')
+fi
+
+echo "Building Godot .NET version ${version_prefix} (prerelease: '${prerelease_label}')"
+
+dotnet --info
+
+build_id="$(date +%Y%m%d).1"
+final_version_kind="release"
+if [[ -n "$prerelease_label" ]]; then
+  final_version_kind="prerelease"
+fi
+
+./build.sh --productBuild --ci --warnAsError false \
+    /p:GenerateGodotBindings=true \
+    /p:VersionPrefix=${version_prefix} \
+    /p:OfficialBuildId=${build_id} \
+    /p:FinalVersionKind=${final_version_kind} \
+    /p:PreReleaseVersionLabel=${prerelease_label}
+
+cp -r artifacts/packages/Release/Shipping/* /root/out/
+
+echo ".NET bindings generated successfully"

build-ios/build.sh

@@ -4,15 +4,19 @@ set -e
 
 # Config
 
-export SCONS="scons -j${NUM_CORES} verbose=yes warnings=no progress=no"
+export SCONS="scons -j${NUM_CORES} verbose=yes warnings=no progress=no redirect_build_objects=no"
 # Keep LTO disabled for iOS - it works but it makes linking apps on deploy very slow,
 # which is seen as a regression in the current workflow.
-export OPTIONS="production=yes use_lto=no"
+export OPTIONS="production=yes use_lto=no SWIFT_FRONTEND=/root/.local/share/swiftly/toolchains/6.2.1/usr/bin/swift-frontend"
 export OPTIONS_MONO="module_mono_enabled=yes"
+export OPTIONS_DOTNET="module_dotnet_enabled=yes"
 export TERM=xterm
 
-export IOS_SDK="18.2"
-export IOS_LIPO="/root/ioscross/arm64/bin/arm-apple-darwin11-lipo"
+export IOS_SDK="26.1"
+export IOS_DEVICE="IOS_SDK_PATH=/root/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS${IOS_SDK}.sdk"
+export IOS_SIMULATOR="IOS_SDK_PATH=/root/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator${IOS_SDK}.sdk simulator=yes"
+export APPLE_TARGET_ARM64="APPLE_TOOLCHAIN_PATH=/root/ioscross/arm64 apple_target_triple=arm-apple-darwin11-"
+export APPLE_TARGET_X86_64="APPLE_TOOLCHAIN_PATH=/root/ioscross/x86_64 apple_target_triple=x86_64-apple-darwin11-"
 
 rm -rf godot
 mkdir godot
@@ -25,30 +29,22 @@ if [ "${CLASSICAL}" == "1" ]; then
   echo "Starting classical build for iOS..."
 
   # arm64 device
-  $SCONS platform=ios $OPTIONS arch=arm64 ios_simulator=no target=template_debug \
-    IOS_SDK_PATH="/root/ioscross/arm64/SDK/iPhoneOS${IOS_SDK}.sdk" IOS_TOOLCHAIN_PATH="/root/ioscross/arm64/" ios_triple="arm-apple-darwin11-"
-  $SCONS platform=ios $OPTIONS arch=arm64 ios_simulator=no target=template_release \
-    IOS_SDK_PATH="/root/ioscross/arm64/SDK/iPhoneOS${IOS_SDK}.sdk" IOS_TOOLCHAIN_PATH="/root/ioscross/arm64/" ios_triple="arm-apple-darwin11-"
+  $SCONS platform=ios $OPTIONS arch=arm64 target=template_debug $IOS_DEVICE $APPLE_TARGET_ARM64
+  $SCONS platform=ios $OPTIONS arch=arm64 target=template_release $IOS_DEVICE $APPLE_TARGET_ARM64
 
   # arm64 simulator
   # Disabled for now as it doesn't work with cctools-port and current LLVM.
   # See https://github.com/godotengine/build-containers/pull/85.
-  #$SCONS platform=ios $OPTIONS arch=arm64 ios_simulator=yes target=template_debug \
-  #  IOS_SDK_PATH="/root/ioscross/arm64_sim/SDK/iPhoneSimulator${IOS_SDK}.sdk" IOS_TOOLCHAIN_PATH="/root/ioscross/arm64_sim/" ios_triple="arm-apple-darwin11-"
-  #$SCONS platform=ios $OPTIONS arch=arm64 ios_simulator=yes target=template_release \
-  #  IOS_SDK_PATH="/root/ioscross/arm64_sim/SDK/iPhoneSimulator${IOS_SDK}.sdk" IOS_TOOLCHAIN_PATH="/root/ioscross/arm64_sim/" ios_triple="arm-apple-darwin11-"
+  #$SCONS platform=ios $OPTIONS arch=arm64 target=template_debug $IOS_SIMULATOR $APPLE_TARGET_ARM64
+  #$SCONS platform=ios $OPTIONS arch=arm64 target=template_release $IOS_SIMULATOR $APPLE_TARGET_ARM64
 
   # x86_64 simulator
-  $SCONS platform=ios $OPTIONS arch=x86_64 ios_simulator=yes target=template_debug \
-    IOS_SDK_PATH="/root/ioscross/x86_64_sim/SDK/iPhoneSimulator${IOS_SDK}.sdk" IOS_TOOLCHAIN_PATH="/root/ioscross/x86_64_sim/" ios_triple="x86_64-apple-darwin11-"
-  $SCONS platform=ios $OPTIONS arch=x86_64 ios_simulator=yes target=template_release \
-    IOS_SDK_PATH="/root/ioscross/x86_64_sim/SDK/iPhoneSimulator${IOS_SDK}.sdk" IOS_TOOLCHAIN_PATH="/root/ioscross/x86_64_sim/" ios_triple="x86_64-apple-darwin11-"
+  $SCONS platform=ios $OPTIONS arch=x86_64 target=template_debug $IOS_SIMULATOR $APPLE_TARGET_X86_64
+  $SCONS platform=ios $OPTIONS arch=x86_64 target=template_release $IOS_SIMULATOR $APPLE_TARGET_X86_64
 
   mkdir -p /root/out/templates
   cp bin/libgodot.ios.template_release.arm64.a /root/out/templates/libgodot.ios.a
   cp bin/libgodot.ios.template_debug.arm64.a /root/out/templates/libgodot.ios.debug.a
-  #$IOS_LIPO -create bin/libgodot.ios.template_release.arm64.simulator.a bin/libgodot.ios.template_release.x86_64.simulator.a -output /root/out/templates/libgodot.ios.simulator.a
-  #$IOS_LIPO -create bin/libgodot.ios.template_debug.arm64.simulator.a bin/libgodot.ios.template_debug.x86_64.simulator.a -output /root/out/templates/libgodot.ios.debug.simulator.a
   cp bin/libgodot.ios.template_release.x86_64.simulator.a /root/out/templates/libgodot.ios.simulator.a
   cp bin/libgodot.ios.template_debug.x86_64.simulator.a /root/out/templates/libgodot.ios.debug.simulator.a
 fi
@@ -61,33 +57,50 @@ if [ "${MONO}" == "1" ]; then
   cp -r /root/mono-glue/GodotSharp/GodotSharp/Generated modules/mono/glue/GodotSharp/GodotSharp/
 
   # arm64 device
-  $SCONS platform=ios $OPTIONS $OPTIONS_MONO arch=arm64 ios_simulator=no target=template_debug \
-    IOS_SDK_PATH="/root/ioscross/arm64/SDK/iPhoneOS${IOS_SDK}.sdk" IOS_TOOLCHAIN_PATH="/root/ioscross/arm64/" ios_triple="arm-apple-darwin11-"
-  $SCONS platform=ios $OPTIONS $OPTIONS_MONO arch=arm64 ios_simulator=no target=template_release \
-    IOS_SDK_PATH="/root/ioscross/arm64/SDK/iPhoneOS${IOS_SDK}.sdk" IOS_TOOLCHAIN_PATH="/root/ioscross/arm64/" ios_triple="arm-apple-darwin11-"
+  $SCONS platform=ios $OPTIONS $OPTIONS_MONO arch=arm64 target=template_debug $IOS_DEVICE $APPLE_TARGET_ARM64
+  $SCONS platform=ios $OPTIONS $OPTIONS_MONO arch=arm64 target=template_release $IOS_DEVICE $APPLE_TARGET_ARM64
 
   # arm64 simulator
   # Disabled for now as it doesn't work with cctools-port and current LLVM.
   # See https://github.com/godotengine/build-containers/pull/85.
-  #$SCONS platform=ios $OPTIONS $OPTIONS_MONO arch=arm64 ios_simulator=yes target=template_debug \
-  #  IOS_SDK_PATH="/root/ioscross/arm64_sim/SDK/iPhoneSimulator${IOS_SDK}.sdk" IOS_TOOLCHAIN_PATH="/root/ioscross/arm64_sim/" ios_triple="arm-apple-darwin11-"
-  #$SCONS platform=ios $OPTIONS $OPTIONS_MONO arch=arm64 ios_simulator=yes target=template_release \
-  #  IOS_SDK_PATH="/root/ioscross/arm64_sim/SDK/iPhoneSimulator${IOS_SDK}.sdk" IOS_TOOLCHAIN_PATH="/root/ioscross/arm64_sim/" ios_triple="arm-apple-darwin11-"
+  #$SCONS platform=ios $OPTIONS $OPTIONS_MONO arch=arm64 target=template_debug $IOS_SIMULATOR $APPLE_TARGET_ARM64
+  #$SCONS platform=ios $OPTIONS $OPTIONS_MONO arch=arm64 target=template_release $IOS_SIMULATOR $APPLE_TARGET_ARM64
 
   # x86_64 simulator
-  $SCONS platform=ios $OPTIONS $OPTIONS_MONO arch=x86_64 ios_simulator=yes target=template_debug \
-    IOS_SDK_PATH="/root/ioscross/x86_64_sim/SDK/iPhoneSimulator${IOS_SDK}.sdk" IOS_TOOLCHAIN_PATH="/root/ioscross/x86_64_sim/" ios_triple="x86_64-apple-darwin11-"
-  $SCONS platform=ios $OPTIONS $OPTIONS_MONO arch=x86_64 ios_simulator=yes target=template_release \
-    IOS_SDK_PATH="/root/ioscross/x86_64_sim/SDK/iPhoneSimulator${IOS_SDK}.sdk" IOS_TOOLCHAIN_PATH="/root/ioscross/x86_64_sim/" ios_triple="x86_64-apple-darwin11-"
+  $SCONS platform=ios $OPTIONS $OPTIONS_MONO arch=x86_64 target=template_debug $IOS_SIMULATOR $APPLE_TARGET_X86_64
+  $SCONS platform=ios $OPTIONS $OPTIONS_MONO arch=x86_64 target=template_release $IOS_SIMULATOR $APPLE_TARGET_X86_64
 
   mkdir -p /root/out/templates-mono
-
   cp bin/libgodot.ios.template_release.arm64.a /root/out/templates-mono/libgodot.ios.a
   cp bin/libgodot.ios.template_debug.arm64.a /root/out/templates-mono/libgodot.ios.debug.a
-  #$IOS_LIPO -create bin/libgodot.ios.template_release.arm64.simulator.a bin/libgodot.ios.template_release.x86_64.simulator.a -output /root/out/templates-mono/libgodot.ios.simulator.a
-  #$IOS_LIPO -create bin/libgodot.ios.template_debug.arm64.simulator.a bin/libgodot.ios.template_debug.x86_64.simulator.a -output /root/out/templates-mono/libgodot.ios.debug.simulator.a
   cp bin/libgodot.ios.template_release.x86_64.simulator.a /root/out/templates-mono/libgodot.ios.simulator.a
   cp bin/libgodot.ios.template_debug.x86_64.simulator.a /root/out/templates-mono/libgodot.ios.debug.simulator.a
 fi
 
+# .NET
+
+if [ "${DOTNET}" == "1" ]; then
+  echo "Starting .NET build for iOS..."
+
+  # arm64 device
+  $SCONS platform=ios $OPTIONS $OPTIONS_DOTNET arch=arm64 target=template_debug $IOS_DEVICE $APPLE_TARGET_ARM64
+  $SCONS platform=ios $OPTIONS $OPTIONS_DOTNET arch=arm64 target=template_release $IOS_DEVICE $APPLE_TARGET_ARM64
+
+  # arm64 simulator
+  # Disabled for now as it doesn't work with cctools-port and current LLVM.
+  # See https://github.com/godotengine/build-containers/pull/85.
+  #$SCONS platform=ios $OPTIONS $OPTIONS_DOTNET arch=arm64 target=template_debug $IOS_SIMULATOR $APPLE_TARGET_ARM64
+  #$SCONS platform=ios $OPTIONS $OPTIONS_DOTNET arch=arm64 target=template_release $IOS_SIMULATOR $APPLE_TARGET_ARM64
+
+  # x86_64 simulator
+  $SCONS platform=ios $OPTIONS $OPTIONS_DOTNET arch=x86_64 target=template_debug $IOS_SIMULATOR $APPLE_TARGET_X86_64
+  $SCONS platform=ios $OPTIONS $OPTIONS_DOTNET arch=x86_64 target=template_release $IOS_SIMULATOR $APPLE_TARGET_X86_64
+
+  mkdir -p /root/out/templates-dotnet
+  cp bin/libgodot.ios.template_release.arm64.a /root/out/templates-dotnet/libgodot.ios.a
+  cp bin/libgodot.ios.template_debug.arm64.a /root/out/templates-dotnet/libgodot.ios.debug.a
+  cp bin/libgodot.ios.template_release.x86_64.simulator.a /root/out/templates-dotnet/libgodot.ios.simulator.a
+  cp bin/libgodot.ios.template_debug.x86_64.simulator.a /root/out/templates-dotnet/libgodot.ios.debug.simulator.a
+fi
+
 echo "iOS build successful"

build-linux/build.sh

@@ -4,9 +4,10 @@ set -e
 
 # Config
 
-export SCONS="scons -j${NUM_CORES} verbose=yes warnings=no progress=no"
-export OPTIONS="production=yes"
+export SCONS="scons -j${NUM_CORES} verbose=yes warnings=no progress=no redirect_build_objects=no"
+export OPTIONS="production=yes accesskit_sdk_path=/root/accesskit/accesskit-c"
 export OPTIONS_MONO="module_mono_enabled=yes"
+export OPTIONS_DOTNET="module_dotnet_enabled=yes"
 export TERM=xterm
 
 rm -rf godot
@@ -137,4 +138,62 @@ if [ "${MONO}" == "1" ]; then
   rm -rf bin
 fi
 
+# .NET
+
+if [ "${DOTNET}" == "1" ]; then
+  echo "Starting .NET build for Linux..."
+
+  export PATH="${GODOT_SDK_LINUX_X86_64}/bin:${BASE_PATH}"
+
+  $SCONS platform=linuxbsd arch=x86_64 $OPTIONS $OPTIONS_DOTNET target=editor
+  mkdir -p /root/out/x86_64/tools-dotnet
+  cp -rvp bin/* /root/out/x86_64/tools-dotnet
+  rm -rf bin
+
+  $SCONS platform=linuxbsd arch=x86_64 $OPTIONS $OPTIONS_DOTNET target=template_debug
+  $SCONS platform=linuxbsd arch=x86_64 $OPTIONS $OPTIONS_DOTNET target=template_release
+  mkdir -p /root/out/x86_64/templates-dotnet
+  cp -rvp bin/* /root/out/x86_64/templates-dotnet
+  rm -rf bin
+
+  export PATH="${GODOT_SDK_LINUX_X86_32}/bin:${BASE_PATH}"
+
+  $SCONS platform=linuxbsd arch=x86_32 $OPTIONS $OPTIONS_DOTNET target=editor
+  mkdir -p /root/out/x86_32/tools-dotnet
+  cp -rvp bin/* /root/out/x86_32/tools-dotnet
+  rm -rf bin
+
+  $SCONS platform=linuxbsd arch=x86_32 $OPTIONS $OPTIONS_DOTNET target=template_debug
+  $SCONS platform=linuxbsd arch=x86_32 $OPTIONS $OPTIONS_DOTNET target=template_release
+  mkdir -p /root/out/x86_32/templates-dotnet
+  cp -rvp bin/* /root/out/x86_32/templates-dotnet
+  rm -rf bin
+
+  export PATH="${GODOT_SDK_LINUX_ARM64}/bin:${BASE_PATH}"
+
+  $SCONS platform=linuxbsd arch=arm64 $OPTIONS $OPTIONS_DOTNET target=editor
+  mkdir -p /root/out/arm64/tools-dotnet
+  cp -rvp bin/* /root/out/arm64/tools-dotnet
+  rm -rf bin
+
+  $SCONS platform=linuxbsd arch=arm64 $OPTIONS $OPTIONS_DOTNET target=template_debug
+  $SCONS platform=linuxbsd arch=arm64 $OPTIONS $OPTIONS_DOTNET target=template_release
+  mkdir -p /root/out/arm64/templates-dotnet
+  cp -rvp bin/* /root/out/arm64/templates-dotnet
+  rm -rf bin
+
+  export PATH="${GODOT_SDK_LINUX_ARM32}/bin:${BASE_PATH}"
+
+  $SCONS platform=linuxbsd arch=arm32 $OPTIONS $OPTIONS_DOTNET target=editor
+  mkdir -p /root/out/arm32/tools-dotnet
+  cp -rvp bin/* /root/out/arm32/tools-dotnet
+  rm -rf bin
+
+  $SCONS platform=linuxbsd arch=arm32 $OPTIONS $OPTIONS_DOTNET target=template_debug
+  $SCONS platform=linuxbsd arch=arm32 $OPTIONS $OPTIONS_DOTNET target=template_release
+  mkdir -p /root/out/arm32/templates-dotnet
+  cp -rvp bin/* /root/out/arm32/templates-dotnet
+  rm -rf bin
+fi
+
 echo "Linux build successful"

build-macos/build.sh

@@ -4,9 +4,10 @@ set -e
 
 # Config
 
-export SCONS="scons -j${NUM_CORES} verbose=yes warnings=no progress=no"
-export OPTIONS="osxcross_sdk=darwin24.2 production=yes use_volk=no vulkan_sdk_path=/root/moltenvk angle_libs=/root/angle"
+export SCONS="scons -j${NUM_CORES} verbose=yes warnings=no progress=no redirect_build_objects=no"
+export OPTIONS="osxcross_sdk=darwin25.1 production=yes use_volk=no vulkan_sdk_path=/root/moltenvk angle_libs=/root/angle accesskit_sdk_path=/root/accesskit/accesskit-c SWIFT_FRONTEND=/root/.local/share/swiftly/toolchains/6.2.1/usr/bin/swift-frontend"
 export OPTIONS_MONO="module_mono_enabled=yes"
+export OPTIONS_DOTNET="module_dotnet_enabled=yes"
 export TERM=xterm
 
 rm -rf godot
@@ -68,4 +69,29 @@ if [ "${MONO}" == "1" ]; then
   rm -rf bin
 fi
 
+# .NET
+
+if [ "${DOTNET}" == "1" ]; then
+  echo "Starting .NET build for macOS..."
+
+  $SCONS platform=macos $OPTIONS $OPTIONS_DOTNET arch=x86_64 target=editor
+  $SCONS platform=macos $OPTIONS $OPTIONS_DOTNET arch=arm64 target=editor
+  lipo -create bin/godot.macos.editor.x86_64.dotnet bin/godot.macos.editor.arm64.dotnet -output bin/godot.macos.editor.universal.dotnet
+
+  mkdir -p /root/out/tools-dotnet
+  cp -rvp bin/* /root/out/tools-dotnet
+  rm -rf bin
+
+  $SCONS platform=macos $OPTIONS $OPTIONS_DOTNET arch=x86_64 target=template_debug
+  $SCONS platform=macos $OPTIONS $OPTIONS_DOTNET arch=arm64 target=template_debug
+  lipo -create bin/godot.macos.template_debug.x86_64.dotnet bin/godot.macos.template_debug.arm64.dotnet -output bin/godot.macos.template_debug.universal.dotnet
+  $SCONS platform=macos $OPTIONS $OPTIONS_DOTNET arch=x86_64 target=template_release
+  $SCONS platform=macos $OPTIONS $OPTIONS_DOTNET arch=arm64 target=template_release
+  lipo -create bin/godot.macos.template_release.x86_64.dotnet bin/godot.macos.template_release.arm64.dotnet -output bin/godot.macos.template_release.universal.dotnet
+
+  mkdir -p /root/out/templates-dotnet
+  cp -rvp bin/* /root/out/templates-dotnet
+  rm -rf bin
+fi
+
 echo "macOS build successful"

build-release.sh

@@ -12,17 +12,17 @@ exec > >(tee -a "out/logs/build-release") 2>&1
 source ./config.sh
 
 can_sign_windows=0
-if [ ! -z "${SIGN_KEYSTORE}" ] && [ ! -z "${SIGN_PASSWORD}" ] && [[ $(type -P "osslsigncode") ]]; then
+if [ ! -z "${WINDOWS_SIGN_NAME}" ] && [ ! -z "${WINDOWS_SIGN_URL}" ] && [[ $(type -P "osslsigncode") ]]; then
   can_sign_windows=1
 else
-  echo "Disabling Windows binary signing as config.sh does not define the required data (SIGN_KEYSTORE, SIGN_PASSWORD), or osslsigncode can't be found in PATH."
+  echo "Disabling Windows binary signing as config.sh does not define the required data (WINDOWS_SIGN_NAME, WINDOWS_SIGN_URL), or osslsigncode can't be found in PATH."
 fi
 
 sign_windows() {
   if [ $can_sign_windows == 0 ]; then
     return
   fi
-  osslsigncode sign -pkcs12 ${SIGN_KEYSTORE} -pass "${SIGN_PASSWORD}" -n "${SIGN_NAME}" -i "${SIGN_URL}" -t http://timestamp.comodoca.com -in $1 -out $1-signed
+  P11_KIT_SERVER_ADDRESS=unix:path=/run/p11-kit/p11kit.sock osslsigncode sign -pkcs11module /usr/lib64/pkcs11/p11-kit-client.so -pkcs11cert 'pkcs11:model=SimplySign%20C' -key 'pkcs11:model=SimplySign%20C' -t http://time.certum.pl/ -n "${WINDOWS_SIGN_NAME}" -i "${WINDOWS_SIGN_URL}" -in $1 -out $1-signed
   mv $1-signed $1
 }
 
@@ -33,13 +33,10 @@ sign_macos() {
   _macos_tmpdir=$(ssh "${OSX_HOST}" "mktemp -d")
   _reldir="$1"
   _binname="$2"
-  _is_mono="$3"
+  _appname="$3"
 
-  if [[ "${_is_mono}" == "1" ]]; then
-    _appname="Godot_mono.app"
+  if [[ "${_appname}" == "Godot_mono.app" ]]; then
     _sharpdir="${_appname}/Contents/Resources/GodotSharp"
-  else
-    _appname="Godot.app"
   fi
 
   scp "${_reldir}/${_binname}.zip" "${OSX_HOST}:${_macos_tmpdir}"
@@ -76,7 +73,6 @@ sign_macos_template() {
   fi
   _macos_tmpdir=$(ssh "${OSX_HOST}" "mktemp -d")
   _reldir="$1"
-  _is_mono="$2"
 
   scp "${_reldir}/macos.zip" "${OSX_HOST}:${_macos_tmpdir}"
   ssh "${OSX_HOST}" "
@@ -97,6 +93,7 @@ do_cleanup=1
 make_tarball=1
 build_classical=1
 build_mono=1
+build_dotnet=0
 
 while getopts "h?v:t:b:n-:" opt; do
   case "$opt" in
@@ -105,7 +102,7 @@ while getopts "h?v:t:b:n-:" opt; do
     echo
     echo "  -v godot version (e.g: 3.2-stable) [mandatory]"
     echo "  -t templates version (e.g. 3.2.stable) [mandatory]"
-    echo "  -b build target: all|classical|mono|none (default: all)"
+    echo "  -b build target: all|classical|mono|dotnet|none (default: all)"
     echo "  --no-cleanup disable deleting pre-existing output folders (default: false)"
     echo "  --no-tarball disable generating source tarball (default: false)"
     echo
@@ -119,12 +116,21 @@ while getopts "h?v:t:b:n-:" opt; do
     ;;
   b)
     if [ "$OPTARG" == "classical" ]; then
+      build_classical=1
       build_mono=0
+      build_dotnet=0
     elif [ "$OPTARG" == "mono" ]; then
       build_classical=0
+      build_mono=1
+      build_dotnet=0
+    elif [ "$OPTARG" == "dotnet" ]; then
+      build_classical=0
+      build_mono=0
+      build_dotnet=1
     elif [ "$OPTARG" == "none" ]; then
       build_classical=0
       build_mono=0
+      build_dotnet=0
     fi
     ;;
   -)
@@ -156,9 +162,11 @@ fi
 
 export reldir="${basedir}/releases/${godot_version}"
 export reldir_mono="${reldir}/mono"
+export reldir_dotnet="${reldir}/dotnet"
 export tmpdir="${basedir}/tmp"
 export templatesdir="${tmpdir}/templates"
 export templatesdir_mono="${tmpdir}/mono/templates"
+export templatesdir_dotnet="${tmpdir}/dotnet/templates"
 export webdir="${basedir}/web/${templates_version}"
 export steamdir="${basedir}/steam"
 
@@ -174,9 +182,15 @@ if [ "${do_cleanup}" == "1" ]; then
   rm -rf ${steamdir}
 
   mkdir -p ${reldir}
-  mkdir -p ${reldir_mono}
+  if [ "${build_mono}" ]; then
+    mkdir -p ${reldir_mono}
+  fi
+  if [ "${build_dotnet}" ]; then
+    mkdir -p ${reldir_dotnet}
+  fi
   mkdir -p ${templatesdir}
   mkdir -p ${templatesdir_mono}
+  mkdir -p ${templatesdir_dotnet}
   mkdir -p ${webdir}
   if [ -d out/windows/steam ]; then
     mkdir -p ${steamdir}
@@ -294,7 +308,7 @@ if [ "${build_classical}" == "1" ]; then
   chmod +x Godot.app/Contents/MacOS/Godot
   zip -q -9 -r "${reldir}/${binname}.zip" Godot.app
   rm -rf Godot.app
-  sign_macos ${reldir} ${binname} 0
+  sign_macos ${reldir} ${binname} Godot.app
 
   # Templates
   rm -rf macos_template.app
@@ -306,7 +320,7 @@ if [ "${build_classical}" == "1" ]; then
   chmod +x macos_template.app/Contents/MacOS/godot_macos*
   zip -q -9 -r "${templatesdir}/macos.zip" macos_template.app
   rm -rf macos_template.app
-  sign_macos_template ${templatesdir} 0
+  sign_macos_template ${templatesdir}
 
   ## Steam (Classical) ##
 
@@ -362,10 +376,14 @@ if [ "${build_classical}" == "1" ]; then
   cp out/android/templates/*.apk ${templatesdir}/
   cp out/android/templates/android_source.zip ${templatesdir}/
 
+  # Native debug symbols
+  cp out/android/templates/android_release_template_native_debug_symbols.zip ${reldir}/Godot_native_debug_symbols.${templates_version}.template_release.android.zip
+  cp out/android/tools/android_editor_native_debug_symbols.zip ${reldir}/Godot_native_debug_symbols.${templates_version}.editor.android.zip
+
   ## iOS (Classical) ##
 
   rm -rf ios_xcode
-  cp -r git/misc/dist/ios_xcode ios_xcode
+  cp -r git/misc/dist/apple_embedded_xcode ios_xcode
   cp out/ios/templates/libgodot.ios.simulator.a ios_xcode/libgodot.ios.release.xcframework/ios-arm64_x86_64-simulator/libgodot.a
   cp out/ios/templates/libgodot.ios.debug.simulator.a ios_xcode/libgodot.ios.debug.xcframework/ios-arm64_x86_64-simulator/libgodot.a
   cp out/ios/templates/libgodot.ios.a ios_xcode/libgodot.ios.release.xcframework/ios-arm64/libgodot.a
@@ -377,6 +395,17 @@ if [ "${build_classical}" == "1" ]; then
   cd ..
   rm -rf ios_xcode
 
+  ## visionOS (Classical) ##
+
+  #rm -rf visionos_xcode
+  #cp -r git/misc/dist/apple_embedded_xcode visionos_xcode
+  #cp out/visionos/templates/libgodot.visionos.a visionos_xcode/libgodot.visionos.release.xcframework/xros-arm64/libgodot.a
+  #cp out/visionos/templates/libgodot.visionos.debug.a visionos_xcode/libgodot.visionos.debug.xcframework/xros-arm64/libgodot.a
+  #cd visionos_xcode
+  #zip -q -9 -r "${templatesdir}/visionos.zip" *
+  #cd ..
+  #rm -rf visionos_xcode
+
   ## Templates TPZ (Classical) ##
 
   echo "${templates_version}" > ${templatesdir}/version.txt
@@ -508,7 +537,7 @@ if [ "${build_mono}" == "1" ]; then
   chmod +x Godot_mono.app/Contents/MacOS/Godot
   zip -q -9 -r "${reldir_mono}/${binname}.zip" Godot_mono.app
   rm -rf Godot_mono.app
-  sign_macos ${reldir_mono} ${binname} 1
+  sign_macos ${reldir_mono} ${binname} Godot_mono.app
 
   # Templates
   rm -rf macos_template.app
@@ -519,7 +548,7 @@ if [ "${build_mono}" == "1" ]; then
   chmod +x macos_template.app/Contents/MacOS/godot_macos*
   zip -q -9 -r "${templatesdir_mono}/macos.zip" macos_template.app
   rm -rf macos_template.app
-  sign_macos_template ${templatesdir_mono} 1
+  sign_macos_template ${templatesdir_mono}
 
   ## Android (Mono) ##
 
@@ -533,7 +562,7 @@ if [ "${build_mono}" == "1" ]; then
   ## iOS (Mono) ##
 
   rm -rf ios_xcode
-  cp -r git/misc/dist/ios_xcode ios_xcode
+  cp -r git/misc/dist/apple_embedded_xcode ios_xcode
   cp out/ios/templates-mono/libgodot.ios.simulator.a ios_xcode/libgodot.ios.release.xcframework/ios-arm64_x86_64-simulator/libgodot.a
   cp out/ios/templates-mono/libgodot.ios.debug.simulator.a ios_xcode/libgodot.ios.debug.xcframework/ios-arm64_x86_64-simulator/libgodot.a
   cp out/ios/templates-mono/libgodot.ios.a ios_xcode/libgodot.ios.release.xcframework/ios-arm64/libgodot.a
@@ -545,6 +574,17 @@ if [ "${build_mono}" == "1" ]; then
   cd ..
   rm -rf ios_xcode
 
+  ## visionOS (Mono) ##
+
+  #rm -rf visionos_xcode
+  #cp -r git/misc/dist/apple_embedded_xcode visionos_xcode
+  #cp out/visionos/templates-mono/libgodot.visionos.a visionos_xcode/libgodot.visionos.release.xcframework/xros-arm64/libgodot.a
+  #cp out/visionos/templates-mono/libgodot.visionos.debug.a visionos_xcode/libgodot.visionos.debug.xcframework/xros-arm64/libgodot.a
+  #cd visionos_xcode
+  #zip -q -9 -r "${templatesdir_mono}/visionos.zip" *
+  #cd ..
+  #rm -rf visionos_xcode
+
   # No .NET support for those platforms yet.
 
   if false; then
@@ -574,4 +614,153 @@ if [ "${build_mono}" == "1" ]; then
 
 fi
 
+# .NET
+
+if [ "${build_dotnet}" == "1" ]; then
+
+  ## Linux (.NET) ##
+
+  for arch in x86_64 x86_32 arm64 arm32; do
+    # Editor
+    binname="${godot_basename}_dotnet_linux.${arch}"
+    cp out/linux/${arch}/tools-dotnet/godot.linuxbsd.editor.${arch}.dotnet ${binname}
+    zip -r -q -9 "${reldir_dotnet}/${binname}.zip" ${binname}
+    rm ${binname}
+
+    # Templates
+    cp out/linux/${arch}/templates-dotnet/godot.linuxbsd.template_debug.${arch}.dotnet ${templatesdir_dotnet}/linux_debug.${arch}
+    cp out/linux/${arch}/templates-dotnet/godot.linuxbsd.template_release.${arch}.dotnet ${templatesdir_dotnet}/linux_release.${arch}
+  done
+
+  # ICU data
+  if [ -f ${basedir}/git/thirdparty/icu4c/icudt_godot.dat ]; then
+    cp ${basedir}/git/thirdparty/icu4c/icudt_godot.dat ${templatesdir_dotnet}/icudt_godot.dat
+  else
+    echo "icudt_godot.dat" not found.
+  fi
+
+  ## Windows (.NET) ##
+
+  declare -A win_arch_map=(
+    ["x86_64"]="win64"
+    ["x86_32"]="win32"
+    ["arm64"]="arm64"
+  )
+
+  for arch in x86_64 x86_32 arm64; do
+    # Editor
+    winarch=${win_arch_map[${arch}]}
+    binname="${godot_basename}_dotnet_${winarch}.exe"
+    wrpname="${godot_basename}_dotnet_${winarch}_console.exe"
+    [[ "${arch}" == "arm64" ]] && is_llvm=".llvm"
+    cp out/windows/${arch}/tools-dotnet/godot.windows.editor.${arch}${is_llvm}.dotnet.exe ${binname}
+    sign_windows ${binname}
+    cp out/windows/${arch}/tools-dotnet/godot.windows.editor.${arch}${is_llvm}.dotnet.console.exe ${wrpname}
+    sign_windows ${wrpname}
+    zip -r -q -9 "${reldir_dotnet}/${binname}.zip" ${binname} ${wrpname}
+    rm ${binname} ${wrpname}
+
+    # Templates
+    cp out/windows/${arch}/templates-dotnet/godot.windows.template_debug.${arch}${is_llvm}.dotnet.exe ${templatesdir_dotnet}/windows_debug_${arch}.exe
+    cp out/windows/${arch}/templates-dotnet/godot.windows.template_release.${arch}${is_llvm}.dotnet.exe ${templatesdir_dotnet}/windows_release_${arch}.exe
+    cp out/windows/${arch}/templates-dotnet/godot.windows.template_debug.${arch}${is_llvm}.dotnet.console.exe ${templatesdir_dotnet}/windows_debug_${arch}_console.exe
+    cp out/windows/${arch}/templates-dotnet/godot.windows.template_release.${arch}${is_llvm}.dotnet.console.exe ${templatesdir_dotnet}/windows_release_${arch}_console.exe
+  done
+
+  ## macOS (.NET) ##
+
+  # Editor
+  binname="${godot_basename}_dotnet_macos.universal"
+  rm -rf Godot_dotnet.app
+  cp -r git/misc/dist/macos_tools.app Godot_dotnet.app
+  mkdir -p Godot_dotnet.app/Contents/MacOS
+  cp out/macos/tools-dotnet/godot.macos.editor.universal.dotnet Godot_dotnet.app/Contents/MacOS/Godot
+  chmod +x Godot_dotnet.app/Contents/MacOS/Godot
+  zip -q -9 -r "${reldir_dotnet}/${binname}.zip" Godot_dotnet.app
+  rm -rf Godot_dotnet.app
+  sign_macos ${reldir_dotnet} ${binname} Godot_dotnet.app
+
+  # Templates
+  rm -rf macos_template.app
+  cp -r git/misc/dist/macos_template.app .
+  mkdir -p macos_template.app/Contents/MacOS
+  cp out/macos/templates-dotnet/godot.macos.template_debug.universal.dotnet macos_template.app/Contents/MacOS/godot_macos_debug.universal
+  cp out/macos/templates-dotnet/godot.macos.template_release.universal.dotnet macos_template.app/Contents/MacOS/godot_macos_release.universal
+  chmod +x macos_template.app/Contents/MacOS/godot_macos*
+  zip -q -9 -r "${templatesdir_dotnet}/macos.zip" macos_template.app
+  rm -rf macos_template.app
+  sign_macos_template ${templatesdir_dotnet}
+
+  ## Android (.NET) ##
+
+  # Lib for direct download
+  cp out/android/templates-dotnet/godot-lib.template_release.aar ${reldir_dotnet}/godot-lib.${templates_version}.dotnet.template_release.aar
+
+  # Templates
+  cp out/android/templates-dotnet/*.apk ${templatesdir_dotnet}/
+  cp out/android/templates-dotnet/android_source.zip ${templatesdir_dotnet}/
+
+  ## iOS (.NET) ##
+
+  rm -rf ios_xcode
+  cp -r git/misc/dist/apple_embedded_xcode ios_xcode
+  cp out/ios/templates-dotnet/libgodot.ios.simulator.a ios_xcode/libgodot.ios.release.xcframework/ios-arm64_x86_64-simulator/libgodot.a
+  cp out/ios/templates-dotnet/libgodot.ios.debug.simulator.a ios_xcode/libgodot.ios.debug.xcframework/ios-arm64_x86_64-simulator/libgodot.a
+  cp out/ios/templates-dotnet/libgodot.ios.a ios_xcode/libgodot.ios.release.xcframework/ios-arm64/libgodot.a
+  cp out/ios/templates-dotnet/libgodot.ios.debug.a ios_xcode/libgodot.ios.debug.xcframework/ios-arm64/libgodot.a
+  cp -r deps/moltenvk/MoltenVK/MoltenVK.xcframework ios_xcode/
+  rm -rf ios_xcode/MoltenVK.xcframework/{macos,tvos}*
+  cd ios_xcode
+  zip -q -9 -r "${templatesdir_dotnet}/ios.zip" *
+  cd ..
+  rm -rf ios_xcode
+
+  ## visionOS (.NET) ##
+
+  #rm -rf visionos_xcode
+  #cp -r git/misc/dist/apple_embedded_xcode visionos_xcode
+  #cp out/visionos/templates-dotnet/libgodot.visionos.a visionos_xcode/libgodot.visionos.release.xcframework/xros-arm64/libgodot.a
+  #cp out/visionos/templates-dotnet/libgodot.visionos.debug.a visionos_xcode/libgodot.visionos.debug.xcframework/xros-arm64/libgodot.a
+  #cd visionos_xcode
+  #zip -q -9 -r "${templatesdir_dotnet}/visionos.zip" *
+  #cd ..
+  #rm -rf visionos_xcode
+
+  # No .NET support for those platforms yet.
+
+  if false; then
+
+  ## Web (.NET) ##
+
+  # Templates
+  cp out/web/templates-dotnet/godot.web.template_debug.wasm32.dotnet.zip ${templatesdir_dotnet}/web_debug.zip
+  cp out/web/templates-dotnet/godot.web.template_release.wasm32.dotnet.zip ${templatesdir_dotnet}/web_release.zip
+
+  fi
+
+  ## Templates TPZ (.NET) ##
+
+  echo "${templates_version}.dotnet" > ${templatesdir_dotnet}/version.txt
+  pushd ${templatesdir_dotnet}/..
+  zip -q -9 -r -D "${reldir_dotnet}/${godot_basename}_dotnet_export_templates.tpz" templates/*
+  popd
+
+  ## .NET bindings ##
+
+  dotnetname="godot-dotnet-${templates_version}"
+  mkdir ${dotnetname}
+  cp out/dotnet/* ${dotnetname}/
+  zip -q -9 -r "${reldir_dotnet}/${dotnetname}.zip" ${dotnetname}
+  rm -rf ${dotnetname}
+
+  ## SHA-512 sums (.NET) ##
+
+  pushd ${reldir_dotnet}
+  sha512sum [Gg]* >> SHA512-SUMS.txt
+  mkdir -p ${basedir}/sha512sums/${godot_version}/dotnet
+  cp SHA512-SUMS.txt ${basedir}/sha512sums/${godot_version}/dotnet/
+  popd
+
+fi
+
 echo "All editor binaries and templates prepared successfully for release"

build-visionos/build.sh

@@ -0,0 +1,82 @@
+#!/bin/bash
+
+set -e
+
+# Config
+
+export SCONS="scons -j${NUM_CORES} verbose=yes warnings=no progress=no redirect_build_objects=no"
+# Keep LTO disabled for visionOS - it works but it makes linking apps on deploy very slow,
+# which is seen as a regression in the current workflow.
+# Disable Vulkan and MoltenVK for visionOS - visionOS doesn't support MoltenVK.
+export OPTIONS="production=yes use_lto=no vulkan=no SWIFT_FRONTEND=/root/.local/share/swiftly/toolchains/6.2.0/usr/bin/swift-frontend"
+export OPTIONS_MONO="module_mono_enabled=yes"
+export OPTIONS_DOTNET="module_dotnet_enabled=yes"
+export TERM=xterm
+
+export VISIONOS_SDK="26.0"
+export VISIONOS_DEVICE="VISIONOS_SDK_PATH=/root/Xcode.app/Contents/Developer/Platforms/XROS.platform/Developer/SDKs/XROS${VISIONOS_SDK}.sdk"
+export VISIONOS_SIMULATOR="VISIONOS_SDK_PATH=/root/Xcode.app/Contents/Developer/Platforms/XRSimulator.platform/Developer/SDKs/XRSimulator${VISIONOS_SDK}.sdk"
+export APPLE_TARGET_ARM64="APPLE_TOOLCHAIN_PATH=/root/ioscross/arm64 apple_target_triple=arm-apple-darwin11-"
+
+rm -rf godot
+mkdir godot
+cd godot
+tar xf /root/godot.tar.gz --strip-components=1
+
+# Classical
+
+if [ "${CLASSICAL}" == "1" ]; then
+  echo "Starting classical build for visionOS..."
+
+  # arm64 device
+  $SCONS platform=visionos $OPTIONS arch=arm64 target=template_debug $VISIONOS_DEVICE $APPLE_TARGET_ARM64
+  $SCONS platform=visionos $OPTIONS arch=arm64 target=template_release $VISIONOS_DEVICE $APPLE_TARGET_ARM64
+
+  # arm64 simulator (disabled for now, see build-ios)
+  #$SCONS platform=visionos $OPTIONS arch=arm64 target=template_debug $VISIONOS_SIMULATOR $APPLE_TARGET_ARM64
+  #$SCONS platform=visionos $OPTIONS arch=arm64 target=template_release $VISIONOS_SIMULATOR $APPLE_TARGET_ARM64
+
+  mkdir -p /root/out/templates
+  cp bin/libgodot.visionos.template_release.arm64.a /root/out/templates/libgodot.visionos.a
+  cp bin/libgodot.visionos.template_debug.arm64.a /root/out/templates/libgodot.visionos.debug.a
+fi
+
+# Mono
+
+if [ "${MONO}" == "1" ]; then
+  echo "Starting Mono build for visionOS..."
+
+  cp -r /root/mono-glue/GodotSharp/GodotSharp/Generated modules/mono/glue/GodotSharp/GodotSharp/
+
+  # arm64 device
+  $SCONS platform=visionos $OPTIONS $OPTIONS_MONO arch=arm64 target=template_debug $VISIONOS_DEVICE $APPLE_TARGET_ARM64
+  $SCONS platform=visionos $OPTIONS $OPTIONS_MONO arch=arm64 target=template_release $VISIONOS_DEVICE $APPLE_TARGET_ARM64
+
+  # arm64 simulator (disabled for now, see build-ios)
+  #$SCONS platform=visionos $OPTIONS $OPTIONS_MONO arch=arm64 target=template_debug $VISIONOS_SIMULATOR $APPLE_TARGET_ARM64
+  #$SCONS platform=visionos $OPTIONS $OPTIONS_MONO arch=arm64 target=template_release $VISIONOS_SIMULATOR $APPLE_TARGET_ARM64
+
+  mkdir -p /root/out/templates-mono
+  cp bin/libgodot.visionos.template_release.arm64.a /root/out/templates-mono/libgodot.visionos.a
+  cp bin/libgodot.visionos.template_debug.arm64.a /root/out/templates-mono/libgodot.visionos.debug.a
+fi
+
+# .NET
+
+if [ "${DOTNET}" == "1" ]; then
+  echo "Starting .NET build for visionOS..."
+
+  # arm64 device
+  $SCONS platform=visionos $OPTIONS $OPTIONS_DOTNET arch=arm64 target=template_debug $VISIONOS_DEVICE $APPLE_TARGET_ARM64
+  $SCONS platform=visionos $OPTIONS $OPTIONS_DOTNET arch=arm64 target=template_release $VISIONOS_DEVICE $APPLE_TARGET_ARM64
+
+  # arm64 simulator (disabled for now, see build-ios)
+  #$SCONS platform=visionos $OPTIONS $OPTIONS_DOTNET arch=arm64 target=template_debug $VISIONOS_SIMULATOR $APPLE_TARGET_ARM64
+  #$SCONS platform=visionos $OPTIONS $OPTIONS_DOTNET arch=arm64 target=template_release $VISIONOS_SIMULATOR $APPLE_TARGET_ARM64
+
+  mkdir -p /root/out/templates-dotnet
+  cp bin/libgodot.visionos.template_release.arm64.a /root/out/templates-dotnet/libgodot.visionos.a
+  cp bin/libgodot.visionos.template_debug.arm64.a /root/out/templates-dotnet/libgodot.visionos.debug.a
+fi
+
+echo "visionOS build successful"

build-web/build.sh

@@ -20,9 +20,10 @@ declare -a JOBS_NOTHREADS=(
   "target=template_release dlink_enabled=yes threads=no"
 )
 
-export SCONS="scons -j$(expr ${NUM_CORES} / ${NUM_JOBS}) verbose=yes warnings=no progress=no"
+export SCONS="scons -j$(expr ${NUM_CORES} / ${NUM_JOBS}) verbose=yes warnings=no progress=no redirect_build_objects=no"
 export OPTIONS="production=yes"
 export OPTIONS_MONO="module_mono_enabled=yes -j${NUM_CORES}"
+export OPTIONS_MONO="module_dotnet_enabled=yes -j${NUM_CORES}"
 export TERM=xterm
 
 source /root/emsdk/emsdk_env.sh
@@ -94,4 +95,26 @@ if false; then
   rm -f bin/*.zip
 fi
 
+
+
+
+# .NET
+
+
+
+
+
+# No Web support with .NET yet.
+#if [ "${DOTNET}" == "1" ]; then
+if false; then
+  echo "Starting .NET build for Web..."
+
+  $SCONS platform=web ${OPTIONS} ${OPTIONS_DOTNET} target=template_debug
+  $SCONS platform=web ${OPTIONS} ${OPTIONS_DOTNET} target=template_release
+
+  mkdir -p /root/out/templates-dotnet
+  cp -rvp bin/*.zip /root/out/templates-dotnet
+  rm -f bin/*.zip
+fi
+
 echo "Web build successful"

build-windows/build.sh

@@ -4,9 +4,10 @@ set -e
 
 # Config
 
-export SCONS="scons -j${NUM_CORES} verbose=yes warnings=no progress=no"
-export OPTIONS="production=yes use_mingw=yes angle_libs=/root/angle mesa_libs=/root/mesa d3d12=yes"
+export SCONS="scons -j${NUM_CORES} verbose=yes warnings=no progress=no redirect_build_objects=no"
+export OPTIONS="production=yes use_mingw=yes angle_libs=/root/angle mesa_libs=/root/mesa d3d12=yes accesskit_sdk_path=/root/accesskit/accesskit-c"
 export OPTIONS_MONO="module_mono_enabled=yes"
+export OPTIONS_DOTNET="module_dotnet_enabled=yes"
 export OPTIONS_LLVM="use_llvm=yes mingw_prefix=/root/llvm-mingw"
 export TERM=xterm
 
@@ -110,4 +111,43 @@ if [ "${MONO}" == "1" ]; then
   rm -rf bin
 fi
 
+# .NET
+
+if [ "${DOTNET}" == "1" ]; then
+  echo "Starting .NET build for Windows..."
+
+  $SCONS platform=windows arch=x86_64 $OPTIONS $OPTIONS_DOTNET target=editor
+  mkdir -p /root/out/x86_64/tools-dotnet
+  cp -rvp bin/* /root/out/x86_64/tools-dotnet
+  rm -rf bin
+
+  $SCONS platform=windows arch=x86_64 $OPTIONS $OPTIONS_DOTNET target=template_debug
+  $SCONS platform=windows arch=x86_64 $OPTIONS $OPTIONS_DOTNET target=template_release
+  mkdir -p /root/out/x86_64/templates-dotnet
+  cp -rvp bin/* /root/out/x86_64/templates-dotnet
+  rm -rf bin
+
+  $SCONS platform=windows arch=x86_32 $OPTIONS $OPTIONS_DOTNET target=editor
+  mkdir -p /root/out/x86_32/tools-dotnet
+  cp -rvp bin/* /root/out/x86_32/tools-dotnet
+  rm -rf bin
+
+  $SCONS platform=windows arch=x86_32 $OPTIONS $OPTIONS_DOTNET target=template_debug
+  $SCONS platform=windows arch=x86_32 $OPTIONS $OPTIONS_DOTNET target=template_release
+  mkdir -p /root/out/x86_32/templates-dotnet
+  cp -rvp bin/* /root/out/x86_32/templates-dotnet
+  rm -rf bin
+
+  $SCONS platform=windows arch=arm64 $OPTIONS $OPTIONS_DOTNET $OPTIONS_LLVM target=editor
+  mkdir -p /root/out/arm64/tools-dotnet
+  cp -rvp bin/* /root/out/arm64/tools-dotnet
+  rm -rf bin
+
+  $SCONS platform=windows arch=arm64 $OPTIONS $OPTIONS_DOTNET $OPTIONS_LLVM target=template_debug
+  $SCONS platform=windows arch=arm64 $OPTIONS $OPTIONS_DOTNET $OPTIONS_LLVM target=template_release
+  mkdir -p /root/out/arm64/templates-dotnet
+  cp -rvp bin/* /root/out/arm64/templates-dotnet
+  rm -rf bin
+fi
+
 echo "Windows build successful"

build.sh

@@ -36,6 +36,7 @@ godot_version=""
 git_treeish="master"
 build_classical=1
 build_mono=1
+build_dotnet=0
 build_steam=0
 force_download=0
 skip_download=1
@@ -51,7 +52,7 @@ while getopts "h?r:u:p:v:g:b:fsc" opt; do
     echo "  -p password"
     echo "  -v godot version (e.g. 3.1-alpha5) [mandatory]"
     echo "  -g git treeish (e.g. master)"
-    echo "  -b all|classical|mono (default: all)"
+    echo "  -b all|classical|mono|dotnet (default: all)"
     echo "  -f force redownload of all images"
     echo "  -s skip downloading"
     echo "  -c skip checkout"
@@ -75,9 +76,17 @@ while getopts "h?r:u:p:v:g:b:fsc" opt; do
     ;;
   b)
     if [ "$OPTARG" == "classical" ]; then
+      build_classical=1
       build_mono=0
+      build_dotnet=0
     elif [ "$OPTARG" == "mono" ]; then
       build_classical=0
+      build_mono=1
+      build_dotnet=0
+    elif [ "$OPTARG" == "dotnet" ]; then
+      build_classical=0
+      build_mono=0
+      build_dotnet=1
     fi
     ;;
   f)
@@ -133,7 +142,7 @@ if [ $skip_download == 0 ]; then
   if [ ! -z "${logged_in}" ]; then
     echo "Fetching private images"
 
-    for image in macosx android ios; do
+    for image in macosx android appleembedded; do
       if [ ${force_download} == 1 ] || ! ${podman} image exists godot-private/$image; then
         if ! ${podman} pull ${registry}/godot-private/${image}; then
           echo "ERROR: image $image does not exist and can't be downloaded"
@@ -156,15 +165,26 @@ if [ ! -d "deps/moltenvk" ]; then
   popd
 fi
 
+# accesskit-c for Windows, macOS and Linux
+if [ ! -d "deps/accesskit" ]; then
+  echo "Missing accesskit, downloading it."
+  mkdir -p deps/accesskit
+  pushd deps/accesskit
+  curl -L -o accesskit.zip https://github.com/godotengine/godot-accesskit-c-static/releases/download/0.18.0/accesskit-c-0.18.0.zip
+  unzip -o accesskit.zip && rm -f accesskit.zip
+  mv accesskit-c-* accesskit-c
+  popd
+fi
+
 # Windows and macOS need ANGLE
 if [ ! -d "deps/angle" ]; then
   echo "Missing ANGLE libraries, downloading them."
   mkdir -p deps/angle
   pushd deps/angle
-  base_url=https://github.com/godotengine/godot-angle-static/releases/download/chromium%2F6601.2/godot-angle-static
+  base_url=https://github.com/godotengine/godot-angle-static/releases/download/chromium%2F7578/godot-angle-static
   curl -L -o windows_arm64.zip $base_url-arm64-llvm-release.zip
-  curl -L -o windows_x86_64.zip $base_url-x86_64-gcc-release.zip
-  curl -L -o windows_x86_32.zip $base_url-x86_32-gcc-release.zip
+  curl -L -o windows_x86_64.zip $base_url-x86_64-gcc-13-release.zip
+  curl -L -o windows_x86_32.zip $base_url-x86_32-gcc-13-release.zip
   curl -L -o macos_arm64.zip $base_url-arm64-macos-release.zip
   curl -L -o macos_x86_64.zip $base_url-x86_64-macos-release.zip
   unzip -o windows_arm64.zip && rm -f windows_arm64.zip
@@ -179,9 +199,10 @@ if [ ! -d "deps/mesa" ]; then
   echo "Missing Mesa/NIR libraries, downloading them."
   mkdir -p deps/mesa
   pushd deps/mesa
-  curl -L -o mesa_arm64.zip https://github.com/godotengine/godot-nir-static/releases/download/23.1.9-1/godot-nir-static-arm64-llvm-release.zip
-  curl -L -o mesa_x86_64.zip https://github.com/godotengine/godot-nir-static/releases/download/23.1.9-1/godot-nir-static-x86_64-gcc-release.zip
-  curl -L -o mesa_x86_32.zip https://github.com/godotengine/godot-nir-static/releases/download/23.1.9-1/godot-nir-static-x86_32-gcc-release.zip
+  base_url=https://github.com/godotengine/godot-nir-static/releases/download/25.3.1-1/godot-nir-static
+  curl -L -o mesa_arm64.zip $base_url-arm64-llvm-release.zip
+  curl -L -o mesa_x86_64.zip $base_url-x86_64-gcc-release.zip
+  curl -L -o mesa_x86_32.zip $base_url-x86_32-gcc-release.zip
   unzip -o mesa_arm64.zip && rm -f mesa_arm64.zip
   unzip -o mesa_x86_64.zip && rm -f mesa_x86_64.zip
   unzip -o mesa_x86_32.zip && rm -f mesa_x86_32.zip
@@ -236,29 +257,35 @@ EOF
   popd
 fi
 
-export podman_run="${podman} run -it --rm --env BUILD_NAME=${BUILD_NAME} --env GODOT_VERSION_STATUS=${GODOT_VERSION_STATUS} --env NUM_CORES=${NUM_CORES} --env CLASSICAL=${build_classical} --env MONO=${build_mono} -v ${basedir}/godot-${godot_version}.tar.gz:/root/godot.tar.gz -v ${basedir}/mono-glue:/root/mono-glue -w /root/"
+export podman_run="${podman} run -it --rm --env BUILD_NAME=${BUILD_NAME} --env GODOT_VERSION_STATUS=${GODOT_VERSION_STATUS} --env NUM_CORES=${NUM_CORES} --env CLASSICAL=${build_classical} --env MONO=${build_mono} --env DOTNET=${build_dotnet} -v ${basedir}/godot-${godot_version}.tar.gz:/root/godot.tar.gz -v ${basedir}/mono-glue:/root/mono-glue -w /root/"
 export img_version=$IMAGE_VERSION
 
 mkdir -p ${basedir}/mono-glue
 ${podman_run} -v ${basedir}/build-mono-glue:/root/build localhost/godot-linux:${img_version} bash build/build.sh 2>&1 | tee ${basedir}/out/logs/mono-glue
 
+mkdir -p ${basedir}/out/dotnet
+${podman_run} -v ${basedir}/build-dotnet:/root/build -v ${basedir}/out/dotnet:/root/out --env GODOT_VERSION=${godot_version} localhost/godot-linux:${img_version} bash build/build.sh 2>&1 | tee ${basedir}/out/logs/dotnet
+
 mkdir -p ${basedir}/out/windows
-${podman_run} -v ${basedir}/build-windows:/root/build -v ${basedir}/out/windows:/root/out -v ${basedir}/deps/angle:/root/angle -v ${basedir}/deps/mesa:/root/mesa --env STEAM=${build_steam} localhost/godot-windows:${img_version} bash build/build.sh 2>&1 | tee ${basedir}/out/logs/windows
+${podman_run} -v ${basedir}/build-windows:/root/build -v ${basedir}/out/windows:/root/out -v ${basedir}/deps/angle:/root/angle -v ${basedir}/deps/mesa:/root/mesa -v ${basedir}/deps/accesskit:/root/accesskit --env STEAM=${build_steam} localhost/godot-windows:${img_version} bash build/build.sh 2>&1 | tee ${basedir}/out/logs/windows
 
 mkdir -p ${basedir}/out/linux
-${podman_run} -v ${basedir}/build-linux:/root/build -v ${basedir}/out/linux:/root/out localhost/godot-linux:${img_version} bash build/build.sh 2>&1 | tee ${basedir}/out/logs/linux
+${podman_run} -v ${basedir}/build-linux:/root/build -v ${basedir}/out/linux:/root/out -v ${basedir}/deps/accesskit:/root/accesskit localhost/godot-linux:${img_version} bash build/build.sh 2>&1 | tee ${basedir}/out/logs/linux
 
 mkdir -p ${basedir}/out/web
 ${podman_run} -v ${basedir}/build-web:/root/build -v ${basedir}/out/web:/root/out localhost/godot-web:${img_version} bash build/build.sh 2>&1 | tee ${basedir}/out/logs/web
 
 mkdir -p ${basedir}/out/macos
-${podman_run} -v ${basedir}/build-macos:/root/build -v ${basedir}/out/macos:/root/out -v ${basedir}/deps/moltenvk:/root/moltenvk -v ${basedir}/deps/angle:/root/angle localhost/godot-osx:${img_version} bash build/build.sh 2>&1 | tee ${basedir}/out/logs/macos
+${podman_run} -v ${basedir}/build-macos:/root/build -v ${basedir}/out/macos:/root/out -v ${basedir}/deps/accesskit:/root/accesskit -v ${basedir}/deps/moltenvk:/root/moltenvk -v ${basedir}/deps/angle:/root/angle localhost/godot-osx:${img_version} bash build/build.sh 2>&1 | tee ${basedir}/out/logs/macos
 
 mkdir -p ${basedir}/out/android
 ${podman_run} -v ${basedir}/build-android:/root/build -v ${basedir}/out/android:/root/out -v ${basedir}/deps/swappy:/root/swappy -v ${basedir}/deps/keystore:/root/keystore localhost/godot-android:${img_version} bash build/build.sh 2>&1 | tee ${basedir}/out/logs/android
 
 mkdir -p ${basedir}/out/ios
-${podman_run} -v ${basedir}/build-ios:/root/build -v ${basedir}/out/ios:/root/out localhost/godot-ios:${img_version} bash build/build.sh 2>&1 | tee ${basedir}/out/logs/ios
+${podman_run} -v ${basedir}/build-ios:/root/build -v ${basedir}/out/ios:/root/out localhost/godot-appleembedded:${img_version} bash build/build.sh 2>&1 | tee ${basedir}/out/logs/ios
+
+#mkdir -p ${basedir}/out/visionos
+#${podman_run} -v ${basedir}/build-visionos:/root/build -v ${basedir}/out/visionos:/root/out localhost/godot-appleembedded:${img_version} bash build/build.sh 2>&1 | tee ${basedir}/out/logs/visionos
 
 uid=$(id -un)
 gid=$(id -gn)
@@ -267,3 +294,5 @@ if [ ! -z "$SUDO_UID" ]; then
   gid="${SUDO_GID}"
 fi
 chown -R -f $uid:$gid ${basedir}/git ${basedir}/out ${basedir}/mono-glue ${basedir}/godot*.tar.gz
+
+echo "All builds completed. Check `out/logs/` to validate that they all succeeded (e.g. `tail -n 1 out/logs/*`)."

config.sh.in

@@ -52,19 +52,13 @@ export BUILD_NAME='custom_build'
 # Default number of parallel cores for each build.
 export NUM_CORES=16
 
-# Set up your own signing keystore and relevant details below.
+# Set up your own Windows signing details below.
 # If you do not fill all SIGN_* fields, signing will be skipped.
 
-# Path to pkcs12 archive.
-export SIGN_KEYSTORE=''
-
-# Password for the private key.
-export SIGN_PASSWORD=''
-
 # Name and URL of the signed application.
 # Use your own when making a thirdparty build.
-export SIGN_NAME=''
-export SIGN_URL=''
+export WINDOWS_SIGN_NAME=''
+export WINDOWS_SIGN_URL=''
 
 # Hostname or IP address of an OSX host (Needed for signing)
 # eg 'user@10.1.0.10'
@@ -104,3 +98,9 @@ export GODOT_ANDROID_SIGN_KEYSTORE=''
 export GODOT_ANDROID_KEYSTORE_ALIAS=''
 # Password for the key used for signing the release build
 export GODOT_ANDROID_SIGN_PASSWORD=''
+# Google Cloud Service Account JSON key with access to Play Console upload permissions
+# (View app information + Release apps to production and/or testing.)
+export GODOT_ANDROID_UPLOAD_JSON_KEY=''
+# Horizon Store app ID and secret.
+export GODOT_ANDROID_HORIZON_APP_ID=''
+export GODOT_ANDROID_HORIZON_APP_SECRET=''

publish-release.sh

@@ -181,6 +181,22 @@ else
   echo "Disabling NuGet package publishing as config.sh does not define the required data (NUGET_SOURCE, NUGET_API_KEY), or dotnet can't be found in PATH."
 fi
 
+# Godot Android Editor
+
+if [ -e "${GODOT_ANDROID_UPLOAD_JSON_KEY}" ]; then
+  echo "Publishing Android Editor to Play Store..."
+  sh build-android/upload-playstore.sh ${godot_version}
+else
+  echo "Disabling Android Editor publishing on the Play Store as no valid Play Store JSON key was found."
+fi
+
+if [ ! -z "${GODOT_ANDROID_HORIZON_APP_ID}" ] && [ ! -z "${GODOT_ANDROID_HORIZON_APP_SECRET}" ]; then
+  echo "Publishing Android Editor to Horizon Store..."
+  ./build-android/upload-horizon.sh ${godot_version} ${latest_stable}
+else
+  echo "Disabling Android Editor publishing on the Horizon Store as config.sh does not define the required data (GODOT_ANDROID_HORIZON_APP_ID, GODOT_ANDROID_HORIZON_SECRET)."
+fi
+
 # Godot Android library
 
 if [ -d "deps/keystore" ]; then