Trim down scripts to build Godot 2.1 with modern containers

Windows: Update godot-nir-static to 23.1.9-2 (#137 )
Companion PR to: - https://github.com/godotengine/godot-nir-static/pull/22 - https://github.com/godotengine/godot-nir-static/pull/23 - https://github.com/godotengine/godot/pull/111762
2026-01-01 09:48:47 +03:00 · 2025-11-26 21:39:36 +01:00 · 2025-11-04 01:11:07 +01:00 · 2025-10-29 10:52:10 +01:00 · 2025-10-27 18:29:54 +01:00 · 2025-10-18 12:18:14 +02:00
16 changed files with 386 additions and 1241 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@ config.sh
 *.jks
 *.pfx
 *.pkcs12
+/*.json

 # Generated by build scripts
 angle/
--- a/build-android/build.sh
+++ b/build-android/build.sh
@@ -4,127 +4,32 @@ set -e

 # Config

+# 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"
-export OPTIONS="production=yes"
-export OPTIONS_MONO="module_mono_enabled=yes"
-export TERM=xterm
+export OPTIONS=""

 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.
-source /root/keystore/config.sh
+echo "Starting classical build for Android..."
+$SCONS platform=android android_arch=armv7 $OPTIONS tools=no target=release_debug
+$SCONS platform=android android_arch=armv7 $OPTIONS tools=no target=release
+$SCONS platform=android android_arch=arm64v8 $OPTIONS tools=no target=release_debug
+$SCONS platform=android android_arch=arm64v8 $OPTIONS tools=no target=release
+$SCONS platform=android android_arch=x86 $OPTIONS tools=no target=release_debug
+$SCONS platform=android android_arch=x86 $OPTIONS tools=no target=release
+$SCONS platform=android android_arch=x86_64 $OPTIONS tools=no target=release_debug
+$SCONS platform=android android_arch=x86_64 $OPTIONS tools=no target=release

-store_release="yes"
-if [ -z "${GODOT_ANDROID_SIGN_KEYSTORE}" ]; then
-  echo "No keystore provided to sign the Android release editor build, using debug build instead."
-  store_release="no"
-fi
+pushd platform/android/java
+./gradlew build
+popd

-# Classical
-
-if [ "${CLASSICAL}" == "1" ]; then
-  echo "Starting classical build for Android..."
-
-  $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}
-
-  pushd platform/android/java
-  # Generate the regular Android editor.
-  ./gradlew generateGodotEditor
-  # Generate the Android editor for HorizonOS devices.
-  ./gradlew generateGodotHorizonOSEditor
-  # Generate the Android editor for PicoOS devices.
-  ./gradlew generateGodotPicoOSEditor
-  popd
-
-  mkdir -p /root/out/tools
-  # Copy the generated Android editor binaries (apk & aab).
-  if [ "$store_release" == "yes" ]; then
-    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
-    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/
-
-  $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
-
-  if [ "$store_release" == "yes" ]; then
-    # Copy source folder with compiled libs so we can optionally use it
-    # in a separate script to upload the templates to MavenCentral.
-    cp -r /root/godot /root/out/source/
-    # Backup ~/.gradle too so we can reuse all the downloaded stuff.
-    cp -r /root/.gradle /root/out/source/.gradle
-  fi
-  popd
-
-  mkdir -p /root/out/templates
-  cp bin/android_source.zip /root/out/templates/
-  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/
-fi
-
-# Mono
-
-if [ "${MONO}" == "1" ]; then
-  echo "Starting Mono build for Android..."
-
-  cp -r /root/mono-glue/GodotSharp/GodotSharp/Generated modules/mono/glue/GodotSharp/GodotSharp/
-
-  $SCONS platform=android arch=arm32 $OPTIONS $OPTIONS_MONO target=template_debug
-  $SCONS platform=android arch=arm32 $OPTIONS $OPTIONS_MONO target=template_release
-
-  $SCONS platform=android arch=arm64 $OPTIONS $OPTIONS_MONO target=template_debug
-  $SCONS platform=android arch=arm64 $OPTIONS $OPTIONS_MONO target=template_release
-
-  $SCONS platform=android arch=x86_32 $OPTIONS $OPTIONS_MONO target=template_debug
-  $SCONS platform=android arch=x86_32 $OPTIONS $OPTIONS_MONO target=template_release
-
-  $SCONS platform=android arch=x86_64 $OPTIONS $OPTIONS_MONO target=template_debug
-  $SCONS platform=android arch=x86_64 $OPTIONS $OPTIONS_MONO target=template_release
-
-  pushd platform/android/java
-  ./gradlew generateGodotMonoTemplates
-  popd
-
-  mkdir -p /root/out/templates-mono
-  cp bin/android_source.zip /root/out/templates-mono/
-  cp bin/android_monoDebug.apk /root/out/templates-mono/android_debug.apk
-  cp bin/android_monoRelease.apk /root/out/templates-mono/android_release.apk
-  cp bin/godot-lib.template_release.aar /root/out/templates-mono/
-fi
+mkdir -p /root/out/templates
+cp bin/android_debug.apk /root/out/templates/
+cp bin/android_release.apk /root/out/templates/

 echo "Android build successful"
--- a/build-android/playstore_upload_script.py
+++ b/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)
--- a/build-android/upload-mavencentral.sh
+++ b/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"
--- a/build-android/upload-playstore.sh
+++ b/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"
--- a/build-ios/build.sh
+++ b/build-ios/build.sh
@@ -5,89 +5,21 @@ set -e
 # Config

 export SCONS="scons -j${NUM_CORES} verbose=yes warnings=no progress=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_MONO="module_mono_enabled=yes"
-export TERM=xterm
-
-export IOS_SDK="18.2"
-export IOS_LIPO="/root/ioscross/arm64/bin/arm-apple-darwin11-lipo"
+export IOS_SDK="18.5"
+export IOS_OPTIONS_ARM64="SDKVERSION=${IOS_SDK} ios_triple=arm-apple-darwin11- IPHONEPATH=/root/ioscross/arm64/ IPHONESDK=/root/ioscross/arm64/SDK/iPhoneOS${IOS_SDK}.sdk/"

 rm -rf godot
 mkdir godot
 cd godot
 tar xf /root/godot.tar.gz --strip-components=1

-# Classical
+echo "Starting classical build for iOS..."

-if [ "${CLASSICAL}" == "1" ]; then
-  echo "Starting classical build for iOS..."
+# arm64 device
+$SCONS platform=iphone $IOS_OPTIONS_ARM64 arch=arm64 tools=no target=release_debug
+$SCONS platform=iphone $IOS_OPTIONS_ARM64 arch=arm64 tools=no target=release

-  # 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-"
-
-  # 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-"
-
-  # 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-"
-
-  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
-
-# Mono
-
-if [ "${MONO}" == "1" ]; then
-  echo "Starting Mono build for iOS..."
-
-  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-"
-
-  # 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-"
-
-  # 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-"
-
-  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
+mkdir -p /root/out/templates
+cp bin/godot.iphone.*.arm64 /root/out/templates/

 echo "iOS build successful"
--- a/build-linux/build.sh
+++ b/build-linux/build.sh
@@ -5,136 +5,53 @@ set -e
 # Config

 export SCONS="scons -j${NUM_CORES} verbose=yes warnings=no progress=no"
-export OPTIONS="production=yes"
-export OPTIONS_MONO="module_mono_enabled=yes"
-export TERM=xterm
+export OPTIONS="use_static_cpp=yes"
+export STRIP="strip"

 rm -rf godot
 mkdir godot
 cd godot
 tar xf /root/godot.tar.gz --strip-components=1

-# Classical
+echo "Starting classical build for Linux..."

-if [ "${CLASSICAL}" == "1" ]; then
-  echo "Starting classical build for Linux..."
+export PATH="${GODOT_SDK_LINUX_X86_64}/bin:${BASE_PATH}"

-  export PATH="${GODOT_SDK_LINUX_X86_64}/bin:${BASE_PATH}"
+$SCONS platform=x11 bits=64 $OPTIONS tools=yes target=release_debug
+$STRIP bin/godot.x11.*
+mkdir -p /root/out/x86_64/tools
+cp -rvp bin/* /root/out/x86_64/tools
+rm -rf bin

-  $SCONS platform=linuxbsd arch=x86_64 $OPTIONS target=editor
-  mkdir -p /root/out/x86_64/tools
-  cp -rvp bin/* /root/out/x86_64/tools
-  rm -rf bin
+$SCONS platform=x11 bits=64 $OPTIONS tools=no target=release_debug
+$SCONS platform=x11 bits=64 $OPTIONS tools=no target=release
+$STRIP bin/godot.x11.*
+mkdir -p /root/out/x86_64/templates
+cp -rvp bin/* /root/out/x86_64/templates
+rm -rf bin

-  $SCONS platform=linuxbsd arch=x86_64 $OPTIONS target=template_debug
-  $SCONS platform=linuxbsd arch=x86_64 $OPTIONS target=template_release
-  mkdir -p /root/out/x86_64/templates
-  cp -rvp bin/* /root/out/x86_64/templates
-  rm -rf bin
+export PATH="${GODOT_SDK_LINUX_X86_32}/bin:${BASE_PATH}"

-  export PATH="${GODOT_SDK_LINUX_X86_32}/bin:${BASE_PATH}"
+$SCONS platform=x11 bits=32 $OPTIONS tools=yes target=release_debug
+$STRIP bin/godot.x11.*
+mkdir -p /root/out/x86_32/tools
+cp -rvp bin/* /root/out/x86_32/tools
+rm -rf bin

-  $SCONS platform=linuxbsd arch=x86_32 $OPTIONS target=editor
-  mkdir -p /root/out/x86_32/tools
-  cp -rvp bin/* /root/out/x86_32/tools
-  rm -rf bin
+$SCONS platform=x11 bits=32 $OPTIONS tools=no target=release_debug
+$SCONS platform=x11 bits=32 $OPTIONS tools=no target=release
+$STRIP bin/godot.x11.*
+mkdir -p /root/out/x86_32/templates
+cp -rvp bin/* /root/out/x86_32/templates
+rm -rf bin

-  $SCONS platform=linuxbsd arch=x86_32 $OPTIONS target=template_debug
-  $SCONS platform=linuxbsd arch=x86_32 $OPTIONS target=template_release
-  mkdir -p /root/out/x86_32/templates
-  cp -rvp bin/* /root/out/x86_32/templates
-  rm -rf bin
+export PATH="${GODOT_SDK_LINUX_X86_64}/bin:${BASE_PATH}"

-  export PATH="${GODOT_SDK_LINUX_ARM64}/bin:${BASE_PATH}"
+$SCONS platform=server bits=64 $OPTIONS tools=yes target=release_debug
+mkdir -p /root/out/x86_64/server
+cp -rvp bin/* /root/out/x86_64/server
+rm -rf bin

-  $SCONS platform=linuxbsd arch=arm64 $OPTIONS target=editor
-  mkdir -p /root/out/arm64/tools
-  cp -rvp bin/* /root/out/arm64/tools
-  rm -rf bin
-
-  $SCONS platform=linuxbsd arch=arm64 $OPTIONS target=template_debug
-  $SCONS platform=linuxbsd arch=arm64 $OPTIONS target=template_release
-  mkdir -p /root/out/arm64/templates
-  cp -rvp bin/* /root/out/arm64/templates
-  rm -rf bin
-
-  export PATH="${GODOT_SDK_LINUX_ARM32}/bin:${BASE_PATH}"
-
-  $SCONS platform=linuxbsd arch=arm32 $OPTIONS target=editor
-  mkdir -p /root/out/arm32/tools
-  cp -rvp bin/* /root/out/arm32/tools
-  rm -rf bin
-
-  $SCONS platform=linuxbsd arch=arm32 $OPTIONS target=template_debug
-  $SCONS platform=linuxbsd arch=arm32 $OPTIONS target=template_release
-  mkdir -p /root/out/arm32/templates
-  cp -rvp bin/* /root/out/arm32/templates
-  rm -rf bin
-fi
-
-# Mono
-
-if [ "${MONO}" == "1" ]; then
-  echo "Starting Mono build for Linux..."
-
-  cp -r /root/mono-glue/GodotSharp/GodotSharp/Generated modules/mono/glue/GodotSharp/GodotSharp/
-  cp -r /root/mono-glue/GodotSharp/GodotSharpEditor/Generated modules/mono/glue/GodotSharp/GodotSharpEditor/
-
-  export PATH="${GODOT_SDK_LINUX_X86_64}/bin:${BASE_PATH}"
-
-  $SCONS platform=linuxbsd arch=x86_64 $OPTIONS $OPTIONS_MONO target=editor
-  ./modules/mono/build_scripts/build_assemblies.py --godot-output-dir=./bin --godot-platform=linuxbsd
-  mkdir -p /root/out/x86_64/tools-mono
-  cp -rvp bin/* /root/out/x86_64/tools-mono
-  rm -rf bin
-
-  $SCONS platform=linuxbsd arch=x86_64 $OPTIONS $OPTIONS_MONO target=template_debug
-  $SCONS platform=linuxbsd arch=x86_64 $OPTIONS $OPTIONS_MONO target=template_release
-  mkdir -p /root/out/x86_64/templates-mono
-  cp -rvp bin/* /root/out/x86_64/templates-mono
-  rm -rf bin
-
-  export PATH="${GODOT_SDK_LINUX_X86_32}/bin:${BASE_PATH}"
-
-  $SCONS platform=linuxbsd arch=x86_32 $OPTIONS $OPTIONS_MONO target=editor
-  ./modules/mono/build_scripts/build_assemblies.py --godot-output-dir=./bin --godot-platform=linuxbsd
-  mkdir -p /root/out/x86_32/tools-mono
-  cp -rvp bin/* /root/out/x86_32/tools-mono
-  rm -rf bin
-
-  $SCONS platform=linuxbsd arch=x86_32 $OPTIONS $OPTIONS_MONO target=template_debug
-  $SCONS platform=linuxbsd arch=x86_32 $OPTIONS $OPTIONS_MONO target=template_release
-  mkdir -p /root/out/x86_32/templates-mono
-  cp -rvp bin/* /root/out/x86_32/templates-mono
-  rm -rf bin
-
-  export PATH="${GODOT_SDK_LINUX_ARM64}/bin:${BASE_PATH}"
-
-  $SCONS platform=linuxbsd arch=arm64 $OPTIONS $OPTIONS_MONO target=editor
-  ./modules/mono/build_scripts/build_assemblies.py --godot-output-dir=./bin --godot-platform=linuxbsd
-  mkdir -p /root/out/arm64/tools-mono
-  cp -rvp bin/* /root/out/arm64/tools-mono
-  rm -rf bin
-
-  $SCONS platform=linuxbsd arch=arm64 $OPTIONS $OPTIONS_MONO target=template_debug
-  $SCONS platform=linuxbsd arch=arm64 $OPTIONS $OPTIONS_MONO target=template_release
-  mkdir -p /root/out/arm64/templates-mono
-  cp -rvp bin/* /root/out/arm64/templates-mono
-  rm -rf bin
-
-  export PATH="${GODOT_SDK_LINUX_ARM32}/bin:${BASE_PATH}"
-
-  $SCONS platform=linuxbsd arch=arm32 $OPTIONS $OPTIONS_MONO target=editor
-  ./modules/mono/build_scripts/build_assemblies.py --godot-output-dir=./bin --godot-platform=linuxbsd
-  mkdir -p /root/out/arm32/tools-mono
-  cp -rvp bin/* /root/out/arm32/tools-mono
-  rm -rf bin
-
-  $SCONS platform=linuxbsd arch=arm32 $OPTIONS $OPTIONS_MONO target=template_debug
-  $SCONS platform=linuxbsd arch=arm32 $OPTIONS $OPTIONS_MONO target=template_release
-  mkdir -p /root/out/arm32/templates-mono
-  cp -rvp bin/* /root/out/arm32/templates-mono
-  rm -rf bin
-fi
+export PATH="${BASE_PATH}"

 echo "Linux build successful"
--- a/build-macos/build.sh
+++ b/build-macos/build.sh
@@ -5,67 +5,27 @@ 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 OPTIONS_MONO="module_mono_enabled=yes"
-export TERM=xterm
+export OPTIONS="osxcross_sdk=darwin24.5"
+export STRIP="x86_64-apple-darwin24.5-strip"

 rm -rf godot
 mkdir godot
 cd godot
 tar xf /root/godot.tar.gz --strip-components=1

-# Classical
+echo "Starting classical build for macOS..."

-if [ "${CLASSICAL}" == "1" ]; then
-  echo "Starting classical build for macOS..."
+$SCONS platform=osx $OPTIONS bits=64 tools=yes target=release_debug
+$STRIP bin/godot.osx.*
+mkdir -p /root/out/tools
+cp -rvp bin/* /root/out/tools
+rm -rf bin

-  $SCONS platform=macos $OPTIONS arch=x86_64 target=editor
-  $SCONS platform=macos $OPTIONS arch=arm64 target=editor
-  lipo -create bin/godot.macos.editor.x86_64 bin/godot.macos.editor.arm64 -output bin/godot.macos.editor.universal
-
-  mkdir -p /root/out/tools
-  cp -rvp bin/* /root/out/tools
-  rm -rf bin
-
-  $SCONS platform=macos $OPTIONS arch=x86_64 target=template_debug
-  $SCONS platform=macos $OPTIONS arch=arm64 target=template_debug
-  lipo -create bin/godot.macos.template_debug.x86_64 bin/godot.macos.template_debug.arm64 -output bin/godot.macos.template_debug.universal
-  $SCONS platform=macos $OPTIONS arch=x86_64 target=template_release
-  $SCONS platform=macos $OPTIONS arch=arm64 target=template_release
-  lipo -create bin/godot.macos.template_release.x86_64 bin/godot.macos.template_release.arm64 -output bin/godot.macos.template_release.universal
-
-  mkdir -p /root/out/templates
-  cp -rvp bin/* /root/out/templates
-  rm -rf bin
-fi
-
-# Mono
-
-if [ "${MONO}" == "1" ]; then
-  echo "Starting Mono build for macOS..."
-
-  cp -r /root/mono-glue/GodotSharp/GodotSharp/Generated modules/mono/glue/GodotSharp/GodotSharp/
-  cp -r /root/mono-glue/GodotSharp/GodotSharpEditor/Generated modules/mono/glue/GodotSharp/GodotSharpEditor/
-
-  $SCONS platform=macos $OPTIONS $OPTIONS_MONO arch=x86_64 target=editor
-  $SCONS platform=macos $OPTIONS $OPTIONS_MONO arch=arm64 target=editor
-  lipo -create bin/godot.macos.editor.x86_64.mono bin/godot.macos.editor.arm64.mono -output bin/godot.macos.editor.universal.mono
-  ./modules/mono/build_scripts/build_assemblies.py --godot-output-dir=./bin --godot-platform=macos
-
-  mkdir -p /root/out/tools-mono
-  cp -rvp bin/* /root/out/tools-mono
-  rm -rf bin
-
-  $SCONS platform=macos $OPTIONS $OPTIONS_MONO arch=x86_64 target=template_debug
-  $SCONS platform=macos $OPTIONS $OPTIONS_MONO arch=arm64 target=template_debug
-  lipo -create bin/godot.macos.template_debug.x86_64.mono bin/godot.macos.template_debug.arm64.mono -output bin/godot.macos.template_debug.universal.mono
-  $SCONS platform=macos $OPTIONS $OPTIONS_MONO arch=x86_64 target=template_release
-  $SCONS platform=macos $OPTIONS $OPTIONS_MONO arch=arm64 target=template_release
-  lipo -create bin/godot.macos.template_release.x86_64.mono bin/godot.macos.template_release.arm64.mono -output bin/godot.macos.template_release.universal.mono
-
-  mkdir -p /root/out/templates-mono
-  cp -rvp bin/* /root/out/templates-mono
-  rm -rf bin
-fi
+$SCONS platform=osx $OPTIONS bits=64 tools=no target=release_debug
+$SCONS platform=osx $OPTIONS bits=64 tools=no target=release
+$STRIP bin/godot.osx.*
+mkdir -p /root/out/templates
+cp -rvp bin/* /root/out/templates
+rm -rf bin

 echo "macOS build successful"
--- a/build-mono-glue/build.sh
+++ b/build-mono-glue/build.sh
@@ -1,31 +0,0 @@
-#!/bin/bash
-
-set -e
-
-# Config
-
-export SCONS="scons -j${NUM_CORES} verbose=yes warnings=no progress=no"
-export OPTIONS="debug_symbols=no use_static_cpp=no"
-export TERM=xterm
-export DISPLAY=:0
-export PATH="${GODOT_SDK_LINUX_X86_64}/bin:${BASE_PATH}"
-
-rm -rf godot
-mkdir godot
-cd godot
-tar xf ../godot.tar.gz --strip-components=1
-
-# Mono
-
-if [ "${MONO}" == "1" ]; then
-  echo "Building and generating Mono glue..."
-
-  dotnet --info
-
-  ${SCONS} platform=linuxbsd ${OPTIONS} target=editor module_mono_enabled=yes
-
-  rm -rf /root/mono-glue/*
-  bin/godot.linuxbsd.editor.x86_64.mono --headless --generate-mono-glue /root/mono-glue
-fi
-
-echo "Mono glue generated successfully"
--- a/build-release.sh
+++ b/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,22 +33,14 @@ sign_macos() {
  _macos_tmpdir=$(ssh "${OSX_HOST}" "mktemp -d")
  _reldir="$1"
  _binname="$2"
-  _is_mono="$3"
-
-  if [[ "${_is_mono}" == "1" ]]; then
-    _appname="Godot_mono.app"
-    _sharpdir="${_appname}/Contents/Resources/GodotSharp"
-  else
-    _appname="Godot.app"
-  fi
+  _appname="Godot.app"

  scp "${_reldir}/${_binname}.zip" "${OSX_HOST}:${_macos_tmpdir}"
-  scp "${basedir}/git/misc/dist/macos/editor.entitlements" "${OSX_HOST}:${_macos_tmpdir}"
  ssh "${OSX_HOST}" "
            cd ${_macos_tmpdir} && \
            unzip ${_binname}.zip && \
            codesign --force --timestamp \
-              --options=runtime --entitlements editor.entitlements \
+              --options=runtime \
              -s ${OSX_KEY_ID} -v ${_appname} && \
            zip -r ${_binname}_signed.zip ${_appname}"

@@ -76,18 +68,17 @@ sign_macos_template() {
  fi
  _macos_tmpdir=$(ssh "${OSX_HOST}" "mktemp -d")
  _reldir="$1"
-  _is_mono="$2"

-  scp "${_reldir}/macos.zip" "${OSX_HOST}:${_macos_tmpdir}"
+  scp "${_reldir}/osx.zip" "${OSX_HOST}:${_macos_tmpdir}"
  ssh "${OSX_HOST}" "
            cd ${_macos_tmpdir} && \
-            unzip macos.zip && \
+            unzip osx.zip && \
            codesign --force -s - \
              --options=linker-signed \
-              -v macos_template.app/Contents/MacOS/* && \
-            zip -r macos_signed.zip macos_template.app"
+              -v osx_template.app/Contents/MacOS/* && \
+            zip -r osx_signed.zip osx_template.app"

-  scp "${OSX_HOST}:${_macos_tmpdir}/macos_signed.zip" "${_reldir}/macos.zip"
+  scp "${OSX_HOST}:${_macos_tmpdir}/osx_signed.zip" "${_reldir}/osx.zip"
  ssh "${OSX_HOST}" "rm -rf ${_macos_tmpdir}"
 }

@@ -96,7 +87,6 @@ templates_version=""
 do_cleanup=1
 make_tarball=1
 build_classical=1
-build_mono=1

 while getopts "h?v:t:b:n-:" opt; do
  case "$opt" in
@@ -105,7 +95,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: classical|none (default: classical)"
    echo "  --no-cleanup disable deleting pre-existing output folders (default: false)"
    echo "  --no-tarball disable generating source tarball (default: false)"
    echo
@@ -119,12 +109,9 @@ while getopts "h?v:t:b:n-:" opt; do
    ;;
  b)
    if [ "$OPTARG" == "classical" ]; then
-      build_mono=0
-    elif [ "$OPTARG" == "mono" ]; then
-      build_classical=0
+      build_classical=1
    elif [ "$OPTARG" == "none" ]; then
      build_classical=0
-      build_mono=0
    fi
    ;;
  -)
@@ -155,12 +142,8 @@ elif [[ "{$templates_version}" == *"-"* ]]; then
 fi

 export reldir="${basedir}/releases/${godot_version}"
-export reldir_mono="${reldir}/mono"
 export tmpdir="${basedir}/tmp"
 export templatesdir="${tmpdir}/templates"
-export templatesdir_mono="${tmpdir}/mono/templates"
-export webdir="${basedir}/web/${templates_version}"
-export steamdir="${basedir}/steam"

 export godot_basename="Godot_v${godot_version}"

@@ -170,17 +153,9 @@ if [ "${do_cleanup}" == "1" ]; then

  rm -rf ${reldir}
  rm -rf ${tmpdir}
-  rm -rf ${webdir}
-  rm -rf ${steamdir}

  mkdir -p ${reldir}
-  mkdir -p ${reldir_mono}
  mkdir -p ${templatesdir}
-  mkdir -p ${templatesdir_mono}
-  mkdir -p ${webdir}
-  if [ -d out/windows/steam ]; then
-    mkdir -p ${steamdir}
-  fi

 fi

@@ -202,179 +177,93 @@ if [ "${build_classical}" == "1" ]; then
  ## Linux (Classical) ##

  # Editor
-  binname="${godot_basename}_linux.x86_64"
-  cp out/linux/x86_64/tools/godot.linuxbsd.editor.x86_64 ${binname}
+  binname="${godot_basename}_x11.64"
+  cp out/linux/x86_64/tools/godot.x11.opt.tools.64 ${binname}
  zip -q -9 "${reldir}/${binname}.zip" ${binname}
  rm ${binname}

-  binname="${godot_basename}_linux.x86_32"
-  cp out/linux/x86_32/tools/godot.linuxbsd.editor.x86_32 ${binname}
+  binname="${godot_basename}_x11.32"
+  cp out/linux/x86_32/tools/godot.x11.opt.tools.32 ${binname}
  zip -q -9 "${reldir}/${binname}.zip" ${binname}
  rm ${binname}

-  binname="${godot_basename}_linux.arm64"
-  cp out/linux/arm64/tools/godot.linuxbsd.editor.arm64 ${binname}
-  zip -q -9 "${reldir}/${binname}.zip" ${binname}
-  rm ${binname}
-
-  binname="${godot_basename}_linux.arm32"
-  cp out/linux/arm32/tools/godot.linuxbsd.editor.arm32 ${binname}
-  zip -q -9 "${reldir}/${binname}.zip" ${binname}
-  rm ${binname}
-
-  # ICU data
-  if [ -f ${basedir}/git/thirdparty/icu4c/icudt_godot.dat ]; then
-    cp ${basedir}/git/thirdparty/icu4c/icudt_godot.dat ${templatesdir}/icudt_godot.dat
-  else
-    echo "icudt_godot.dat" not found.
-  fi
-
  # Templates
-  cp out/linux/x86_64/templates/godot.linuxbsd.template_release.x86_64 ${templatesdir}/linux_release.x86_64
-  cp out/linux/x86_64/templates/godot.linuxbsd.template_debug.x86_64 ${templatesdir}/linux_debug.x86_64
-  cp out/linux/x86_32/templates/godot.linuxbsd.template_release.x86_32 ${templatesdir}/linux_release.x86_32
-  cp out/linux/x86_32/templates/godot.linuxbsd.template_debug.x86_32 ${templatesdir}/linux_debug.x86_32
-  cp out/linux/arm64/templates/godot.linuxbsd.template_release.arm64 ${templatesdir}/linux_release.arm64
-  cp out/linux/arm64/templates/godot.linuxbsd.template_debug.arm64 ${templatesdir}/linux_debug.arm64
-  cp out/linux/arm32/templates/godot.linuxbsd.template_release.arm32 ${templatesdir}/linux_release.arm32
-  cp out/linux/arm32/templates/godot.linuxbsd.template_debug.arm32 ${templatesdir}/linux_debug.arm32
+  cp out/linux/x86_64/templates/godot.x11.opt.64 ${templatesdir}/linux_x11_64_release
+  cp out/linux/x86_64/templates/godot.x11.opt.debug.64 ${templatesdir}/linux_x11_64_debug
+  cp out/linux/x86_32/templates/godot.x11.opt.32 ${templatesdir}/linux_x11_32_release
+  cp out/linux/x86_32/templates/godot.x11.opt.debug.32 ${templatesdir}/linux_x11_32_debug

  ## Windows (Classical) ##

  # Editor
  binname="${godot_basename}_win64.exe"
-  wrpname="${godot_basename}_win64_console.exe"
-  cp out/windows/x86_64/tools/godot.windows.editor.x86_64.exe ${binname}
+  cp out/windows/x86_64/tools/godot.windows.opt.tools.64.exe ${binname}
  sign_windows ${binname}
-  cp out/windows/x86_64/tools/godot.windows.editor.x86_64.console.exe ${wrpname}
-  sign_windows ${wrpname}
-  zip -q -9 "${reldir}/${binname}.zip" ${binname} ${wrpname}
-  rm ${binname} ${wrpname}
+  zip -q -9 "${reldir}/${binname}.zip" ${binname}
+  rm ${binname}

  binname="${godot_basename}_win32.exe"
-  wrpname="${godot_basename}_win32_console.exe"
-  cp out/windows/x86_32/tools/godot.windows.editor.x86_32.exe ${binname}
+  cp out/windows/x86_32/tools/godot.windows.opt.tools.32.exe ${binname}
  sign_windows ${binname}
-  cp out/windows/x86_32/tools/godot.windows.editor.x86_32.console.exe ${wrpname}
-  sign_windows ${wrpname}
-  zip -q -9 "${reldir}/${binname}.zip" ${binname} ${wrpname}
-  rm ${binname} ${wrpname}
-
-  binname="${godot_basename}_windows_arm64.exe"
-  wrpname="${godot_basename}_windows_arm64_console.exe"
-  cp out/windows/arm64/tools/godot.windows.editor.arm64.llvm.exe ${binname}
-  sign_windows ${binname}
-  cp out/windows/arm64/tools/godot.windows.editor.arm64.llvm.console.exe ${wrpname}
-  sign_windows ${wrpname}
-  zip -q -9 "${reldir}/${binname}.zip" ${binname} ${wrpname}
-  rm ${binname} ${wrpname}
+  zip -q -9 "${reldir}/${binname}.zip" ${binname}
+  rm ${binname}

  # Templates
-  cp out/windows/x86_64/templates/godot.windows.template_release.x86_64.exe ${templatesdir}/windows_release_x86_64.exe
-  cp out/windows/x86_64/templates/godot.windows.template_debug.x86_64.exe ${templatesdir}/windows_debug_x86_64.exe
-  cp out/windows/x86_32/templates/godot.windows.template_release.x86_32.exe ${templatesdir}/windows_release_x86_32.exe
-  cp out/windows/x86_32/templates/godot.windows.template_debug.x86_32.exe ${templatesdir}/windows_debug_x86_32.exe
-  cp out/windows/arm64/templates/godot.windows.template_release.arm64.llvm.exe ${templatesdir}/windows_release_arm64.exe
-  cp out/windows/arm64/templates/godot.windows.template_debug.arm64.llvm.exe ${templatesdir}/windows_debug_arm64.exe
-  cp out/windows/x86_64/templates/godot.windows.template_release.x86_64.console.exe ${templatesdir}/windows_release_x86_64_console.exe
-  cp out/windows/x86_64/templates/godot.windows.template_debug.x86_64.console.exe ${templatesdir}/windows_debug_x86_64_console.exe
-  cp out/windows/x86_32/templates/godot.windows.template_release.x86_32.console.exe ${templatesdir}/windows_release_x86_32_console.exe
-  cp out/windows/x86_32/templates/godot.windows.template_debug.x86_32.console.exe ${templatesdir}/windows_debug_x86_32_console.exe
-  cp out/windows/arm64/templates/godot.windows.template_release.arm64.llvm.console.exe ${templatesdir}/windows_release_arm64_console.exe
-  cp out/windows/arm64/templates/godot.windows.template_debug.arm64.llvm.console.exe ${templatesdir}/windows_debug_arm64_console.exe
+  cp out/windows/x86_64/templates/godot.windows.opt.64.exe ${templatesdir}/windows_64_release.exe
+  cp out/windows/x86_64/templates/godot.windows.opt.debug.64.exe ${templatesdir}/windows_64_debug.exe
+  cp out/windows/x86_32/templates/godot.windows.opt.32.exe ${templatesdir}/windows_32_release.exe
+  cp out/windows/x86_32/templates/godot.windows.opt.debug.32.exe ${templatesdir}/windows_32_debug.exe

  ## macOS (Classical) ##

  # Editor
-  binname="${godot_basename}_macos.universal"
+  binname="${godot_basename}_osx.64"
  rm -rf Godot.app
-  cp -r git/misc/dist/macos_tools.app Godot.app
+  cp -r git/misc/dist/osx_tools.app Godot.app
  mkdir -p Godot.app/Contents/MacOS
-  cp out/macos/tools/godot.macos.editor.universal Godot.app/Contents/MacOS/Godot
+  cp out/macos/tools/godot.osx.opt.tools.64 Godot.app/Contents/MacOS/Godot
  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}

  # Templates
-  rm -rf macos_template.app
-  cp -r git/misc/dist/macos_template.app .
-  mkdir -p macos_template.app/Contents/MacOS
+  rm -rf osx_template.app
+  cp -r git/misc/dist/osx_template.app .
+  mkdir -p osx_template.app/Contents/MacOS

-  cp out/macos/templates/godot.macos.template_release.universal macos_template.app/Contents/MacOS/godot_macos_release.universal
-  cp out/macos/templates/godot.macos.template_debug.universal macos_template.app/Contents/MacOS/godot_macos_debug.universal
-  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
-
-  ## Steam (Classical) ##
-
-  if [ -d out/windows/steam ]; then
-    cp out/windows/steam/godot.windows.editor.x86_64.exe ${steamdir}/godot.windows.opt.tools.64.exe
-    cp out/windows/steam/godot.windows.editor.x86_32.exe ${steamdir}/godot.windows.opt.tools.32.exe
-    sign_windows ${steamdir}/godot.windows.opt.tools.64.exe
-    sign_windows ${steamdir}/godot.windows.opt.tools.32.exe
-    unzip ${reldir}/${godot_basename}_linux.x86_64.zip -d ${steamdir}/
-    unzip ${reldir}/${godot_basename}_linux.x86_32.zip -d ${steamdir}/
-    mv ${steamdir}/{${godot_basename}_linux.x86_64,godot.x11.opt.tools.64}
-    mv ${steamdir}/{${godot_basename}_linux.x86_32,godot.x11.opt.tools.32}
-    unzip ${reldir}/${godot_basename}_macos.universal -d ${steamdir}/
-  fi
+  cp out/macos/templates/godot.osx.opt.64 osx_template.app/Contents/MacOS/godot_osx_release.64
+  cp out/macos/templates/godot.osx.opt.debug.64 osx_template.app/Contents/MacOS/godot_osx_debug.64
+  chmod +x osx_template.app/Contents/MacOS/godot_osx*
+  zip -q -9 -r "${templatesdir}/osx.zip" osx_template.app
+  rm -rf osx_template.app
+  sign_macos_template ${templatesdir}

  ## Web (Classical) ##

-  # Editor
-  unzip out/web/tools/godot.web.editor.wasm32.zip -d ${webdir}/
-  brotli --keep --force --quality=11 ${webdir}/*
-  binname="${godot_basename}_web_editor.zip"
-  cp out/web/tools/godot.web.editor.wasm32.zip ${reldir}/${binname}
-
-  # Templates
-  cp out/web/templates/godot.web.template_release.wasm32.zip ${templatesdir}/web_release.zip
-  cp out/web/templates/godot.web.template_debug.wasm32.zip ${templatesdir}/web_debug.zip
-
-  cp out/web/templates/godot.web.template_release.wasm32.nothreads.zip ${templatesdir}/web_nothreads_release.zip
-  cp out/web/templates/godot.web.template_debug.wasm32.nothreads.zip ${templatesdir}/web_nothreads_debug.zip
-
-  cp out/web/templates/godot.web.template_release.wasm32.dlink.zip ${templatesdir}/web_dlink_release.zip
-  cp out/web/templates/godot.web.template_debug.wasm32.dlink.zip ${templatesdir}/web_dlink_debug.zip
-
-  cp out/web/templates/godot.web.template_release.wasm32.nothreads.dlink.zip ${templatesdir}/web_dlink_nothreads_release.zip
-  cp out/web/templates/godot.web.template_debug.wasm32.nothreads.dlink.zip ${templatesdir}/web_dlink_nothreads_debug.zip
+  cp git/misc/dist/html/default.html godot.html
+  cp out/web/templates/godot.javascript.opt.asm.js godot.asm.js
+  cp out/web/templates/godot.javascript.opt.js godot.js
+  cp out/web/templates/godot.javascript.opt.html.mem godot.mem
+  zip -q -9 ${templatesdir}/javascript_release.zip godot.{html,asm.js,js,mem}
+  cp out/web/templates/godot.javascript.opt.debug.asm.js godot.asm.js
+  cp out/web/templates/godot.javascript.opt.debug.js godot.js
+  cp out/web/templates/godot.javascript.opt.debug.html.mem godot.mem
+  zip -q -9 ${templatesdir}/javascript_debug.zip godot.{html,asm.js,js,mem}
+  rm -f godot.{html,asm.js,js,mem}

  ## Android (Classical) ##

-  # Lib for direct download
-  cp out/android/templates/godot-lib.template_release.aar ${reldir}/godot-lib.${templates_version}.template_release.aar
-
-  # Editor
-  binname="${godot_basename}_android_editor.apk"
-  cp out/android/tools/android_editor.apk ${reldir}/${binname}
-  binname="${godot_basename}_android_editor_horizonos.apk"
-  cp out/android/tools/android_editor_horizonos.apk ${reldir}/${binname}
-  binname="${godot_basename}_android_editor_picoos.apk"
-  cp out/android/tools/android_editor_picoos.apk ${reldir}/${binname}
-  binname="${godot_basename}_android_editor.aab"
-  cp out/android/tools/android_editor.aab ${reldir}/${binname}
-
-  # Templates
  cp out/android/templates/*.apk ${templatesdir}/
-  cp out/android/templates/android_source.zip ${templatesdir}/

  ## iOS (Classical) ##

  rm -rf ios_xcode
  cp -r git/misc/dist/ios_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
-  cp out/ios/templates/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}/ios.zip" *
-  cd ..
+  cp out/ios/templates/godot.iphone.opt.arm64 ios_xcode/godot_opt.iphone
+  cp out/ios/templates/godot.iphone.opt.debug.arm64 ios_xcode/godot_debug.iphone
+  chmod +x ios_xcode/godot*.iphone
+  zip -q -9 -r "${templatesdir}/GodotiOSXCode.zip" ios_xcode
  rm -rf ios_xcode

  ## Templates TPZ (Classical) ##
@@ -394,184 +283,4 @@ if [ "${build_classical}" == "1" ]; then

 fi

-# Mono
-
-if [ "${build_mono}" == "1" ]; then
-
-  ## Linux (Mono) ##
-
-  # Editor
-  binbasename="${godot_basename}_mono_linux"
-  mkdir -p ${binbasename}_x86_64
-  cp out/linux/x86_64/tools-mono/godot.linuxbsd.editor.x86_64.mono ${binbasename}_x86_64/${binbasename}.x86_64
-  cp -rp out/linux/x86_64/tools-mono/GodotSharp ${binbasename}_x86_64/
-  zip -r -q -9 "${reldir_mono}/${binbasename}_x86_64.zip" ${binbasename}_x86_64
-  rm -rf ${binbasename}_x86_64
-
-  binbasename="${godot_basename}_mono_linux"
-  mkdir -p ${binbasename}_x86_32
-  cp out/linux/x86_32/tools-mono/godot.linuxbsd.editor.x86_32.mono ${binbasename}_x86_32/${binbasename}.x86_32
-  cp -rp out/linux/x86_32/tools-mono/GodotSharp/ ${binbasename}_x86_32/
-  zip -r -q -9 "${reldir_mono}/${binbasename}_x86_32.zip" ${binbasename}_x86_32
-  rm -rf ${binbasename}_x86_32
-
-  binbasename="${godot_basename}_mono_linux"
-  mkdir -p ${binbasename}_arm64
-  cp out/linux/arm64/tools-mono/godot.linuxbsd.editor.arm64.mono ${binbasename}_arm64/${binbasename}.arm64
-  cp -rp out/linux/arm64/tools-mono/GodotSharp/ ${binbasename}_arm64/
-  zip -r -q -9 "${reldir_mono}/${binbasename}_arm64.zip" ${binbasename}_arm64
-  rm -rf ${binbasename}_arm64
-
-  binbasename="${godot_basename}_mono_linux"
-  mkdir -p ${binbasename}_arm32
-  cp out/linux/arm32/tools-mono/godot.linuxbsd.editor.arm32.mono ${binbasename}_arm32/${binbasename}.arm32
-  cp -rp out/linux/arm32/tools-mono/GodotSharp/ ${binbasename}_arm32/
-  zip -r -q -9 "${reldir_mono}/${binbasename}_arm32.zip" ${binbasename}_arm32
-  rm -rf ${binbasename}_arm32
-
-  # ICU data
-  if [ -f ${basedir}/git/thirdparty/icu4c/icudt_godot.dat ]; then
-    cp ${basedir}/git/thirdparty/icu4c/icudt_godot.dat ${templatesdir_mono}/icudt_godot.dat
-  else
-    echo "icudt_godot.dat" not found.
-  fi
-
-  # Templates
-  cp out/linux/x86_64/templates-mono/godot.linuxbsd.template_debug.x86_64.mono ${templatesdir_mono}/linux_debug.x86_64
-  cp out/linux/x86_64/templates-mono/godot.linuxbsd.template_release.x86_64.mono ${templatesdir_mono}/linux_release.x86_64
-  cp out/linux/x86_32/templates-mono/godot.linuxbsd.template_debug.x86_32.mono ${templatesdir_mono}/linux_debug.x86_32
-  cp out/linux/x86_32/templates-mono/godot.linuxbsd.template_release.x86_32.mono ${templatesdir_mono}/linux_release.x86_32
-  cp out/linux/arm64/templates-mono/godot.linuxbsd.template_debug.arm64.mono ${templatesdir_mono}/linux_debug.arm64
-  cp out/linux/arm64/templates-mono/godot.linuxbsd.template_release.arm64.mono ${templatesdir_mono}/linux_release.arm64
-  cp out/linux/arm32/templates-mono/godot.linuxbsd.template_debug.arm32.mono ${templatesdir_mono}/linux_debug.arm32
-  cp out/linux/arm32/templates-mono/godot.linuxbsd.template_release.arm32.mono ${templatesdir_mono}/linux_release.arm32
-
-  ## Windows (Mono) ##
-
-  # Editor
-  binname="${godot_basename}_mono_win64"
-  wrpname="${godot_basename}_mono_win64_console"
-  mkdir -p ${binname}
-  cp out/windows/x86_64/tools-mono/godot.windows.editor.x86_64.mono.exe ${binname}/${binname}.exe
-  sign_windows ${binname}/${binname}.exe
-  cp -rp out/windows/x86_64/tools-mono/GodotSharp ${binname}/
-  cp out/windows/x86_64/tools-mono/godot.windows.editor.x86_64.mono.console.exe ${binname}/${wrpname}.exe
-  sign_windows ${binname}/${wrpname}.exe
-  zip -r -q -9 "${reldir_mono}/${binname}.zip" ${binname}
-  rm -rf ${binname}
-
-  binname="${godot_basename}_mono_win32"
-  wrpname="${godot_basename}_mono_win32_console"
-  mkdir -p ${binname}
-  cp out/windows/x86_32/tools-mono/godot.windows.editor.x86_32.mono.exe ${binname}/${binname}.exe
-  sign_windows ${binname}/${binname}.exe
-  cp -rp out/windows/x86_32/tools-mono/GodotSharp ${binname}/
-  cp out/windows/x86_32/tools-mono/godot.windows.editor.x86_32.mono.console.exe ${binname}/${wrpname}.exe
-  sign_windows ${binname}/${wrpname}.exe
-  zip -r -q -9 "${reldir_mono}/${binname}.zip" ${binname}
-  rm -rf ${binname}
-
-  binname="${godot_basename}_mono_windows_arm64"
-  wrpname="${godot_basename}_mono_windows_arm64_console"
-  mkdir -p ${binname}
-  cp out/windows/arm64/tools-mono/godot.windows.editor.arm64.llvm.mono.exe ${binname}/${binname}.exe
-  sign_windows ${binname}/${binname}.exe
-  cp -rp out/windows/arm64/tools-mono/GodotSharp ${binname}/
-  cp out/windows/arm64/tools-mono/godot.windows.editor.arm64.llvm.mono.console.exe ${binname}/${wrpname}.exe
-  sign_windows ${binname}/${wrpname}.exe
-  zip -r -q -9 "${reldir_mono}/${binname}.zip" ${binname}
-  rm -rf ${binname}
-
-  # Templates
-  cp out/windows/x86_64/templates-mono/godot.windows.template_debug.x86_64.mono.exe ${templatesdir_mono}/windows_debug_x86_64.exe
-  cp out/windows/x86_64/templates-mono/godot.windows.template_release.x86_64.mono.exe ${templatesdir_mono}/windows_release_x86_64.exe
-  cp out/windows/x86_32/templates-mono/godot.windows.template_debug.x86_32.mono.exe ${templatesdir_mono}/windows_debug_x86_32.exe
-  cp out/windows/x86_32/templates-mono/godot.windows.template_release.x86_32.mono.exe ${templatesdir_mono}/windows_release_x86_32.exe
-  cp out/windows/arm64/templates-mono/godot.windows.template_debug.arm64.llvm.mono.exe ${templatesdir_mono}/windows_debug_arm64.exe
-  cp out/windows/arm64/templates-mono/godot.windows.template_release.arm64.llvm.mono.exe ${templatesdir_mono}/windows_release_arm64.exe
-  cp out/windows/x86_64/templates-mono/godot.windows.template_debug.x86_64.mono.console.exe ${templatesdir_mono}/windows_debug_x86_64_console.exe
-  cp out/windows/x86_64/templates-mono/godot.windows.template_release.x86_64.mono.console.exe ${templatesdir_mono}/windows_release_x86_64_console.exe
-  cp out/windows/x86_32/templates-mono/godot.windows.template_debug.x86_32.mono.console.exe ${templatesdir_mono}/windows_debug_x86_32_console.exe
-  cp out/windows/x86_32/templates-mono/godot.windows.template_release.x86_32.mono.console.exe ${templatesdir_mono}/windows_release_x86_32_console.exe
-  cp out/windows/arm64/templates-mono/godot.windows.template_debug.arm64.llvm.mono.console.exe ${templatesdir_mono}/windows_debug_arm64_console.exe
-  cp out/windows/arm64/templates-mono/godot.windows.template_release.arm64.llvm.mono.console.exe ${templatesdir_mono}/windows_release_arm64_console.exe
-
-  ## macOS (Mono) ##
-
-  # Editor
-  binname="${godot_basename}_mono_macos.universal"
-  rm -rf Godot_mono.app
-  cp -r git/misc/dist/macos_tools.app Godot_mono.app
-  mkdir -p Godot_mono.app/Contents/{MacOS,Resources}
-  cp out/macos/tools-mono/godot.macos.editor.universal.mono Godot_mono.app/Contents/MacOS/Godot
-  cp -rp out/macos/tools-mono/GodotSharp Godot_mono.app/Contents/Resources/GodotSharp
-  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
-
-  # Templates
-  rm -rf macos_template.app
-  cp -r git/misc/dist/macos_template.app .
-  mkdir -p macos_template.app/Contents/{MacOS,Resources}
-  cp out/macos/templates-mono/godot.macos.template_debug.universal.mono macos_template.app/Contents/MacOS/godot_macos_debug.universal
-  cp out/macos/templates-mono/godot.macos.template_release.universal.mono macos_template.app/Contents/MacOS/godot_macos_release.universal
-  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
-
-  ## Android (Mono) ##
-
-  # Lib for direct download
-  cp out/android/templates-mono/godot-lib.template_release.aar ${reldir_mono}/godot-lib.${templates_version}.mono.template_release.aar
-
-  # Templates
-  cp out/android/templates-mono/*.apk ${templatesdir_mono}/
-  cp out/android/templates-mono/android_source.zip ${templatesdir_mono}/
-
-  ## iOS (Mono) ##
-
-  rm -rf ios_xcode
-  cp -r git/misc/dist/ios_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
-  cp out/ios/templates-mono/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_mono}/ios.zip" *
-  cd ..
-  rm -rf ios_xcode
-
-  # No .NET support for those platforms yet.
-
-  if false; then
-
-  ## Web (Mono) ##
-
-  # Templates
-  cp out/web/templates-mono/godot.web.template_debug.wasm32.mono.zip ${templatesdir_mono}/web_debug.zip
-  cp out/web/templates-mono/godot.web.template_release.wasm32.mono.zip ${templatesdir_mono}/web_release.zip
-
-  fi
-
-  ## Templates TPZ (Mono) ##
-
-  echo "${templates_version}.mono" > ${templatesdir_mono}/version.txt
-  pushd ${templatesdir_mono}/..
-  zip -q -9 -r -D "${reldir_mono}/${godot_basename}_mono_export_templates.tpz" templates/*
-  popd
-
-  ## SHA-512 sums (Mono) ##
-
-  pushd ${reldir_mono}
-  sha512sum [Gg]* >> SHA512-SUMS.txt
-  mkdir -p ${basedir}/sha512sums/${godot_version}/mono
-  cp SHA512-SUMS.txt ${basedir}/sha512sums/${godot_version}/mono/
-  popd
-
-fi
-
 echo "All editor binaries and templates prepared successfully for release"
--- a/build-web/build.sh
+++ b/build-web/build.sh
@@ -4,94 +4,23 @@ set -e

 # Config

-# To speed up builds with single-threaded full LTO linking,
-# we run all builds in parallel each from their own folder.
-export NUM_JOBS=5
-declare -a JOBS=(
-  "target=template_debug"
-  "target=template_release"
-  "target=template_debug dlink_enabled=yes"
-  "target=template_release dlink_enabled=yes"
-)
-declare -a JOBS_NOTHREADS=(
-  "target=template_debug threads=no"
-  "target=template_release threads=no"
-  "target=template_debug dlink_enabled=yes threads=no"
-  "target=template_release dlink_enabled=yes threads=no"
-)
-
-export SCONS="scons -j$(expr ${NUM_CORES} / ${NUM_JOBS}) verbose=yes warnings=no progress=no"
-export OPTIONS="production=yes"
-export OPTIONS_MONO="module_mono_enabled=yes -j${NUM_CORES}"
-export TERM=xterm
+export SCONS="scons -j${NUM_CORES} verbose=yes warnings=no progress=no"
+export OPTIONS=""

 source /root/emsdk/emsdk_env.sh
+export EMSCRIPTEN_ROOT=/root/emsdk/fastcomp/emscripten

 rm -rf godot
 mkdir godot
 cd godot
 tar xf /root/godot.tar.gz --strip-components=1

-# Classical
+echo "Starting classical build for Web..."

-if [ "${CLASSICAL}" == "1" ]; then
-  echo "Starting classical build for Web..."
+$SCONS platform=javascript ${OPTIONS} tools=no target=release_debug
+$SCONS platform=javascript ${OPTIONS} tools=no target=release

-  for i in {0..3}; do
-    cp -r /root/godot /root/godot$i
-    cd /root/godot$i
-    echo "$SCONS platform=web ${OPTIONS} ${JOBS[$i]}"
-    $SCONS platform=web ${OPTIONS} ${JOBS[$i]} &
-    pids[$i]=$!
-  done
-
-  cd /root/godot
-  echo "$SCONS platform=web ${OPTIONS} target=editor use_closure_compiler=yes"
-  $SCONS platform=web ${OPTIONS} target=editor use_closure_compiler=yes &
-  pid_editor=$!
-
-  for pid in ${pids[*]}; do
-    wait $pid
-  done
-  wait $pid_editor
-
-  for i in {0..3}; do
-    cp -r /root/godot /root/godot-nothreads$i
-    cd /root/godot-nothreads$i
-    echo "$SCONS platform=web ${OPTIONS} ${JOBS_NOTHREADS[$i]}"
-    $SCONS platform=web ${OPTIONS} ${JOBS_NOTHREADS[$i]} &
-    pids_nothreads[$i]=$!
-  done
-
-  for pid in ${pids_nothreads[*]}; do
-    wait $pid
-  done
-
-  mkdir -p /root/out/tools
-  cp -rvp /root/godot/bin/*.editor*.zip /root/out/tools
-
-  mkdir -p /root/out/templates
-  for i in {0..3}; do
-    cp -rvp /root/godot$i/bin/*.zip /root/out/templates
-    cp -rvp /root/godot-nothreads$i/bin/*.zip /root/out/templates
-  done
-fi
-
-# Mono
-
-# No Web support with .NET 6 yet.
-#if [ "${MONO}" == "1" ]; then
-if false; then
-  echo "Starting Mono build for Web..."
-
-  cp -r /root/mono-glue/GodotSharp/GodotSharp/Generated modules/mono/glue/GodotSharp/GodotSharp/
-
-  $SCONS platform=web ${OPTIONS} ${OPTIONS_MONO} target=template_debug
-  $SCONS platform=web ${OPTIONS} ${OPTIONS_MONO} target=template_release
-
-  mkdir -p /root/out/templates-mono
-  cp -rvp bin/*.zip /root/out/templates-mono
-  rm -f bin/*.zip
-fi
+mkdir -p /root/out/templates
+cp -rvp bin/* /root/out/templates

 echo "Web build successful"
--- a/build-windows/build.sh
+++ b/build-windows/build.sh
@@ -5,109 +5,40 @@ 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 OPTIONS_MONO="module_mono_enabled=yes"
-export OPTIONS_LLVM="use_llvm=yes mingw_prefix=/root/llvm-mingw"
-export TERM=xterm
+export OPTIONS=""
+export STRIP="x86_64-w64-mingw32-strip"

 rm -rf godot
 mkdir godot
 cd godot
 tar xf /root/godot.tar.gz --strip-components=1

-# Classical
+echo "Starting classical build for Windows..."

-if [ "${CLASSICAL}" == "1" ]; then
-  echo "Starting classical build for Windows..."
+$SCONS platform=windows bits=64 $OPTIONS tools=yes target=release_debug
+$STRIP bin/godot.windows.*
+mkdir -p /root/out/x86_64/tools
+cp -rvp bin/* /root/out/x86_64/tools
+rm -rf bin

-  $SCONS platform=windows arch=x86_64 $OPTIONS target=editor
-  mkdir -p /root/out/x86_64/tools
-  cp -rvp bin/* /root/out/x86_64/tools
-  rm -rf bin
+$SCONS platform=windows bits=64 $OPTIONS tools=no target=release_debug
+$SCONS platform=windows bits=64 $OPTIONS tools=no target=release
+$STRIP bin/godot.windows.*
+mkdir -p /root/out/x86_64/templates
+cp -rvp bin/* /root/out/x86_64/templates
+rm -rf bin

-  $SCONS platform=windows arch=x86_64 $OPTIONS target=template_debug
-  $SCONS platform=windows arch=x86_64 $OPTIONS target=template_release
-  mkdir -p /root/out/x86_64/templates
-  cp -rvp bin/* /root/out/x86_64/templates
-  rm -rf bin
+$SCONS platform=windows bits=32 $OPTIONS tools=yes target=release_debug
+$STRIP bin/godot.windows.*
+mkdir -p /root/out/x86_32/tools
+cp -rvp bin/* /root/out/x86_32/tools
+rm -rf bin

-  $SCONS platform=windows arch=x86_32 $OPTIONS target=editor
-  mkdir -p /root/out/x86_32/tools
-  cp -rvp bin/* /root/out/x86_32/tools
-  rm -rf bin
-
-  $SCONS platform=windows arch=x86_32 $OPTIONS target=template_debug
-  $SCONS platform=windows arch=x86_32 $OPTIONS target=template_release
-  mkdir -p /root/out/x86_32/templates
-  cp -rvp bin/* /root/out/x86_32/templates
-  rm -rf bin
-
-  $SCONS platform=windows arch=arm64 $OPTIONS $OPTIONS_LLVM target=editor
-  mkdir -p /root/out/arm64/tools
-  cp -rvp bin/* /root/out/arm64/tools
-  rm -rf bin
-
-  $SCONS platform=windows arch=arm64 $OPTIONS $OPTIONS_LLVM target=template_debug
-  $SCONS platform=windows arch=arm64 $OPTIONS $OPTIONS_LLVM target=template_release
-  mkdir -p /root/out/arm64/templates
-  cp -rvp bin/* /root/out/arm64/templates
-  rm -rf bin
-
-  if [ "${STEAM}" == "1" ]; then
-    build_name=${BUILD_NAME}
-    export BUILD_NAME="steam"
-    $SCONS platform=windows arch=x86_64 $OPTIONS target=editor steamapi=yes
-    $SCONS platform=windows arch=x86_32 $OPTIONS target=editor steamapi=yes
-    mkdir -p /root/out/steam
-    cp -rvp bin/* /root/out/steam
-    rm -rf bin
-    export BUILD_NAME=${build_name}
-  fi
-fi
-
-# Mono
-
-if [ "${MONO}" == "1" ]; then
-  echo "Starting Mono build for Windows..."
-
-  cp -r /root/mono-glue/GodotSharp/GodotSharp/Generated modules/mono/glue/GodotSharp/GodotSharp/
-  cp -r /root/mono-glue/GodotSharp/GodotSharpEditor/Generated modules/mono/glue/GodotSharp/GodotSharpEditor/
-
-  $SCONS platform=windows arch=x86_64 $OPTIONS $OPTIONS_MONO target=editor
-  ./modules/mono/build_scripts/build_assemblies.py --godot-output-dir=./bin --godot-platform=windows
-  mkdir -p /root/out/x86_64/tools-mono
-  cp -rvp bin/* /root/out/x86_64/tools-mono
-  rm -rf bin
-
-  $SCONS platform=windows arch=x86_64 $OPTIONS $OPTIONS_MONO target=template_debug
-  $SCONS platform=windows arch=x86_64 $OPTIONS $OPTIONS_MONO target=template_release
-  mkdir -p /root/out/x86_64/templates-mono
-  cp -rvp bin/* /root/out/x86_64/templates-mono
-  rm -rf bin
-
-  $SCONS platform=windows arch=x86_32 $OPTIONS $OPTIONS_MONO target=editor
-  ./modules/mono/build_scripts/build_assemblies.py --godot-output-dir=./bin --godot-platform=windows
-  mkdir -p /root/out/x86_32/tools-mono
-  cp -rvp bin/* /root/out/x86_32/tools-mono
-  rm -rf bin
-
-  $SCONS platform=windows arch=x86_32 $OPTIONS $OPTIONS_MONO target=template_debug
-  $SCONS platform=windows arch=x86_32 $OPTIONS $OPTIONS_MONO target=template_release
-  mkdir -p /root/out/x86_32/templates-mono
-  cp -rvp bin/* /root/out/x86_32/templates-mono
-  rm -rf bin
-
-  $SCONS platform=windows arch=arm64 $OPTIONS $OPTIONS_MONO $OPTIONS_LLVM target=editor
-  ./modules/mono/build_scripts/build_assemblies.py --godot-output-dir=./bin --godot-platform=windows
-  mkdir -p /root/out/arm64/tools-mono
-  cp -rvp bin/* /root/out/arm64/tools-mono
-  rm -rf bin
-
-  $SCONS platform=windows arch=arm64 $OPTIONS $OPTIONS_MONO $OPTIONS_LLVM target=template_debug
-  $SCONS platform=windows arch=arm64 $OPTIONS $OPTIONS_MONO $OPTIONS_LLVM target=template_release
-  mkdir -p /root/out/arm64/templates-mono
-  cp -rvp bin/* /root/out/arm64/templates-mono
-  rm -rf bin
-fi
+$SCONS platform=windows bits=32 $OPTIONS tools=no target=release_debug
+$SCONS platform=windows bits=32 $OPTIONS tools=no target=release
+$STRIP bin/godot.windows.*
+mkdir -p /root/out/x86_32/templates
+cp -rvp bin/* /root/out/x86_32/templates
+rm -rf bin

 echo "Windows build successful"
--- a/build.sh
+++ b/build.sh
@@ -7,14 +7,12 @@ OPTIND=1
 export basedir="$(pwd)"
 mkdir -p ${basedir}/out
 mkdir -p ${basedir}/out/logs
-mkdir -p ${basedir}/mono-glue

 # Log output to a file automatically.
 exec > >(tee -a "out/logs/build") 2>&1

 # Config

-# For default registry and number of cores.
 if [ ! -e config.sh ]; then
  echo "No config.sh, copying default values from config.sh.in."
  cp config.sh.in config.sh
@@ -29,63 +27,33 @@ if [ -z "${NUM_CORES}" ]; then
  export NUM_CORES=16
 fi

-registry="${REGISTRY}"
-username=""
-password=""
 godot_version=""
 git_treeish="master"
 build_classical=1
-build_mono=1
-build_steam=0
 force_download=0
-skip_download=1
 skip_git_checkout=0

-while getopts "h?r:u:p:v:g:b:fsc" opt; do
+while getopts "h?v:g:fc" opt; do
  case "$opt" in
  h|\?)
    echo "Usage: $0 [OPTIONS...]"
    echo
-    echo "  -r registry"
-    echo "  -u username"
-    echo "  -p password"
-    echo "  -v godot version (e.g. 3.1-alpha5) [mandatory]"
+    echo "  -v godot version (e.g. 2.1.7-stable) [mandatory]"
    echo "  -g git treeish (e.g. master)"
-    echo "  -b all|classical|mono (default: all)"
    echo "  -f force redownload of all images"
-    echo "  -s skip downloading"
    echo "  -c skip checkout"
    echo
    exit 1
    ;;
-  r)
-    registry=$OPTARG
-    ;;
-  u)
-    username=$OPTARG
-    ;;
-  p)
-    password=$OPTARG
-    ;;
  v)
    godot_version=$OPTARG
    ;;
  g)
    git_treeish=$OPTARG
    ;;
-  b)
-    if [ "$OPTARG" == "classical" ]; then
-      build_mono=0
-    elif [ "$OPTARG" == "mono" ]; then
-      build_classical=0
-    fi
-    ;;
  f)
    force_download=1
    ;;
-  s)
-    skip_download=1
-    ;;
  c)
    skip_git_checkout=1
    ;;
@@ -109,106 +77,6 @@ case "$choice" in
 esac
 export GODOT_VERSION_STATUS="${status}"

-if [ "${status}" == "stable" ]; then
-  build_steam=1
-fi
-
-if [ ! -z "${username}" ] && [ ! -z "${password}" ]; then
-  if ${podman} login ${registry} -u "${username}" -p "${password}"; then
-    export logged_in=true
-  fi
-fi
-
-if [ $skip_download == 0 ]; then
-  echo "Fetching images"
-  for image in windows linux web; do
-    if [ ${force_download} == 1 ] || ! ${podman} image exists godot/$image; then
-      if ! ${podman} pull ${registry}/godot/${image}; then
-        echo "ERROR: image $image does not exist and can't be downloaded"
-        exit 1
-      fi
-    fi
-  done
-
-  if [ ! -z "${logged_in}" ]; then
-    echo "Fetching private images"
-
-    for image in macosx android ios; 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"
-          exit 1
-        fi
-      fi
-    done
-  fi
-fi
-
-# macOS needs MoltenVK
-if [ ! -d "deps/moltenvk" ]; then
-  echo "Missing MoltenVK for macOS, downloading it."
-  mkdir -p deps/moltenvk
-  pushd deps/moltenvk
-  curl -L -o moltenvk.tar https://github.com/godotengine/moltenvk-osxcross/releases/download/vulkan-sdk-1.3.283.0-2/MoltenVK-all.tar
-  tar xf moltenvk.tar && rm -f moltenvk.tar
-  mv MoltenVK/MoltenVK/include/ MoltenVK/
-  mv MoltenVK/MoltenVK/static/MoltenVK.xcframework/ MoltenVK/
-  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
-  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 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
-  unzip -o windows_x86_64.zip && rm -f windows_x86_64.zip
-  unzip -o windows_x86_32.zip && rm -f windows_x86_32.zip
-  unzip -o macos_arm64.zip && rm -f macos_arm64.zip
-  unzip -o macos_x86_64.zip && rm -f macos_x86_64.zip
-  popd
-fi
-
-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
-  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
-  popd
-fi
-
-if [ ! -d "deps/swappy" ]; then
-  echo "Missing Swappy libraries, downloading them."
-  mkdir -p deps/swappy
-  pushd deps/swappy
-  curl -L -O https://github.com/godotengine/godot-swappy/releases/download/from-source-2025-01-31/godot-swappy.7z
-  7z x godot-swappy.7z && rm godot-swappy.7z
-  popd
-fi
-
-# Keystore for Android editor signing
-# Optional - the config.sh will be copied but if it's not filled in,
-# it will do an unsigned build.
-if [ ! -d "deps/keystore" ]; then
-  mkdir -p deps/keystore
-  cp config.sh deps/keystore/
-  if [ ! -z "$GODOT_ANDROID_SIGN_KEYSTORE" ]; then
-    cp "$GODOT_ANDROID_SIGN_KEYSTORE" deps/keystore/
-    sed -i deps/keystore/config.sh -e "s@$GODOT_ANDROID_SIGN_KEYSTORE@/root/keystore/$GODOT_ANDROID_SIGN_KEYSTORE@"
-  fi
-fi
-
 if [ "${skip_git_checkout}" == 0 ]; then
  git clone https://github.com/godotengine/godot git || /bin/true
  pushd git
@@ -232,18 +100,15 @@ EOF
    exit 1
  fi

-  sh misc/scripts/make_tarball.sh -v ${godot_version} -g ${git_treeish}
+  sh ../make_tarball.sh -v ${godot_version} -g ${git_treeish}
  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} -v ${basedir}/godot-${godot_version}.tar.gz:/root/godot.tar.gz -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/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 --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
@@ -252,10 +117,10 @@ 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 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
+${podman_run} -v ${basedir}/build-android:/root/build -v ${basedir}/out/android:/root/out 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
@@ -266,4 +131,6 @@ if [ ! -z "$SUDO_UID" ]; then
  uid="${SUDO_UID}"
  gid="${SUDO_GID}"
 fi
-chown -R -f $uid:$gid ${basedir}/git ${basedir}/out ${basedir}/mono-glue ${basedir}/godot*.tar.gz
+chown -R -f $uid:$gid ${basedir}/git ${basedir}/out ${basedir}/godot*.tar.gz
+
+echo "All builds completed. Check `out/logs/` to validate that they all succeeded (e.g. `tail -n 1 out/logs/*`)."
--- a/config.sh.in
+++ b/config.sh.in
@@ -12,59 +12,22 @@
 # relevant tool in your PATH or an absolute path to run it from.
 export PODMAN='podman'

-# GitHub token for @GodotBuilder for releases on godotengine/godot-builds,
-# can use a long expiry date.
-# For stable releases to godotengine/godot, generate a personal token with
-# write access to godotengine/godot for use in publish-release.sh.
-export GH_TOKEN=''
-
-# Path to a Git clone of https://github.com/godotengine/godot-builds.
-# Only used for uploading official releases.
-export GODOT_BUILDS_PATH=''
-
-# Path to the directory with the Steam upload setup.
-export UPLOAD_STEAM_PATH=''
-
-# Path to the directory with the EGS upload setup.
-export UPLOAD_EGS_PATH=''
-
-# Path to the 'butler' binary for upload of stable releases to itch.io.
-export UPLOAD_ITCH_BUTLER=''
-
-# SSH hostname to upload Web editor builds to.
-# Only used for uploading official releases.
-export WEB_EDITOR_HOSTNAME=''
-
-# Registry for build containers.
-# The default registry is the one used for official Godot builds.
-# Note that some of its images are private and only accessible to selected
-# contributors.
-# You can build your own registry with scripts at
-# https://github.com/godotengine/build-containers
-export REGISTRY='registry.prehensile-tales.com'
-
 # Version string of the images to use in build.sh.
-export IMAGE_VERSION='4.x-f36'
+export IMAGE_VERSION='2.1-f43'

 # Default build name used to distinguish between official and custom builds.
-export BUILD_NAME='custom_build'
+export BUILD_REVISION='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'
@@ -77,30 +40,3 @@ export OSX_BUNDLE_ID=''
 export APPLE_TEAM=''
 export APPLE_ID=''
 export APPLE_ID_PASSWORD=''
-
-# NuGet source for publishing .NET packages
-export NUGET_SOURCE='nuget.org'
-# API key for publishing NuGet packages to nuget.org
-export NUGET_API_KEY=''
-
-# MavenCentral (sonatype) credentials
-export OSSRH_GROUP_ID=''
-export OSSRH_USERNAME=''
-export OSSRH_PASSWORD=''
-# Sonatype assigned ID used to upload the generated artifacts
-export SONATYPE_STAGING_PROFILE_ID=''
-# Used to sign the artifacts after they're built
-# ID of the GPG key pair, the last eight characters of its fingerprint
-export SIGNING_KEY_ID=''
-# Passphrase of the key pair
-export SIGNING_PASSWORD=''
-# Base64 encoded private GPG key
-export SIGNING_KEY=''
-
-# Android signing configs
-# Path to the Android keystore file used to sign the release build
-export GODOT_ANDROID_SIGN_KEYSTORE=''
-# Key alias used for signing the release build
-export GODOT_ANDROID_KEYSTORE_ALIAS=''
-# Password for the key used for signing the release build
-export GODOT_ANDROID_SIGN_PASSWORD=''
--- a/make_tarball.sh
+++ b/make_tarball.sh
@@ -0,0 +1,66 @@
+#!/bin/sh
+
+if [ ! -e "version.py" ]; then
+  echo "This script should be ran from the root folder of the Godot repository."
+  exit 1
+fi
+
+while getopts "h?sv:g:" opt; do
+  case "$opt" in
+  h|\?)
+    echo "Usage: $0 [OPTIONS...]"
+    echo
+    echo "  -s script friendly file name (godot.tar.gz)"
+    echo "  -v godot version for file name (e.g. 4.0-stable)"
+    echo "  -g git treeish to archive (e.g. master)"
+    echo
+    exit 1
+    ;;
+  s)
+    script_friendly_name=1
+    ;;
+  v)
+    godot_version=$OPTARG
+    ;;
+  g)
+    git_treeish=$OPTARG
+    ;;
+  esac
+done
+
+if [ ! -z "$git_treeish" ]; then
+  HEAD=$(git rev-parse $git_treeish)
+else
+  HEAD=$(git rev-parse HEAD)
+fi
+
+if [ ! -z "$script_friendly_name" ]; then
+  NAME=godot
+else
+  if [ ! -z "$godot_version" ]; then
+    NAME=godot-$godot_version
+  else
+    NAME=godot-$HEAD
+  fi
+fi
+
+CURDIR=$(pwd)
+TMPDIR=$(mktemp -d -t godot-XXXXXX)
+
+echo "Generating tarball for revision $HEAD with folder name '$NAME'."
+echo
+echo "The tarball will be written to the parent folder:"
+echo "    $(dirname $CURDIR)/$NAME.tar.gz"
+
+git archive $HEAD --prefix=$NAME/ -o $TMPDIR/$NAME.tar
+
+# Adding custom .git/HEAD to tarball so that we can generate VERSION_HASH.
+cd $TMPDIR
+mkdir -p $NAME/.git
+echo $HEAD > $NAME/.git/HEAD
+tar -uf $NAME.tar $NAME
+
+cd $CURDIR
+gzip -c $TMPDIR/$NAME.tar > ../$NAME.tar.gz
+
+rm -rf $TMPDIR
--- a/publish-release.sh
+++ b/publish-release.sh
@@ -11,17 +11,15 @@ exec > >(tee -a "out/logs/publish-release") 2>&1
 source ./config.sh

 godot_version=""
-latest_stable=0
 skip_stable=0
 draft_arg=""

-while getopts "h?v:lsd" opt; do
+while getopts "h?v:sd" opt; do
  case "$opt" in
  h|\?)
    echo "Usage: $0 [OPTIONS...]"
    echo
    echo "  -v godot version (e.g: 3.2-stable) [mandatory]"
-    echo "  -l latest stable release (web editor, itch.io, EGS)"
    echo "  -s don't run stable specific steps"
    echo "  -d publish as draft release on GitHub"
    echo
@@ -30,9 +28,6 @@ while getopts "h?v:lsd" opt; do
  v)
    godot_version=$OPTARG
    ;;
-  l)
-    latest_stable=1
-    ;;
  s)
    skip_stable=1
    ;;
@@ -78,22 +73,6 @@ if [ "${status}" == "stable" -a "${skip_stable}" == "0" ]; then
    echo "Push commits and create it manually before running this script."
    exit 1
  fi
-
-  if [ ! -d "${UPLOAD_STEAM_PATH}" ]; then
-    echo "Invalid config.sh: UPLOAD_STEAM_PATH is not a directory, aborting."
-    exit 1
-  fi
-
-  if [ "${latest_stable}" == "1" ]; then
-    if [ ! -d "${UPLOAD_EGS_PATH}" ]; then
-      echo "Invalid config.sh: UPLOAD_EGS_PATH is not a directory, aborting."
-      exit 1
-    fi
-    if [ ! -x "${UPLOAD_ITCH_BUTLER}" ]; then
-      echo "Invalid config.sh: UPLOAD_ITCH_BUTLER does not point to an executable, aborting."
-      exit 1
-    fi
-  fi
 fi

 # Upload to GitHub godot-builds
@@ -122,108 +101,14 @@ if [ "${status}" == "stable" -a "${skip_stable}" == "0" ]; then
  release_desc=$(echo "$release_info" | jq -r '.body')

  gh release create ${godot_version} --repo godotengine/godot --title "$release_title" --notes "$release_desc" ${draft_arg}
-  gh release upload ${godot_version} ${reldir}/[Gg]* ${reldir}/mono/[Gg]*
+  gh release upload ${godot_version} ${reldir}/[Gg]*
  # Concatenate SHA sums.
  cp ${reldir}/SHA512-SUMS.txt .
-  cat ${reldir}/mono/SHA512-SUMS.txt >> SHA512-SUMS.txt
  gh release upload ${godot_version} SHA512-SUMS.txt
  rm SHA512-SUMS.txt
  popd

-  echo "Uploading stable release to Steam."
-
-  pushd ${UPLOAD_STEAM_PATH}
-  rm -rf content/bin/[Gg]*
-  rm -rf content/editor_data/export_templates/*
-  cp -f ${basedir}/git/*.{md,txt,png,svg} content/
-  # Steam specific binaries prepared by build-release.sh
-  cp -r ${basedir}/steam/[Gg]* content/bin/
-  unzip ${reldir}/${namever}_export_templates.tpz -d content/editor_data/export_templates/
-  mv content/editor_data/export_templates/{templates,${template_version}}
-  steam_build/build.sh
-  popd
-
-  if [ "${latest_stable}" == "1" ]; then
-    echo "Uploading stable release to EGS (latest only)."
-
-    pushd ${UPLOAD_EGS_PATH}
-    rm -rf buildroot-*/*
-    unzip ${reldir}/${namever}_win64.exe.zip -d buildroot-win64/
-    unzip ${reldir}/${namever}_win32.exe.zip -d buildroot-win32/
-    unzip ${reldir}/${namever}_macos.universal.zip -d buildroot-macos/
-    ./upload.sh -v ${godot_version}
-    popd
-
-    echo "Uploading stable release to itch.io (latest only)."
-
-    ${UPLOAD_ITCH_BUTLER} push ${reldir}/${namever}_linux.x86_64.zip godotengine/godot:linux-64-stable --userversion ${godot_version}
-    ${UPLOAD_ITCH_BUTLER} push ${reldir}/${namever}_linux.x86_32.zip godotengine/godot:linux-32-stable --userversion ${godot_version}
-    ${UPLOAD_ITCH_BUTLER} push ${reldir}/${namever}_win64.exe.zip godotengine/godot:windows-64-stable --userversion ${godot_version}
-    ${UPLOAD_ITCH_BUTLER} push ${reldir}/${namever}_win32.exe.zip godotengine/godot:windows-32-stable --userversion ${godot_version}
-    ${UPLOAD_ITCH_BUTLER} push ${reldir}/${namever}_macos.universal.zip godotengine/godot:osx-64-stable --userversion ${godot_version}
-  fi
-
  echo "All stable release upload steps done."
 fi

-# NuGet packages
-
-publish_nuget_packages() {
-  for pkg in "$@"; do
-    dotnet nuget push $pkg --source "${NUGET_SOURCE}" --api-key "${NUGET_API_KEY}" --skip-duplicate
-  done
-}
-
-if [ ! -z "${NUGET_SOURCE}" ] && [ ! -z "${NUGET_API_KEY}" ] && [[ $(type -P "dotnet") ]]; then
-  echo "Publishing NuGet packages..."
-  publish_nuget_packages out/linux/x86_64/tools-mono/GodotSharp/Tools/nupkgs/*.nupkg
-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 library
-
-if [ -d "deps/keystore" ]; then
-  echo "Publishing Android library to MavenCentral..."
-  sh build-android/upload-mavencentral.sh
-else
-  echo "Disabling Android library publishing as deps/keystore doesn't exist."
-fi
-
-# Web editor
-
-echo "Uploading web editor... (with retry logic as it can be flaky)"
-
-MAX_RETRIES=5
-delay=5
-
-retry_command() {
-    local attempt=1
-    local cmd=$1
-    while [ ${attempt} -le ${MAX_RETRIES} ]; do
-        echo "Attempt ${attempt}: Running command..."
-        eval "${cmd}" && return 0  # Success
-
-        echo "Command failed. Retrying in ${delay} seconds..."
-        sleep ${delay}
-        ((attempt++))
-        delay=$((delay * 2))  # Exponential backoff
-    done
-
-    echo "❌ Command failed after ${MAX_RETRIES} attempts."
-    return 1
-}
-
-command="sudo mv /home/akien/web_editor/${template_version} /var/www/editor.godotengine.org/public/releases/"
-command="${command}; cd /var/www/editor.godotengine.org; sudo chown -R www-data:www-data public/releases/${template_version}"
-command="${command}; sudo ./create-symlinks.sh -v ${template_version}"
-if [ "${latest_stable}" == "1" ]; then
-  echo "Marking web editor build as 'latest'."
-  command="${command} -l"
-fi
-
-retry_command "scp -P 22 -r web/${template_version} ${WEB_EDITOR_HOSTNAME}:/home/akien/web_editor/"
-sleep 2
-retry_command "ssh -p 22 ${WEB_EDITOR_HOSTNAME} '${command}'"
-
 echo "All publishing steps done. Check out/logs/publish-release to double check that all steps succeeded."
Author	SHA1	Message	Date
Rémi Verschelde	9d9b8f80f3	Trim down scripts to build Godot 2.1 with modern containers	2025-11-26 21:39:36 +01:00
Rémi Verschelde	7126657c58	Windows: Update godot-nir-static to 23.1.9-2 (#137 ) Companion PR to: - https://github.com/godotengine/godot-nir-static/pull/22 - https://github.com/godotengine/godot-nir-static/pull/23 - https://github.com/godotengine/godot/pull/111762	2025-11-04 01:11:07 +01:00
Rémi Verschelde	fd3bd4ad89	publish-release: Add -d argument to publish as draft release on GH (#135 )	2025-10-29 10:52:10 +01:00
Anish Kumar	38f2a5e351	Android Editor: Add release url to dev/beta/rc notes on Play Store (#134 )	2025-10-27 18:29:54 +01:00
Rémi Verschelde	8f39b6a9cb	Temporarily disable visionOS builds as we lack a build container with compatible Swift SDK (#133 )	2025-10-18 12:18:14 +02:00
Stuart Carnie	9fbd2dbc44	Apple: Update to Apple 26.0 SDKs (#129 )	2025-10-18 12:02:45 +02:00
Rémi Verschelde	d72076547a	Fix check for Play Store JSON upload key	2025-10-15 23:09:00 +02:00
Anish Mishra	33d44ce966	Publish Android Editor stable releases to open testing track (#130 )	2025-10-14 01:01:34 +02:00
Anish Mishra	f17aad663b	Automate Play Store uploads for the Android Editor (#128 ) Co-authored-by: Rémi Verschelde <remi@godotengine.org>	2025-10-10 14:07:15 +02:00
Thaddeus Crews	4ffb22bfd7	Merge pull request #121 from rsanchezsaez/apple/apple-embedded-unified-template [build-release.sh] Use new unified iOS/visionOS Xcode project template	2025-09-19 13:12:06 -05:00
Thaddeus Crews	a08918cf61	Merge pull request #126 from m4gr3d/fix_android_native_debug_symbols_name Update the name of the Android native debug symbols files to start with a `g`	2025-08-28 12:36:32 -05:00
Fredia Huya-Kouadio	dd9cf6163a	Update the name of the Android native debug symbols files to start with a `g`	2025-08-28 10:32:22 -07:00
Thaddeus Crews	f1439e80e1	Merge pull request #123 from bruvzg/ac17 Update access-kit to 0.17.0	2025-08-01 12:22:04 -05:00
Pāvels Nadtočajevs	dbe21464e8	Update access-kit to 0.17.0	2025-07-24 10:33:34 +03:00
Thaddeus Crews	84d8bf774a	Merge pull request #122 from m4gr3d/include_native_debug_symbols_android Include the Android native debug symbols in the release binaries	2025-07-22 12:52:00 -05:00
Fredia Huya-Kouadio	6224c714c9	Include the Android native debug symbols in the release binaries	2025-07-22 10:16:04 -07:00
Thaddeus Crews	5b0684d8fb	Merge pull request #120 from m4gr3d/update_android_build_config Android: Fix native debug symbols generation	2025-07-07 10:15:37 -05:00
Ricardo Sanchez-Saez	1012966dbb	[build-release.sh] Use new unified iOS/visionOS Xcode project template	2025-06-26 16:33:33 -07:00
Fredia Huya-Kouadio	2c4962d347	Fix native debug symbols generation	2025-06-26 00:15:51 -07:00
Rémi Verschelde	fb6991e3c0	Merge pull request #118 from godotengine/windows-new-signing Windows: Change code signing process to match new key	2025-06-24 10:21:38 +02:00
Rémi Verschelde	11046692e1	Windows: Change code signing process to match new key	2025-06-18 12:44:22 +02:00
Rémi Verschelde	7cc22b8254	Merge pull request #115 from stuartcarnie/appleembedded Apple: add visionOS build support; unify build container	2025-06-16 02:04:05 +02:00
Stuart Carnie	e7412b53cd	Apple: add visionOS build support; unify build container iOS builds now use the godot-embedded build container, like visionOS (and eventually tvOS). Refactored iOS build script to be easier to maintain and duplicate for visionOS. Co-authored-by: Rémi Verschelde <rverschelde@gmail.com>	2025-06-13 23:43:49 +02:00
Rémi Verschelde	f8e8e20da2	Merge pull request #117 from godotengine/update-toolchains-f42 Update toolchains based on Fedora 42 for Godot 4.5	2025-06-13 23:40:12 +02:00
Rémi Verschelde	d95bc9b24c	Update toolchains based on Fedora 42 for Godot 4.5	2025-06-13 23:39:07 +02:00
Rémi Verschelde	7b2ea29c50	Merge pull request #116 from bruvzg/angle_upd Update Angle to chromium/7219	2025-06-09 10:57:27 +02:00
Pāvels Nadtočajevs	3e4ab70d3c	Update Angle to chromium/7219	2025-06-09 11:17:24 +03:00
Rémi Verschelde	b1cf9b6095	Merge pull request #114 from bruvzg/ac_16 Update access-kit to 0.16.0, reenable it for 32-bit Windows builds.	2025-06-04 15:39:03 +02:00
Pāvels Nadtočajevs	74e21311a4	Update access-kit to 0.16.0, reenable it for 32-bit Windows builds.	2025-06-03 10:54:41 +03:00
Rémi Verschelde	6d05bde764	Android: Clean build folder at some intermediate steps to reduce disk usage With debug symbols, the full Android build can take around 100G currently.	2025-06-02 12:05:34 +02:00
Rémi Verschelde	05a4bfed90	Merge pull request #113 from rsanchezsaez/apple/apple-embedded-rename [build-ios] Rename 'IOS_TOOLCHAIN_PATH' to 'APPLE_TOOLCHAIN_PATH'	2025-05-29 09:54:05 +02:00
Ricardo Sanchez-Saez	38dbce0679	[build-ios] Rename 'IOS_TOOLCHAIN_PATH' to 'APPLE_TOOLCHAIN_PATH'	2025-05-14 07:35:56 +01:00
Rémi Verschelde	8c9fd0328b	Define `redirect_build_objects=no` to avoid copying GBs of `bin/obj`	2025-05-13 23:23:27 +02:00
Rémi Verschelde	7a89e9087d	Merge pull request #112 from m4gr3d/enable_android_debug_symbols Setup Android debug symbols	2025-05-13 15:48:43 +02:00
Rémi Verschelde	6cc1418b6b	Windows: Disable accesskit for x86_32 builds, doesn't work yet with MinGW	2025-04-25 23:55:34 +02:00
Fredia Huya-Kouadio	3a34cfa1bc	Setup Android debug symbols	2025-04-22 10:49:47 -07:00
Rémi Verschelde	36d2cc32d6	Merge pull request #111 from m4gr3d/setup_godot_tools_lib_maven_central Update the Android build scripts to allow exporting 'Godot Tools' Android library to MavenCentral	2025-04-22 12:20:57 +02:00
Fredia Huya-Kouadio	95ed6d23db	Update the Android build scripts to allow exporting 'Godot Tools' Android library to MavenCentral	2025-03-30 19:11:43 -07:00
Rémi Verschelde	3348432f38	Merge pull request #110 from godotengine/stable-release-upload publish-release: Add support to upload stable builds to GH, Steam, EGS and itch.io	2025-03-27 11:26:57 +01:00
Rémi Verschelde	73402a1c9f	publish-release: Add support to upload stable builds to GH, Steam, EGS and itch.io	2025-03-26 13:14:08 +01:00
Rémi Verschelde	d831be12a8	Merge pull request #109 from bruvzg/accesskit Add accesskit-c to the build setup.	2025-03-21 10:01:30 +01:00
Pāvels Nadtočajevs	44992c6c76	Add accesskit-c to the build setup.	2025-03-21 09:47:31 +02:00