publish-release: Add -d argument to publish as draft release on GH (#135 )

(cherry picked from commit fd3bd4ad89)
publish-release: Add support to upload stable builds to GH, Steam, EGS and itch.io
2026-01-01 09:48:47 +03:00 · 2025-10-29 10:53:15 +01:00 · 2025-03-27 11:27:38 +01:00 · 2025-03-18 17:12:16 +01:00 · 2025-03-12 23:43:17 +01:00 · 2025-03-04 00:45:26 +01:00
23 changed files with 1170 additions and 850 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
-# User-specific configuration and signing key
+# User-specific configuration and signing keys
 config.sh
+*.jks
 *.pfx
 *.pkcs12

@@ -15,5 +16,9 @@ angle.7z
 out/
 releases/
 sha512sums/
+steam/
 tmp/
 web/
+
+# macOS
+.DS_Store
--- a/build-android/build.sh
+++ b/build-android/build.sh
@@ -6,43 +6,95 @@ set -e

 export SCONS="scons -j${NUM_CORES} verbose=yes warnings=no progress=no"
 export OPTIONS="production=yes"
-export OPTIONS_MONO="module_mono_enabled=yes mono_static=no"
+export OPTIONS_MONO="module_mono_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/

-dnf install -y java-11-openjdk-devel
-java --version
+# Environment variables and keystore needed for signing store editor build,
+# as well as signing and publishing to MavenCentral.
+source /root/keystore/config.sh
+
+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

 # Classical

 if [ "${CLASSICAL}" == "1" ]; then
  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 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 android_arch=arm64v8 $OPTIONS tools=no target=release_debug
-  $SCONS platform=android android_arch=arm64v8 $OPTIONS tools=no target=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

-  $SCONS platform=android android_arch=x86 $OPTIONS tools=no target=release_debug
-  $SCONS platform=android android_arch=x86 $OPTIONS tools=no target=release
+  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

-  $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
+  # 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/android_debug.apk
-  cp bin/android_release.apk /root/out/templates/android_release.apk
-  cp bin/godot-lib.release.aar /root/out/templates/godot-lib.release.aar
+  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
@@ -50,34 +102,29 @@ fi
 if [ "${MONO}" == "1" ]; then
  echo "Starting Mono build for Android..."

-  cp /root/mono-glue/*.cpp modules/mono/glue/
  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=android android_arch=armv7 $OPTIONS $OPTIONS_MONO mono_prefix=/root/mono-installs/android-armeabi-v7a-release tools=no target=release_debug
-  $SCONS platform=android android_arch=armv7 $OPTIONS $OPTIONS_MONO mono_prefix=/root/mono-installs/android-armeabi-v7a-release tools=no target=release
+  $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 android_arch=arm64v8 $OPTIONS $OPTIONS_MONO mono_prefix=/root/mono-installs/android-arm64-v8a-release tools=no target=release_debug
-  $SCONS platform=android android_arch=arm64v8 $OPTIONS $OPTIONS_MONO mono_prefix=/root/mono-installs/android-arm64-v8a-release tools=no target=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 android_arch=x86 $OPTIONS $OPTIONS_MONO mono_prefix=/root/mono-installs/android-x86-release tools=no target=release_debug
-  $SCONS platform=android android_arch=x86 $OPTIONS $OPTIONS_MONO mono_prefix=/root/mono-installs/android-x86-release tools=no target=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 android_arch=x86_64 $OPTIONS $OPTIONS_MONO mono_prefix=/root/mono-installs/android-x86_64-release tools=no target=release_debug
-  $SCONS platform=android android_arch=x86_64 $OPTIONS $OPTIONS_MONO mono_prefix=/root/mono-installs/android-x86_64-release tools=no target=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 generateGodotTemplates
+  ./gradlew generateGodotMonoTemplates
  popd

  mkdir -p /root/out/templates-mono
-  cp bin/android_source.zip /root/out/templates-mono
-  cp bin/android_debug.apk /root/out/templates-mono/android_debug.apk
-  cp bin/android_release.apk /root/out/templates-mono/android_release.apk
-  cp bin/godot-lib.release.aar /root/out/templates-mono/godot-lib.release.aar
-
-  mkdir -p /root/out/templates-mono/bcl
-  cp -r /root/mono-installs/android-bcl/* /root/out/templates-mono/bcl/
+  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

 echo "Android build successful"
--- a/build-android/upload-mavencentral.sh
+++ b/build-android/upload-mavencentral.sh
@@ -0,0 +1,18 @@
+#/bin/bash
+
+basedir="$(pwd)"
+
+if [ ! -d "${basedir}/deps/keystore" ]; then
+  echo "Couldn't find ${basedir}/deps/keystore. Make sure to run this from the root folder of the Git repository."
+fi
+
+source ${basedir}/deps/keystore/config.sh
+
+# Release the Godot Android library to MavenCentral
+${PODMAN} run -it --rm \
+  -v ${basedir}/out/android/source:/root/godot -v ${basedir}/deps/keystore:/root/keystore \
+  localhost/godot-android:${IMAGE_VERSION} bash -c \
+    "source /root/keystore/config.sh && \
+    cp -r /root/godot/.gradle /root && \
+    cd /root/godot/platform/android/java && \
+    ./gradlew publishTemplateReleasePublicationToSonatypeRepository --max-workers 1 closeAndReleaseSonatypeStagingRepository"
--- a/build-ios/build.sh
+++ b/build-ios/build.sh
@@ -8,10 +8,10 @@ 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 mono_static=yes"
+export OPTIONS_MONO="module_mono_enabled=yes"
 export TERM=xterm

-export IOS_SDK="14.4"
+export IOS_SDK="18.2"
 export IOS_LIPO="/root/ioscross/arm64/bin/arm-apple-darwin11-lipo"

 rm -rf godot
@@ -25,32 +25,32 @@ if [ "${CLASSICAL}" == "1" ]; then
  echo "Starting classical build for iOS..."

  # arm64 device
-  $SCONS platform=iphone $OPTIONS arch=arm64 tools=no ios_simulator=no target=release_debug \
-    IPHONESDK="/root/ioscross/arm64/SDK/iPhoneOS${IOS_SDK}.sdk" IPHONEPATH="/root/ioscross/arm64/" ios_triple="arm-apple-darwin11-"
-  $SCONS platform=iphone $OPTIONS arch=arm64 tools=no ios_simulator=no target=release \
-    IPHONESDK="/root/ioscross/arm64/SDK/iPhoneOS${IOS_SDK}.sdk" IPHONEPATH="/root/ioscross/arm64/" ios_triple="arm-apple-darwin11-"
+  $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=iphone $OPTIONS arch=arm64 tools=no ios_simulator=yes target=release_debug \
-  #  IPHONESDK="/root/ioscross/arm64_sim/SDK/iPhoneOS${IOS_SDK}.sdk" IPHONEPATH="/root/ioscross/arm64_sim/" ios_triple="arm-apple-darwin11-"
-  #$SCONS platform=iphone $OPTIONS arch=arm64 tools=no ios_simulator=no target=release \
-  #  IPHONESDK="/root/ioscross/arm64_sim/SDK/iPhoneOS${IOS_SDK}.sdk" IPHONEPATH="/root/ioscross/arm64_sim/" ios_triple="arm-apple-darwin11-"
+  #$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=iphone $OPTIONS arch=x86_64 tools=no ios_simulator=yes target=release_debug \
-    IPHONESDK="/root/ioscross/x86_64_sim/SDK/iPhoneOS${IOS_SDK}.sdk" IPHONEPATH="/root/ioscross/x86_64_sim/" ios_triple="x86_64-apple-darwin11-"
-  $SCONS platform=iphone $OPTIONS arch=x86_64 tools=no ios_simulator=yes target=release \
-    IPHONESDK="/root/ioscross/x86_64_sim/SDK/iPhoneOS${IOS_SDK}.sdk" IPHONEPATH="/root/ioscross/x86_64_sim/" ios_triple="x86_64-apple-darwin11-"
+  $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.iphone.opt.arm64.a /root/out/templates/libgodot.iphone.a
-  cp bin/libgodot.iphone.opt.debug.arm64.a /root/out/templates/libgodot.iphone.debug.a
-  #$IOS_LIPO -create bin/libgodot.iphone.opt.arm64.simulator.a bin/libgodot.iphone.opt.x86_64.simulator.a -output /root/out/templates/libgodot.iphone.simulator.a
-  #$IOS_LIPO -create bin/libgodot.iphone.opt.debug.arm64.simulator.a bin/libgodot.iphone.opt.debug.x86_64.simulator.a -output /root/out/templates/libgodot.iphone.debug.simulator.a
-  cp bin/libgodot.iphone.opt.x86_64.simulator.a /root/out/templates/libgodot.iphone.simulator.a
-  cp bin/libgodot.iphone.opt.debug.x86_64.simulator.a /root/out/templates/libgodot.iphone.debug.simulator.a
+  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
@@ -58,59 +58,36 @@ fi
 if [ "${MONO}" == "1" ]; then
  echo "Starting Mono build for iOS..."

-  cp /root/mono-glue/*.cpp modules/mono/glue/
  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/

  # arm64 device
-  $SCONS platform=iphone $OPTIONS $OPTIONS_MONO arch=arm64 ios_simulator=no mono_prefix=/root/mono-installs/ios-arm64-release tools=no target=release_debug \
-    IPHONESDK="/root/ioscross/arm64/SDK/iPhoneOS${IOS_SDK}.sdk" IPHONEPATH="/root/ioscross/arm64/" ios_triple="arm-apple-darwin11-"
-  $SCONS platform=iphone $OPTIONS $OPTIONS_MONO arch=arm64 ios_simulator=no mono_prefix=/root/mono-installs/ios-arm64-release tools=no target=release \
-    IPHONESDK="/root/ioscross/arm64/SDK/iPhoneOS${IOS_SDK}.sdk" IPHONEPATH="/root/ioscross/arm64/" ios_triple="arm-apple-darwin11-"
+  $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=iphone $OPTIONS $OPTIONS_MONO arch=arm64 ios_simulator=yes mono_prefix=/root/mono-installs/ios-arm64-sim-release tools=no target=release_debug \
-  #  IPHONESDK="/root/ioscross/arm64_sim/SDK/iPhoneOS${IOS_SDK}.sdk" IPHONEPATH="/root/ioscross/arm64_sim/" ios_triple="arm-apple-darwin11-"
-  #$SCONS platform=iphone $OPTIONS $OPTIONS_MONO arch=arm64 ios_simulator=yes mono_prefix=/root/mono-installs/ios-arm64-sim-release tools=no target=release \
-  #  IPHONESDK="/root/ioscross/arm64_sim/SDK/iPhoneOS${IOS_SDK}.sdk" IPHONEPATH="/root/ioscross/arm64_sim/" ios_triple="arm-apple-darwin11-"
+  #$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=iphone $OPTIONS $OPTIONS_MONO arch=x86_64 ios_simulator=yes mono_prefix=/root/mono-installs/ios-x86_64-release tools=no target=release_debug \
-    IPHONESDK="/root/ioscross/x86_64_sim/SDK/iPhoneOS${IOS_SDK}.sdk" IPHONEPATH="/root/ioscross/x86_64_sim/" ios_triple="x86_64-apple-darwin11-"
-  $SCONS platform=iphone $OPTIONS $OPTIONS_MONO arch=x86_64 ios_simulator=yes mono_prefix=/root/mono-installs/ios-x86_64-release tools=no target=release \
-    IPHONESDK="/root/ioscross/x86_64_sim/SDK/iPhoneOS${IOS_SDK}.sdk" IPHONEPATH="/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_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.iphone.opt.arm64.a /root/out/templates-mono/libgodot.iphone.a
-  cp bin/libgodot.iphone.opt.debug.arm64.a /root/out/templates-mono/libgodot.iphone.debug.a
-  #$IOS_LIPO -create bin/libgodot.iphone.opt.arm64.simulator.a bin/libgodot.iphone.opt.x86_64.simulator.a -output /root/out/templates-mono/libgodot.iphone.simulator.a
-  #$IOS_LIPO -create bin/libgodot.iphone.opt.debug.arm64.simulator.a bin/libgodot.iphone.opt.debug.x86_64.simulator.a -output /root/out/templates-mono/libgodot.iphone.debug.simulator.a
-  cp bin/libgodot.iphone.opt.x86_64.simulator.a /root/out/templates-mono/libgodot.iphone.simulator.a
-  cp bin/libgodot.iphone.opt.debug.x86_64.simulator.a /root/out/templates-mono/libgodot.iphone.debug.simulator.a
-
-  cp -r misc/dist/iphone-mono-libs /root/out/templates-mono/iphone-mono-libs
-
-  cp bin/libmonosgen-2.0.iphone.arm64.a /root/out/templates-mono/iphone-mono-libs/libmonosgen-2.0.xcframework/ios-arm64/libmonosgen.a
-  cp bin/libmono-native.iphone.arm64.a /root/out/templates-mono/iphone-mono-libs/libmono-native.xcframework/ios-arm64/libmono-native.a
-  cp bin/libmono-profiler-log.iphone.arm64.a /root/out/templates-mono/iphone-mono-libs/libmono-profiler-log.xcframework/ios-arm64/libmono-profiler-log.a
-
-  #$IOS_LIPO -create bin/libmonosgen-2.0.iphone.arm64.simulator.a bin/libmonosgen-2.0.iphone.x86_64.simulator.a -output /root/out/templates-mono/iphone-mono-libs/libmonosgen-2.0.xcframework/ios-arm64_x86_64-simulator/libmonosgen.a
-  #$IOS_LIPO -create bin/libmono-native.iphone.arm64.simulator.a bin/libmono-native.iphone.x86_64.simulator.a -output /root/out/templates-mono/iphone-mono-libs/libmono-native.xcframework/ios-arm64_x86_64-simulator/libmono-native.a
-  #$IOS_LIPO -create bin/libmono-profiler-log.iphone.arm64.simulator.a bin/libmono-profiler-log.iphone.x86_64.simulator.a -output /root/out/templates-mono/iphone-mono-libs/libmono-profiler-log.xcframework/ios-arm64_x86_64-simulator/libmono-profiler-log.a
-  cp bin/libmonosgen-2.0.iphone.x86_64.simulator.a /root/out/templates-mono/iphone-mono-libs/libmonosgen-2.0.xcframework/ios-arm64_x86_64-simulator/libmonosgen.a
-  cp bin/libmono-native.iphone.x86_64.simulator.a /root/out/templates-mono/iphone-mono-libs/libmono-native.xcframework/ios-arm64_x86_64-simulator/libmono-native.a
-  cp bin/libmono-profiler-log.iphone.x86_64.simulator.a /root/out/templates-mono/iphone-mono-libs/libmono-profiler-log.xcframework/ios-arm64_x86_64-simulator/libmono-profiler-log.a
-
-  # The Mono libraries for the interpreter are not available for simulator builds
-  cp bin/libmono-ee-interp.iphone.arm64.a /root/out/templates-mono/iphone-mono-libs/libmono-ee-interp.xcframework/ios-arm64/libmono-ee-interp.a
-  cp bin/libmono-icall-table.iphone.arm64.a /root/out/templates-mono/iphone-mono-libs/libmono-icall-table.xcframework/ios-arm64/libmono-icall-table.a
-  cp bin/libmono-ilgen.iphone.arm64.a /root/out/templates-mono/iphone-mono-libs/libmono-ilgen.xcframework/ios-arm64/libmono-ilgen.a
-
-  mkdir -p /root/out/templates-mono/bcl
-  cp -r /root/mono-installs/ios-bcl/* /root/out/templates-mono/bcl
+  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

 echo "iOS build successful"
--- a/build-javascript/build.sh
+++ b/build-javascript/build.sh
@@ -1,67 +0,0 @@
-#!/bin/bash
-
-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 mono_static=yes mono_prefix=/root/mono-installs/wasm-runtime-release use_lto=no"
-export TERM=xterm
-
-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 JavaScript..."
-
-  source /root/emsdk_${EMSCRIPTEN_CLASSICAL}/emsdk_env.sh
-
-  $SCONS platform=javascript ${OPTIONS} target=release_debug tools=no
-  $SCONS platform=javascript ${OPTIONS} target=release tools=no
-
-  $SCONS platform=javascript ${OPTIONS} target=release_debug tools=no threads_enabled=yes
-  $SCONS platform=javascript ${OPTIONS} target=release tools=no threads_enabled=yes
-
-  $SCONS platform=javascript ${OPTIONS} target=release_debug tools=no gdnative_enabled=yes
-  $SCONS platform=javascript ${OPTIONS} target=release tools=no gdnative_enabled=yes
-
-  mkdir -p /root/out/templates
-  cp -rvp bin/*.zip /root/out/templates
-  rm -f bin/*.zip
-
-  $SCONS platform=javascript ${OPTIONS} target=release_debug tools=yes threads_enabled=yes use_closure_compiler=yes
-
-  mkdir -p /root/out/tools
-  cp -rvp bin/*.zip /root/out/tools
-  rm -f bin/*.zip
-
-fi
-
-# Mono
-
-if [ "${MONO}" == "1" ]; then
-  echo "Starting Mono build for JavaScript..."
-
-  source /root/emsdk_${EMSCRIPTEN_MONO}/emsdk_env.sh
-
-  cp /root/mono-glue/*.cpp modules/mono/glue/
-  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=javascript ${OPTIONS} ${OPTIONS_MONO} target=release_debug tools=no
-  $SCONS platform=javascript ${OPTIONS} ${OPTIONS_MONO} target=release tools=no
-
-  mkdir -p /root/out/templates-mono
-  cp -rvp bin/*.zip /root/out/templates-mono
-  rm -f bin/*.zip
-
-  mkdir -p /root/out/templates-mono/bcl
-  cp -r /root/mono-installs/wasm-bcl/wasm /root/out/templates-mono/bcl/
-fi
-
-echo "JavaScript build successful"
--- a/build-linux/build.sh
+++ b/build-linux/build.sh
@@ -6,9 +6,7 @@ set -e

 export SCONS="scons -j${NUM_CORES} verbose=yes warnings=no progress=no"
 export OPTIONS="production=yes"
-export OPTIONS_MONO="module_mono_enabled=yes mono_static=yes"
-export MONO_PREFIX_X86_64="/root/mono-installs/desktop-linux-x86_64-release"
-export MONO_PREFIX_X86="/root/mono-installs/desktop-linux-x86-release"
+export OPTIONS_MONO="module_mono_enabled=yes"
 export TERM=xterm

 rm -rf godot
@@ -23,28 +21,54 @@ if [ "${CLASSICAL}" == "1" ]; then

  export PATH="${GODOT_SDK_LINUX_X86_64}/bin:${BASE_PATH}"

-  $SCONS platform=x11 $OPTIONS tools=yes target=release_debug
-  mkdir -p /root/out/x64/tools
-  cp -rvp bin/* /root/out/x64/tools
+  $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 $OPTIONS tools=no target=release_debug
-  $SCONS platform=x11 $OPTIONS tools=no target=release
-  mkdir -p /root/out/x64/templates
-  cp -rvp bin/* /root/out/x64/templates
+  $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}/bin:${BASE_PATH}"
+  export PATH="${GODOT_SDK_LINUX_X86_32}/bin:${BASE_PATH}"

-  $SCONS platform=x11 $OPTIONS tools=yes target=release_debug bits=32
-  mkdir -p /root/out/x86/tools
-  cp -rvp bin/* /root/out/x86/tools
+  $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 $OPTIONS tools=no target=release_debug bits=32
-  $SCONS platform=x11 $OPTIONS tools=no target=release bits=32
-  mkdir -p /root/out/x86/templates
-  cp -rvp bin/* /root/out/x86/templates
+  $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_ARM64}/bin:${BASE_PATH}"
+
+  $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

@@ -53,36 +77,63 @@ fi
 if [ "${MONO}" == "1" ]; then
  echo "Starting Mono build for Linux..."

-  cp /root/mono-glue/*.cpp modules/mono/glue/
  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}"
-  export OPTIONS_MONO_PREFIX="${OPTIONS} ${OPTIONS_MONO} mono_prefix=${MONO_PREFIX_X86_64}"

-  $SCONS platform=x11 $OPTIONS_MONO_PREFIX tools=yes target=release_debug copy_mono_root=yes
-  mkdir -p /root/out/x64/tools-mono
-  cp -rvp bin/* /root/out/x64/tools-mono
+  $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=x11 $OPTIONS_MONO_PREFIX tools=no target=release_debug
-  $SCONS platform=x11 $OPTIONS_MONO_PREFIX tools=no target=release
-  mkdir -p /root/out/x64/templates-mono
-  cp -rvp bin/* /root/out/x64/templates-mono
+  $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}/bin:${BASE_PATH}"
-  export OPTIONS_MONO_PREFIX="${OPTIONS} ${OPTIONS_MONO} mono_prefix=${MONO_PREFIX_X86}"
+  export PATH="${GODOT_SDK_LINUX_X86_32}/bin:${BASE_PATH}"

-  $SCONS platform=x11 $OPTIONS_MONO_PREFIX tools=yes target=release_debug copy_mono_root=yes bits=32
-  mkdir -p /root/out/x86/tools-mono
-  cp -rvp bin/* /root/out/x86/tools-mono
+  $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=x11 $OPTIONS_MONO_PREFIX tools=no target=release_debug bits=32
-  $SCONS platform=x11 $OPTIONS_MONO_PREFIX tools=no target=release bits=32
-  mkdir -p /root/out/x86/templates-mono
-  cp -rvp bin/* /root/out/x86/templates-mono
+  $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

--- a/build-macos/build.sh
+++ b/build-macos/build.sh
@@ -0,0 +1,71 @@
+#!/bin/bash
+
+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
+
+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 macOS..."
+
+  $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
+
+echo "macOS build successful"
--- a/build-macosx/build.sh
+++ b/build-macosx/build.sh
@@ -1,100 +0,0 @@
-#!/bin/bash
-
-set -e
-
-# Config
-
-export SCONS="scons -j${NUM_CORES} verbose=yes warnings=no progress=no"
-export OPTIONS="osxcross_sdk=darwin20.2 production=yes"
-export OPTIONS_MONO="module_mono_enabled=yes mono_static=yes"
-export MONO_PREFIX_X86_64="/root/mono-installs/desktop-osx-x86_64-release"
-export MONO_PREFIX_ARM64="/root/mono-installs/desktop-osx-arm64-release"
-export STRIP="x86_64-apple-darwin20.2-strip -u -r"
-export TERM=xterm
-
-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 macOS..."
-
-  $SCONS platform=osx $OPTIONS arch=x86_64 tools=yes target=release_debug
-  $SCONS platform=osx $OPTIONS arch=arm64 tools=yes target=release_debug
-  lipo -create bin/godot.osx.opt.tools.x86_64 bin/godot.osx.opt.tools.arm64 -output bin/godot.osx.opt.tools.universal
-  $STRIP bin/godot.osx.opt.tools.universal
-
-  mkdir -p /root/out/tools
-  cp -rvp bin/* /root/out/tools
-  rm -rf bin
-
-  $SCONS platform=osx $OPTIONS arch=x86_64 tools=no target=release_debug
-  $SCONS platform=osx $OPTIONS arch=arm64 tools=no target=release_debug
-  lipo -create bin/godot.osx.opt.debug.x86_64 bin/godot.osx.opt.debug.arm64 -output bin/godot.osx.opt.debug.universal
-  $STRIP bin/godot.osx.opt.debug.universal
-  $SCONS platform=osx $OPTIONS arch=x86_64 tools=no target=release
-  $SCONS platform=osx $OPTIONS arch=arm64 tools=no target=release
-  lipo -create bin/godot.osx.opt.x86_64 bin/godot.osx.opt.arm64 -output bin/godot.osx.opt.universal
-  $STRIP bin/godot.osx.opt.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 /root/mono-glue/*.cpp modules/mono/glue/
-  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/
-
-  # Note: A bit of dylib wrangling involved as x86_64 and arm64 builds both generate GodotSharp
-  # so the second build overrides the first, but we need to lipo the libs to make them universal.
-  # We also need to ensure that /etc/mono/config has the proper filenames (keep arm64 as the last
-  # build so that we rely on its config, which has libmono-native.dylib instead of
-  # libmono-native-compat.dylib).
-  mkdir -p tmp-lib/{x86_64,arm64}
-
-  $SCONS platform=osx $OPTIONS $OPTIONS_MONO mono_prefix=$MONO_PREFIX_X86_64 arch=x86_64 tools=yes target=release_debug copy_mono_root=yes
-  cp bin/GodotSharp/Mono/lib/*.dylib tmp-lib/x86_64/
-  $SCONS platform=osx $OPTIONS $OPTIONS_MONO mono_prefix=$MONO_PREFIX_ARM64 arch=arm64 tools=yes target=release_debug copy_mono_root=yes
-  cp bin/GodotSharp/Mono/lib/*.dylib tmp-lib/arm64/
-  lipo -create bin/godot.osx.opt.tools.x86_64.mono bin/godot.osx.opt.tools.arm64.mono -output bin/godot.osx.opt.tools.universal.mono
-  $STRIP bin/godot.osx.opt.tools.universal.mono
-
-  # Make universal versions of the dylibs we use.
-  lipo -create tmp-lib/x86_64/libmono-native-compat.dylib tmp-lib/arm64/libmono-native.dylib -output tmp-lib/libmono-native.dylib
-  lipo -create tmp-lib/x86_64/libMonoPosixHelper.dylib tmp-lib/arm64/libMonoPosixHelper.dylib -output tmp-lib/libMonoPosixHelper.dylib
-  # Somehow only included in x86_64 build.
-  cp tmp-lib/x86_64/libmono-btls-shared.dylib tmp-lib/
-
-  cp -f tmp-lib/*.dylib bin/GodotSharp/Mono/lib/
-
-  mkdir -p /root/out/tools-mono
-  cp -rvp bin/* /root/out/tools-mono
-  rm -rf bin
-
-  $SCONS platform=osx $OPTIONS $OPTIONS_MONO mono_prefix=$MONO_PREFIX_X86_64 arch=x86_64 tools=no target=release_debug
-  $SCONS platform=osx $OPTIONS $OPTIONS_MONO mono_prefix=$MONO_PREFIX_ARM64 arch=arm64 tools=no target=release_debug
-  lipo -create bin/godot.osx.opt.debug.x86_64.mono bin/godot.osx.opt.debug.arm64.mono -output bin/godot.osx.opt.debug.universal.mono
-  $STRIP bin/godot.osx.opt.debug.universal.mono
-  $SCONS platform=osx $OPTIONS $OPTIONS_MONO mono_prefix=$MONO_PREFIX_X86_64 arch=x86_64 tools=no target=release
-  $SCONS platform=osx $OPTIONS $OPTIONS_MONO mono_prefix=$MONO_PREFIX_ARM64 arch=arm64 tools=no target=release
-  lipo -create bin/godot.osx.opt.x86_64.mono bin/godot.osx.opt.arm64.mono -output bin/godot.osx.opt.universal.mono
-  $STRIP bin/godot.osx.opt.universal.mono
-
-  cp -f tmp-lib/*.dylib bin/data.mono.osx.64.release/Mono/lib/
-  cp -f tmp-lib/*.dylib bin/data.mono.osx.64.release_debug/Mono/lib/
-
-  mkdir -p /root/out/templates-mono
-  cp -rvp bin/* /root/out/templates-mono
-  rm -rf bin
-fi
-
-echo "macOS build successful"
--- a/build-mono-glue/build.sh
+++ b/build-mono-glue/build.sh
@@ -8,6 +8,7 @@ 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
@@ -19,13 +20,12 @@ tar xf ../godot.tar.gz --strip-components=1
 if [ "${MONO}" == "1" ]; then
  echo "Building and generating Mono glue..."

-  mono --version
-  export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/usr/lib/pkgconfig/
+  dotnet --info

-  ${SCONS} platform=x11 bits=64 ${OPTIONS} target=release_debug tools=yes module_mono_enabled=yes mono_glue=no
+  ${SCONS} platform=linuxbsd ${OPTIONS} target=editor module_mono_enabled=yes

  rm -rf /root/mono-glue/*
-  xvfb-run bin/godot.x11.opt.tools.64.mono --audio-driver Dummy --generate-mono-glue /root/mono-glue || /bin/true
+  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
@@ -1,6 +1,10 @@
 #!/bin/bash

 set -e
+export basedir=$(pwd)
+
+# Log output to a file automatically.
+exec > >(tee -a "out/logs/build-release") 2>&1

 # Config

@@ -26,7 +30,7 @@ sign_macos() {
  if [ -z "${OSX_HOST}" ]; then
    return
  fi
-  _osx_tmpdir=$(ssh "${OSX_HOST}" "mktemp -d")
+  _macos_tmpdir=$(ssh "${OSX_HOST}" "mktemp -d")
  _reldir="$1"
  _binname="$2"
  _is_mono="$3"
@@ -34,37 +38,35 @@ sign_macos() {
  if [[ "${_is_mono}" == "1" ]]; then
    _appname="Godot_mono.app"
    _sharpdir="${_appname}/Contents/Resources/GodotSharp"
-    _extra_files="${_sharpdir}/Mono/lib/*.dylib ${_sharpdir}/Tools/aot-compilers/*/*"
  else
    _appname="Godot.app"
  fi

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

-  _request_uuid=$(ssh "${OSX_HOST}" "xcrun altool --notarize-app --primary-bundle-id \"${OSX_BUNDLE_ID}\" --username \"${APPLE_ID}\" --password \"${APPLE_ID_PASSWORD}\" --file ${_osx_tmpdir}/${_binname}_signed.zip")
-  _request_uuid=$(echo ${_request_uuid} | sed -e 's/.*RequestUUID = //')
-  ssh "${OSX_HOST}" "while xcrun altool --notarization-info ${_request_uuid} -u \"${APPLE_ID}\" -p \"${APPLE_ID_PASSWORD}\" | grep -q Status:\ in\ progress; do echo Waiting on Apple notarization...; sleep 30s; done"
-  if ! ssh "${OSX_HOST}" "xcrun altool --notarization-info ${_request_uuid} -u \"${APPLE_ID}\" -p \"${APPLE_ID_PASSWORD}\" | grep -q Status:\ success"; then
+  _request_uuid=$(ssh "${OSX_HOST}" "xcrun notarytool submit ${_macos_tmpdir}/${_binname}_signed.zip --team-id \"${APPLE_TEAM}\" --apple-id \"${APPLE_ID}\" --password \"${APPLE_ID_PASSWORD}\" --no-progress --output-format json")
+  _request_uuid=$(echo ${_request_uuid} | sed -e 's/.*"id":"\([^"]*\)".*/\1/')
+  if ! ssh "${OSX_HOST}" "xcrun notarytool wait ${_request_uuid} --team-id \"${APPLE_TEAM}\" --apple-id \"${APPLE_ID}\" --password \"${APPLE_ID_PASSWORD}\" | grep -q status:\ Accepted"; then
    echo "Notarization failed."
-    _notarization_log=$(ssh "${OSX_HOST}" "xcrun altool --notarization-info ${_request_uuid} -u \"${APPLE_ID}\" -p \"${APPLE_ID_PASSWORD}\"")
+    _notarization_log=$(ssh "${OSX_HOST}" "xcrun notarytool log ${_request_uuid} --team-id \"${APPLE_TEAM}\" --apple-id \"${APPLE_ID}\" --password \"${APPLE_ID_PASSWORD}\"")
    echo "${_notarization_log}"
-    ssh "${OSX_HOST}" "rm -rf ${_osx_tmpdir}"
+    ssh "${OSX_HOST}" "rm -rf ${_macos_tmpdir}"
    exit 1
  else
    ssh "${OSX_HOST}" "
-            cd ${_osx_tmpdir} && \
+            cd ${_macos_tmpdir} && \
            xcrun stapler staple ${_appname} && \
            zip -r ${_binname}_stapled.zip ${_appname}"
-    scp "${OSX_HOST}:${_osx_tmpdir}/${_binname}_stapled.zip" "${_reldir}/${_binname}.zip"
-    ssh "${OSX_HOST}" "rm -rf ${_osx_tmpdir}"
+    scp "${OSX_HOST}:${_macos_tmpdir}/${_binname}_stapled.zip" "${_reldir}/${_binname}.zip"
+    ssh "${OSX_HOST}" "rm -rf ${_macos_tmpdir}"
  fi
 }

@@ -72,40 +74,40 @@ sign_macos_template() {
  if [ -z "${OSX_HOST}" ]; then
    return
  fi
-  _osx_tmpdir=$(ssh "${OSX_HOST}" "mktemp -d")
+  _macos_tmpdir=$(ssh "${OSX_HOST}" "mktemp -d")
  _reldir="$1"
  _is_mono="$2"

-  if [[ "${_is_mono}" == "1" ]]; then
-    _extra_files="osx_template.app/Contents/Resources/data.mono.*/Mono/lib/*.dylib"
-  fi
-
-  scp "${_reldir}/osx.zip" "${OSX_HOST}:${_osx_tmpdir}"
+  scp "${_reldir}/macos.zip" "${OSX_HOST}:${_macos_tmpdir}"
  ssh "${OSX_HOST}" "
-            cd ${_osx_tmpdir} && \
-            unzip osx.zip && \
+            cd ${_macos_tmpdir} && \
+            unzip macos.zip && \
            codesign --force -s - \
              --options=linker-signed \
-              -v ${_extra_files} osx_template.app/Contents/MacOS/* && \
-            zip -r osx_signed.zip osx_template.app"
+              -v macos_template.app/Contents/MacOS/* && \
+            zip -r macos_signed.zip macos_template.app"

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

 godot_version=""
 templates_version=""
+do_cleanup=1
+make_tarball=1
 build_classical=1
 build_mono=1

-while getopts "h?v:t:b:" opt; do
+while getopts "h?v:t:b:n-:" opt; do
  case "$opt" in
  h|\?)
    echo "Usage: $0 [OPTIONS...]"
    echo
    echo "  -v godot version (e.g: 3.2-stable) [mandatory]"
    echo "  -t templates version (e.g. 3.2.stable) [mandatory]"
-    echo "  -b all|classical|mono (default: all)"
+    echo "  -b build target: all|classical|mono|none (default: all)"
+    echo "  --no-cleanup disable deleting pre-existing output folders (default: false)"
+    echo "  --no-tarball disable generating source tarball (default: false)"
    echo
    exit 1
    ;;
@@ -120,8 +122,27 @@ while getopts "h?v:t:b:" opt; do
      build_mono=0
    elif [ "$OPTARG" == "mono" ]; then
      build_classical=0
+    elif [ "$OPTARG" == "none" ]; then
+      build_classical=0
+      build_mono=0
    fi
    ;;
+  -)
+    case "${OPTARG}" in
+    no-cleanup)
+      do_cleanup=0
+      ;;
+    no-tarball)
+      make_tarball=0
+      ;;
+    *)
+      if [ "$OPTERR" == 1 ] && [ "${optspec:0:1}" != ":" ]; then
+        echo "Unknown option --${OPTARG}."
+        exit 1
+      fi
+      ;;
+    esac
+    ;;
  esac
 done

@@ -133,34 +154,46 @@ elif [[ "{$templates_version}" == *"-"* ]]; then
  exit 1
 fi

-export basedir=$(pwd)
-export webdir="${basedir}/web/${templates_version}"
 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}"

 # Cleanup and setup

-rm -rf ${webdir}
-rm -rf ${reldir}
-rm -rf ${tmpdir}
+if [ "${do_cleanup}" == "1" ]; then

-mkdir -p ${webdir}
-mkdir -p ${reldir}
-mkdir -p ${reldir_mono}
-mkdir -p ${templatesdir}
-mkdir -p ${templatesdir_mono}
+  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

 # Tarball

-zcat godot-${godot_version}.tar.gz | xz -c > ${reldir}/godot-${godot_version}.tar.xz
-pushd ${reldir}
-sha256sum godot-${godot_version}.tar.xz > godot-${godot_version}.tar.xz.sha256
-popd
+if [ "${make_tarball}" == "1" ]; then
+
+  zcat godot-${godot_version}.tar.gz | xz -c > ${reldir}/godot-${godot_version}.tar.xz
+  pushd ${reldir}
+  sha256sum godot-${godot_version}.tar.xz > godot-${godot_version}.tar.xz.sha256
+  popd
+
+fi

 # Classical

@@ -169,112 +202,161 @@ if [ "${build_classical}" == "1" ]; then
  ## Linux (Classical) ##

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

-  binname="${godot_basename}_x11.32"
-  cp out/linux/x86/tools/godot.x11.opt.tools.32 ${binname}
-  strip ${binname}
+  binname="${godot_basename}_linux.x86_32"
+  cp out/linux/x86_32/tools/godot.linuxbsd.editor.x86_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/x64/templates/godot.x11.opt.64 ${templatesdir}/linux_x11_64_release
-  cp out/linux/x64/templates/godot.x11.opt.debug.64 ${templatesdir}/linux_x11_64_debug
-  cp out/linux/x86/templates/godot.x11.opt.32 ${templatesdir}/linux_x11_32_release
-  cp out/linux/x86/templates/godot.x11.opt.debug.32 ${templatesdir}/linux_x11_32_debug
-  strip ${templatesdir}/linux_x11_*
+  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

  ## Windows (Classical) ##

  # Editor
  binname="${godot_basename}_win64.exe"
-  cp out/windows/x64/tools/godot.windows.opt.tools.64.exe ${binname}
-  strip ${binname}
+  wrpname="${godot_basename}_win64_console.exe"
+  cp out/windows/x86_64/tools/godot.windows.editor.x86_64.exe ${binname}
  sign_windows ${binname}
-  zip -q -9 "${reldir}/${binname}.zip" ${binname}
-  rm ${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}

  binname="${godot_basename}_win32.exe"
-  cp out/windows/x86/tools/godot.windows.opt.tools.32.exe ${binname}
-  strip ${binname}
+  wrpname="${godot_basename}_win32_console.exe"
+  cp out/windows/x86_32/tools/godot.windows.editor.x86_32.exe ${binname}
  sign_windows ${binname}
-  zip -q -9 "${reldir}/${binname}.zip" ${binname}
-  rm ${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}

  # Templates
-  cp out/windows/x64/templates/godot.windows.opt.64.exe ${templatesdir}/windows_64_release.exe
-  cp out/windows/x64/templates/godot.windows.opt.debug.64.exe ${templatesdir}/windows_64_debug.exe
-  cp out/windows/x86/templates/godot.windows.opt.32.exe ${templatesdir}/windows_32_release.exe
-  cp out/windows/x86/templates/godot.windows.opt.debug.32.exe ${templatesdir}/windows_32_debug.exe
-  strip ${templatesdir}/windows*.exe
+  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

-  ## OSX (Classical) ##
+  ## macOS (Classical) ##

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

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

-  cp out/macosx/templates/godot.osx.opt.universal osx_template.app/Contents/MacOS/godot_osx_release.64
-  cp out/macosx/templates/godot.osx.opt.debug.universal 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
+  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

-  ## Server (Classical) ##
+  ## Steam (Classical) ##

-  # Headless (editor)
-  binname="${godot_basename}_linux_headless.64"
-  cp out/server/x64/tools/godot_server.x11.opt.tools.64 ${binname}
-  strip ${binname}
-  zip -q -9 "${reldir}/${binname}.zip" ${binname}
-  rm ${binname}
+  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

-  # Server (template)
-  binname="${godot_basename}_linux_server.64"
-  cp out/server/x64/templates/godot_server.x11.opt.64 ${binname}
-  strip ${binname}
-  zip -q -9 "${reldir}/${binname}.zip" ${binname}
-  rm ${binname}
-
-  ## Javascript (Classical) ##
+  ## Web (Classical) ##

  # Editor
-  unzip out/javascript/tools/godot.javascript.opt.tools.threads.zip -d ${webdir}/
+  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/javascript/tools/godot.javascript.opt.tools.threads.zip ${reldir}/${binname}
+  cp out/web/tools/godot.web.editor.wasm32.zip ${reldir}/${binname}

  # Templates
-  cp out/javascript/templates/godot.javascript.opt.zip ${templatesdir}/webassembly_release.zip
-  cp out/javascript/templates/godot.javascript.opt.debug.zip ${templatesdir}/webassembly_debug.zip
+  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/javascript/templates/godot.javascript.opt.threads.zip ${templatesdir}/webassembly_threads_release.zip
-  cp out/javascript/templates/godot.javascript.opt.debug.threads.zip ${templatesdir}/webassembly_threads_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/javascript/templates/godot.javascript.opt.gdnative.zip ${templatesdir}/webassembly_gdnative_release.zip
-  cp out/javascript/templates/godot.javascript.opt.debug.gdnative.zip ${templatesdir}/webassembly_gdnative_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

  ## Android (Classical) ##

  # Lib for direct download
-  cp out/android/templates/godot-lib.release.aar ${reldir}/godot-lib.${templates_version}.release.aar
+  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}/
@@ -284,52 +366,17 @@ if [ "${build_classical}" == "1" ]; then

  rm -rf ios_xcode
  cp -r git/misc/dist/ios_xcode ios_xcode
-  cp out/ios/templates/libgodot.iphone.simulator.a ios_xcode/libgodot.iphone.release.xcframework/ios-arm64_x86_64-simulator/libgodot.a
-  cp out/ios/templates/libgodot.iphone.debug.simulator.a ios_xcode/libgodot.iphone.debug.xcframework/ios-arm64_x86_64-simulator/libgodot.a
-  cp out/ios/templates/libgodot.iphone.a ios_xcode/libgodot.iphone.release.xcframework/ios-arm64/libgodot.a
-  cp out/ios/templates/libgodot.iphone.debug.a ios_xcode/libgodot.iphone.debug.xcframework/ios-arm64/libgodot.a
+  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}/iphone.zip" *
+  zip -q -9 -r "${templatesdir}/ios.zip" *
  cd ..
  rm -rf ios_xcode

-  ## UWP (Classical) ##
-
-  if [ ! -d "deps/angle" ]; then
-    echo "Downloading ANGLE binaries from https://github.com/GodotBuilder/godot-builds/releases/tag/_tools"
-    mkdir -p deps && cd deps
-    curl -LO https://github.com/GodotBuilder/godot-builds/releases/download/_tools/angle.7z
-    7z x angle.7z && rm -f angle.7z
-    cd ..
-  fi
-
-  rm -rf uwp_template_*
-  for arch in ARM Win32 x64; do
-    cp -r git/misc/dist/uwp_template uwp_template_${arch}
-    cp deps/angle/winrt/10/src/Release_${arch}/libEGL.dll \
-      deps/angle/winrt/10/src/Release_${arch}/libGLESv2.dll \
-      uwp_template_${arch}/
-    cp -r uwp_template_${arch} uwp_template_${arch}_debug
-  done
-
-  cp out/uwp/arm/godot.uwp.opt.32.arm.exe uwp_template_ARM/godot.uwp.exe
-  cp out/uwp/arm/godot.uwp.opt.debug.32.arm.exe uwp_template_ARM_debug/godot.uwp.exe
-  cd uwp_template_ARM && zip -q -9 -r "${templatesdir}/uwp_arm_release.zip" * && cd ..
-  cd uwp_template_ARM_debug && zip -q -9 -r "${templatesdir}/uwp_arm_debug.zip" * && cd ..
-  rm -rf uwp_template_ARM*
-
-  cp out/uwp/x86/godot.uwp.opt.32.x86.exe uwp_template_Win32/godot.uwp.exe
-  cp out/uwp/x86/godot.uwp.opt.debug.32.x86.exe uwp_template_Win32_debug/godot.uwp.exe
-  cd uwp_template_Win32 && zip -q -9 -r "${templatesdir}/uwp_x86_release.zip" * && cd ..
-  cd uwp_template_Win32_debug && zip -q -9 -r "${templatesdir}/uwp_x86_debug.zip" * && cd ..
-  rm -rf uwp_template_Win32*
-
-  cp out/uwp/x64/godot.uwp.opt.64.x64.exe uwp_template_x64/godot.uwp.exe
-  cp out/uwp/x64/godot.uwp.opt.debug.64.x64.exe uwp_template_x64_debug/godot.uwp.exe
-  cd uwp_template_x64 && zip -q -9 -r "${templatesdir}/uwp_x64_release.zip" * && cd ..
-  cd uwp_template_x64_debug && zip -q -9 -r "${templatesdir}/uwp_x64_debug.zip" * && cd ..
-  rm -rf uwp_template_x64*
-
  ## Templates TPZ (Classical) ##

  echo "${templates_version}" > ${templatesdir}/version.txt
@@ -354,161 +401,161 @@ if [ "${build_mono}" == "1" ]; then
  ## Linux (Mono) ##

  # Editor
-  binbasename="${godot_basename}_mono_x11"
-  mkdir -p ${binbasename}_64
-  cp out/linux/x64/tools-mono/godot.x11.opt.tools.64.mono ${binbasename}_64/${binbasename}.64
-  strip ${binbasename}_64/${binbasename}.64
-  cp -rp out/linux/x64/tools-mono/GodotSharp ${binbasename}_64/
-  cp -rp out/aot-compilers ${binbasename}_64/GodotSharp/Tools/
-  zip -r -q -9 "${reldir_mono}/${binbasename}_64.zip" ${binbasename}_64
-  rm -rf ${binbasename}_64
+  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_x11"
-  mkdir -p ${binbasename}_32
-  cp out/linux/x86/tools-mono/godot.x11.opt.tools.32.mono ${binbasename}_32/${binbasename}.32
-  strip ${binbasename}_32/${binbasename}.32
-  cp -rp out/linux/x86/tools-mono/GodotSharp/ ${binbasename}_32/
-  cp -rp out/aot-compilers ${binbasename}_32/GodotSharp/Tools/
-  zip -r -q -9 "${reldir_mono}/${binbasename}_32.zip" ${binbasename}_32
-  rm -rf ${binbasename}_32
+  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 -rp out/linux/x64/templates-mono/data.mono.x11.64.* ${templatesdir_mono}/
-  cp out/linux/x64/templates-mono/godot.x11.opt.debug.64.mono ${templatesdir_mono}/linux_x11_64_debug
-  cp out/linux/x64/templates-mono/godot.x11.opt.64.mono ${templatesdir_mono}/linux_x11_64_release
-  cp -rp out/linux/x86/templates-mono/data.mono.x11.32.* ${templatesdir_mono}/
-  cp out/linux/x86/templates-mono/godot.x11.opt.debug.32.mono ${templatesdir_mono}/linux_x11_32_debug
-  cp out/linux/x86/templates-mono/godot.x11.opt.32.mono ${templatesdir_mono}/linux_x11_32_release
-  strip ${templatesdir_mono}/linux_x11*
-
-  mkdir -p ${templatesdir_mono}/bcl
-  cp -r out/linux/x64/tools-mono/GodotSharp/Mono/lib/mono/4.5/ ${templatesdir_mono}/bcl/net_4_x
+  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/x64/tools-mono/godot.windows.opt.tools.64.mono.exe ${binname}/${binname}.exe
-  strip ${binname}/${binname}.exe
+  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/x64/tools-mono/GodotSharp ${binname}/
-  cp -rp out/aot-compilers ${binname}/GodotSharp/Tools/
+  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/tools-mono/godot.windows.opt.tools.32.mono.exe ${binname}/${binname}.exe
-  strip ${binname}/${binname}.exe
+  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/tools-mono/GodotSharp ${binname}/
-  cp -rp out/aot-compilers ${binname}/GodotSharp/Tools/
+  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 -rp out/windows/x64/templates-mono/data.mono.windows.64.* ${templatesdir_mono}/
-  cp out/windows/x64/templates-mono/godot.windows.opt.debug.64.mono.exe ${templatesdir_mono}/windows_64_debug.exe
-  cp out/windows/x64/templates-mono/godot.windows.opt.64.mono.exe ${templatesdir_mono}/windows_64_release.exe
-  cp -rp out/windows/x86/templates-mono/data.mono.windows.32.* ${templatesdir_mono}/
-  cp out/windows/x86/templates-mono/godot.windows.opt.debug.32.mono.exe ${templatesdir_mono}/windows_32_debug.exe
-  cp out/windows/x86/templates-mono/godot.windows.opt.32.mono.exe ${templatesdir_mono}/windows_32_release.exe
-  strip ${templatesdir_mono}/windows*.exe
+  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

-  mkdir -p ${templatesdir_mono}/bcl
-  cp -r out/windows/x64/tools-mono/GodotSharp/Mono/lib/mono/4.5/ ${templatesdir_mono}/bcl/net_4_x_win
-
-  ## OSX (Mono) ##
+  ## macOS (Mono) ##

  # Editor
-  binname="${godot_basename}_mono_osx.universal"
+  binname="${godot_basename}_mono_macos.universal"
  rm -rf Godot_mono.app
-  cp -r git/misc/dist/osx_tools.app Godot_mono.app
+  cp -r git/misc/dist/macos_tools.app Godot_mono.app
  mkdir -p Godot_mono.app/Contents/{MacOS,Resources}
-  cp out/macosx/tools-mono/godot.osx.opt.tools.universal.mono Godot_mono.app/Contents/MacOS/Godot
-  cp -rp out/macosx/tools-mono/GodotSharp Godot_mono.app/Contents/Resources/GodotSharp
-  cp -rp out/aot-compilers Godot_mono.app/Contents/Resources/GodotSharp/Tools/
+  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 osx_template.app
-  cp -r git/misc/dist/osx_template.app .
-  mkdir -p osx_template.app/Contents/{MacOS,Resources}
-  cp out/macosx/templates-mono/godot.osx.opt.debug.universal.mono osx_template.app/Contents/MacOS/godot_osx_debug.64
-  cp out/macosx/templates-mono/godot.osx.opt.universal.mono osx_template.app/Contents/MacOS/godot_osx_release.64
-  cp -rp out/macosx/templates-mono/data.mono.osx.64.* osx_template.app/Contents/Resources/
-  chmod +x osx_template.app/Contents/MacOS/godot_osx*
-  zip -q -9 -r "${templatesdir_mono}/osx.zip" osx_template.app
-  rm -rf osx_template.app
+  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

-  ## Server (Mono) ##
-
-  # Headless (editor)
-  binbasename="${godot_basename}_mono_linux_headless"
-  mkdir -p ${binbasename}_64
-  cp out/server/x64/tools-mono/godot_server.x11.opt.tools.64.mono ${binbasename}_64/${binbasename}.64
-  strip ${binbasename}_64/${binbasename}.64
-  cp -rp out/server/x64/tools-mono/GodotSharp ${binbasename}_64/
-  cp -rp out/aot-compilers ${binbasename}_64/GodotSharp/Tools/
-  zip -r -q -9 "${reldir_mono}/${binbasename}_64.zip" ${binbasename}_64
-  rm -rf ${binbasename}_64
-
-  # Server (template)
-  binbasename="${godot_basename}_mono_linux_server"
-  mkdir -p ${binbasename}_64
-  cp out/server/x64/templates-mono/godot_server.x11.opt.64.mono ${binbasename}_64/${binbasename}.64
-  strip ${binbasename}_64/${binbasename}.64
-  cp -rp out/server/x64/templates-mono/data.mono.server.64.release ${binbasename}_64/data_${binbasename}_64
-  zip -r -q -9 "${reldir_mono}/${binbasename}_64.zip" ${binbasename}_64
-  rm -rf ${binbasename}_64
-
-  ## Javascript (Mono) ##
-
-  # Templates
-  cp out/javascript/templates-mono/godot.javascript.opt.debug.mono.zip ${templatesdir_mono}/webassembly_debug.zip
-  cp out/javascript/templates-mono/godot.javascript.opt.mono.zip ${templatesdir_mono}/webassembly_release.zip
-
-  mkdir -p ${templatesdir_mono}/bcl
-  cp -r out/javascript/templates-mono/bcl/wasm ${templatesdir_mono}/bcl/
-
  ## Android (Mono) ##

  # Lib for direct download
-  cp out/android/templates-mono/godot-lib.release.aar ${reldir_mono}/godot-lib.${templates_version}.mono.release.aar
+  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}/

-  mkdir -p ${templatesdir_mono}/bcl
-  cp -r out/android/templates-mono/bcl/godot_android_ext ${templatesdir_mono}/bcl/
-  cp -r out/android/templates-mono/bcl/monodroid ${templatesdir_mono}/bcl/
-
  ## iOS (Mono) ##

  rm -rf ios_xcode
  cp -r git/misc/dist/ios_xcode ios_xcode
-  cp out/ios/templates-mono/libgodot.iphone.simulator.a ios_xcode/libgodot.iphone.release.xcframework/ios-arm64_x86_64-simulator/libgodot.a
-  cp out/ios/templates-mono/libgodot.iphone.debug.simulator.a ios_xcode/libgodot.iphone.debug.xcframework/ios-arm64_x86_64-simulator/libgodot.a
-  cp out/ios/templates-mono/libgodot.iphone.a ios_xcode/libgodot.iphone.release.xcframework/ios-arm64/libgodot.a
-  cp out/ios/templates-mono/libgodot.iphone.debug.a ios_xcode/libgodot.iphone.debug.xcframework/ios-arm64/libgodot.a
+  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}/iphone.zip" *
+  zip -q -9 -r "${templatesdir_mono}/ios.zip" *
  cd ..
  rm -rf ios_xcode

-  mkdir -p ${templatesdir_mono}/bcl
-  cp -r out/ios/templates-mono/bcl/monotouch* ${templatesdir_mono}/bcl/
-  cp -r out/ios/templates-mono/iphone-mono-libs ${templatesdir_mono}
+  # No .NET support for those platforms yet.

-  ## UWP (Mono) ##
+  if false; then

-  # Not supported yet.
+  ## 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) ##

--- a/build-server/build.sh
+++ b/build-server/build.sh
@@ -1,54 +0,0 @@
-#!/bin/bash
-
-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 mono_static=yes mono_prefix=/root/mono-installs/desktop-linux-x86_64-release"
-export TERM=xterm
-export PATH="${GODOT_SDK_LINUX_X86_64}/bin:${BASE_PATH}"
-
-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 Server..."
-
-  $SCONS platform=server $OPTIONS tools=yes target=release_debug
-  mkdir -p /root/out/x64/tools
-  cp -rvp bin/* /root/out/x64/tools
-  rm -rf bin
-
-  $SCONS platform=server $OPTIONS tools=no target=release
-  mkdir -p /root/out/x64/templates
-  cp -rvp bin/* /root/out/x64/templates
-  rm -rf bin
-fi
-
-# Mono
-
-if [ "${MONO}" == "1" ]; then
-  echo "Starting Mono build for Server..."
-
-  cp /root/mono-glue/*.cpp modules/mono/glue/
-  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=server $OPTIONS $OPTIONS_MONO tools=yes target=release_debug copy_mono_root=yes
-  mkdir -p /root/out/x64/tools-mono
-  cp -rvp bin/* /root/out/x64/tools-mono
-  rm -rf bin
-
-  $SCONS platform=server $OPTIONS $OPTIONS_MONO tools=no target=release
-  mkdir -p /root/out/x64/templates-mono
-  cp -rvp bin/* /root/out/x64/templates-mono
-  rm -rf bin
-fi
-
-echo "Server build successful"
--- a/build-uwp/build.bat
+++ b/build-uwp/build.bat
@@ -1,3 +0,0 @@
-call z:\root\build\env-%1.bat
-
-%SCONS% platform=uwp %OPTIONS% tools=no target=%2 LINK="\"C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Tools\MSVC\14.16.27023\bin\HostX64\%1\link.exe\""
--- a/build-uwp/build.sh
+++ b/build-uwp/build.sh
@@ -1,43 +0,0 @@
-#!/bin/bash
-
-set -e
-
-# Config
-
-export SCONS="call scons -j${NUM_CORES} verbose=yes warnings=no progress=no"
-export OPTIONS="production=yes"
-export BUILD_ARCHES="x86 x64 arm"
-export ANGLE_SRC_PATH='c:\angle'
-
-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 UWP..."
-
-  for arch in ${BUILD_ARCHES}; do
-    for release in release release_debug; do
-      wine cmd /c /root/build/build.bat $arch $release
-
-      sync
-      wineserver -kw
-
-      mkdir -p /root/out/$arch
-      mv bin/* /root/out/$arch
-    done
-  done
-fi
-
-# Mono
-
-if [ "${MONO}" == "1" ]; then
-  echo "No Mono support for UWP yet."
-  #cp /root/mono-glue/*.cpp modules/mono/glue/
-  #cp -r /root/mono-glue/Managed/Generated modules/mono/glue/Managed/
-fi
-
-echo "UWP build successful"
--- a/build-uwp/env-arm.bat
+++ b/build-uwp/env-arm.bat
@@ -1,36 +0,0 @@
-set ALLUSERSPROFILE=C:\ProgramData
-set CommandPromptType=Native
-set CommonProgramFiles=C:\Program Files\Common Files
-set CommonProgramFiles(x86)=C:\Program Files (x86)\Common Files
-set CommonProgramW6432=C:\Program Files\Common Files
-set DevEnvDir=C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\Common7\IDE\
-set ExtensionSdkDir=C:\Program Files (x86)\Microsoft SDKs\Windows Kits\10\ExtensionSDKs
-set Framework40Version=v4.0
-set FrameworkDir=C:\Windows\Microsoft.NET\Framework64\
-set FrameworkDir64=C:\Windows\Microsoft.NET\Framework64\
-set FrameworkVersion=v4.0.30319
-set FrameworkVersion64=v4.0.30319
-set VCIDEInstallDir=C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\Common7\IDE\VC\
-set VCINSTALLDIR=C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\
-set VCToolsInstallDir=C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Tools\MSVC\14.16.27023\
-set VCToolsRedistDir=C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Redist\MSVC\14.16.27012\
-set VCToolsVersion=14.16.27023
-set VisualStudioVersion=15.0
-set VS150COMNTOOLS=C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\Common7\Tools\
-set VSCMD_ARG_app_plat=UWP
-set Platform=arm
-set VSCMD_ARG_HOST_ARCH=x86
-set VSCMD_ARG_TGT_ARCH=arm
-set VSCMD_ARG_winsdk=10.0.16299.0
-set VSCMD_VER=15.0
-set VSINSTALLDIR=C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\
-set Path=C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Tools\MSVC\14.16.27023\bin\HostX86\arm;C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\Common7\IDE\VC\VCPackages;C:\Program Files (x86)\Microsoft Visual Studio\2017\Build Tools\Common7\IDE\CommonExtensions\Microsoft\TeamFoundation\Team Explorer;C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\MSBuild\15.0\bin\Roslyn;C:\Program Files (x86)\Windows Kits\10\bin\10.0.16299.0\arm;C:\Program Files (x86)\Windows Kits\10\bin\arm;C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\\MSBuild\15.0\bin;C:\Windows\Microsoft.NET\Framework\ v4.0.30319;C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\Common7\IDE\;C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\Common7\Tools\;C:\Program Files\Python37\Scripts\;C:\Program Files\Python37\;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\ProgramData\chocolatey\bin;C:\Program Files\OpenSSH-Win64;C:\Program Files\Git\cmd;C:\Windows\system32\config\systemprofile\AppData\Local\Microsoft\WindowsApps;C:\Users\user\AppData\Local\Microsoft\WindowsApps;
-set INCLUDE=C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Tools\MSVC\14.16.27023\include;C:\Program Files (x86)\Windows Kits\10\include\10.0.16299.0\ucrt;C:\Program Files (x86)\Windows Kits\10\include\10.0.16299.0\shared;C:\Program Files (x86)\Windows Kits\10\include\10.0.16299.0\um;C:\Program Files (x86)\Windows Kits\10\include\10.0.16299.0\winrt;C:\Program Files (x86)\Windows Kits\10\include\10.0.16299.0\cppwinrt
-set LIB=C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Tools\MSVC\14.16.27023\lib\arm\store\;C:\Program Files (x86)\Windows Kits\10\lib\10.0.16299.0\ucrt\arm;C:\Program Files (x86)\Windows Kits\10\lib\10.0.16299.0\um\arm;
-set LIBPATH=C:\Program Files (x86)\Microsoft SDKs\Windows Kits\10\ExtensionSDKs\Microsoft.VCLibs\14.0\References\CommonConfiguration\neutral;C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Tools\MSVC\14.16.27023\lib\arm\store\references;C:\Program Files (x86)\Windows Kits\10\UnionMetadata\10.0.16299.0;C:\Program Files (x86)\Windows Kits\10\References\10.0.16299.0;C:\Windows\Microsoft.NET\Framework\v4.0.30319;
-set WindowsLibPath=C:\Program Files (x86)\Windows Kits\10\UnionMetadata\10.0.16299.0;C:\Program Files (x86)\Windows Kits\10\References\10.0.16299.0
-set WindowsSdkBinPath=C:\Program Files (x86)\Windows Kits\10\bin\
-set WindowsSdkDir=C:\Program Files (x86)\Windows Kits\10\
-set WindowsSDKLibVersion=10.0.16299.0\
-set WindowsSdkVerBinPath=C:\Program Files (x86)\Windows Kits\10\bin\10.0.16299.0\
-set WindowsSDKVersion=10.0.16299.0\
--- a/build-uwp/env-x64.bat
+++ b/build-uwp/env-x64.bat
@@ -1,35 +0,0 @@
-set ALLUSERSPROFILE=C:\ProgramData
-set CommandPromptType=Native
-set CommonProgramFiles=C:\Program Files\Common Files
-set CommonProgramFiles(x86)=C:\Program Files (x86)\Common Files
-set CommonProgramW6432=C:\Program Files\Common Files
-set DevEnvDir=C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\Common7\IDE\
-set ExtensionSdkDir=C:\Program Files (x86)\Microsoft SDKs\Windows Kits\10\ExtensionSDKs
-set Framework40Version=v4.0
-set FrameworkDir=C:\Windows\Microsoft.NET\Framework64\
-set FrameworkDir64=C:\Windows\Microsoft.NET\Framework64\
-set FrameworkVersion=v4.0.30319
-set FrameworkVersion64=v4.0.30319
-set VCIDEInstallDir=C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\Common7\IDE\VC\
-set VCINSTALLDIR=C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\
-set VCToolsInstallDir=C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Tools\MSVC\14.16.27023\
-set VCToolsRedistDir=C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Redist\MSVC\14.16.27012\
-set VCToolsVersion=14.16.27023
-set VisualStudioVersion=15.0
-set VS150COMNTOOLS=C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\Common7\Tools\
-set VSCMD_ARG_app_plat=UWP
-set VSCMD_ARG_HOST_ARCH=x86
-set VSCMD_ARG_TGT_ARCH=x64
-set VSCMD_ARG_winsdk=10.0.16299.0
-set VSCMD_VER=15.0
-set VSINSTALLDIR=C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\
-set Path=C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Tools\MSVC\14.16.27023\bin\HostX86\x64;C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\Common7\IDE\VC\VCPackages;C:\Program Files (x86)\Microsoft Visual Studio\2017\Build Tools\Common7\IDE\CommonExtensions\Microsoft\TeamFoundation\Team Explorer;C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\MSBuild\15.0\bin\Roslyn;C:\Program Files (x86)\Windows Kits\10\bin\10.0.16299.0\x64;C:\Program Files (x86)\Windows Kits\10\bin\x64;C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\\MSBuild\15.0\bin;C:\Windows\Microsoft.NET\Framework\ v4.0.30319;C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\Common7\IDE\;C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\Common7\Tools\;C:\Program Files\Python37\Scripts\;C:\Program Files\Python37\;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\ProgramData\chocolatey\bin;C:\Program Files\OpenSSH-Win64;C:\Program Files\Git\cmd;C:\Windows\system32\config\systemprofile\AppData\Local\Microsoft\WindowsApps;C:\Users\user\AppData\Local\Microsoft\WindowsApps;
-set INCLUDE=C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Tools\MSVC\14.16.27023\include;C:\Program Files (x86)\Windows Kits\10\include\10.0.16299.0\ucrt;C:\Program Files (x86)\Windows Kits\10\include\10.0.16299.0\shared;C:\Program Files (x86)\Windows Kits\10\include\10.0.16299.0\um;C:\Program Files (x86)\Windows Kits\10\include\10.0.16299.0\winrt;C:\Program Files (x86)\Windows Kits\10\include\10.0.16299.0\cppwinrt
-set LIB=C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Tools\MSVC\14.16.27023\lib\x64\store\;C:\Program Files (x86)\Windows Kits\10\lib\10.0.16299.0\ucrt\x64;C:\Program Files (x86)\Windows Kits\10\lib\10.0.16299.0\um\x64;
-set LIBPATH=C:\Program Files (x86)\Microsoft SDKs\Windows Kits\10\ExtensionSDKs\Microsoft.VCLibs\14.0\References\CommonConfiguration\neutral;C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Tools\MSVC\14.16.27023\lib\x64\store\references;C:\Program Files (x86)\Windows Kits\10\UnionMetadata\10.0.16299.0;C:\Program Files (x86)\Windows Kits\10\References\10.0.16299.0;C:\Windows\Microsoft.NET\Framework\v4.0.30319;
-set WindowsLibPath=C:\Program Files (x86)\Windows Kits\10\UnionMetadata\10.0.16299.0;C:\Program Files (x86)\Windows Kits\10\References\10.0.16299.0
-set WindowsSdkBinPath=C:\Program Files (x86)\Windows Kits\10\bin\
-set WindowsSdkDir=C:\Program Files (x86)\Windows Kits\10\
-set WindowsSDKLibVersion=10.0.16299.0\
-set WindowsSdkVerBinPath=C:\Program Files (x86)\Windows Kits\10\bin\10.0.16299.0\
-set WindowsSDKVersion=10.0.16299.0\
--- a/build-uwp/env-x86.bat
+++ b/build-uwp/env-x86.bat
@@ -1,36 +0,0 @@
-set ALLUSERSPROFILE=C:\ProgramData
-set CommandPromptType=Native
-set CommonProgramFiles=C:\Program Files\Common Files
-set CommonProgramFiles(x86)=C:\Program Files (x86)\Common Files
-set CommonProgramW6432=C:\Program Files\Common Files
-set DevEnvDir=C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\Common7\IDE\
-set ExtensionSdkDir=C:\Program Files (x86)\Microsoft SDKs\Windows Kits\10\ExtensionSDKs
-set Framework40Version=v4.0
-set FrameworkDir=C:\Windows\Microsoft.NET\Framework64\
-set FrameworkDir64=C:\Windows\Microsoft.NET\Framework64\
-set FrameworkVersion=v4.0.30319
-set FrameworkVersion64=v4.0.30319
-set VCIDEInstallDir=C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\Common7\IDE\VC\
-set VCINSTALLDIR=C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\
-set VCToolsInstallDir=C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Tools\MSVC\14.16.27023\
-set VCToolsRedistDir=C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Redist\MSVC\14.16.27012\
-set VCToolsVersion=14.16.27023
-set VisualStudioVersion=15.0
-set VS150COMNTOOLS=C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\Common7\Tools\
-set VSCMD_ARG_app_plat=UWP
-set VSCMD_ARG_HOST_ARCH=x86
-set VSCMD_ARG_TGT_ARCH=x86
-set VSCMD_ARG_winsdk=10.0.16299.0
-set VSCMD_VER=15.0
-set VSINSTALLDIR=C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\
-set Path=C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Tools\MSVC\14.16.27023\bin\HostX86\x86;C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\Common7\IDE\VC\VCPackages;C:\Program Files (x86)\Microsoft Visual Studio\2017\Build Tools\Common7\IDE\CommonExtensions\Microsoft\TeamFoundation\Team Explorer;C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\MSBuild\15.0\bin\Roslyn;C:\Program Files (x86)\Windows Kits\10\bin\10.0.16299.0\x86;C:\Program Files (x86)\Windows Kits\10\bin\x86;C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\\MSBuild\15.0\bin;C:\Windows\Microsoft.NET\Framework\ v4.0.30319;C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\Common7\IDE\;C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\Common7\Tools\;C:\Program Files\Python37\Scripts\;C:\Program Files\Python37\;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\ProgramData\chocolatey\bin;C:\Program Files\OpenSSH-Win64;C:\Program Files\Git\cmd;C:\Windows\system32\config\systemprofile\AppData\Local\Microsoft\WindowsApps;C:\Users\user\AppData\Local\Microsoft\WindowsApps;
-set INCLUDE=C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Tools\MSVC\14.16.27023\include;C:\Program Files (x86)\Windows Kits\10\include\10.0.16299.0\ucrt;C:\Program Files (x86)\Windows Kits\10\include\10.0.16299.0\shared;C:\Program Files (x86)\Windows Kits\10\include\10.0.16299.0\um;C:\Program Files (x86)\Windows Kits\10\include\10.0.16299.0\winrt;C:\Program Files (x86)\Windows Kits\10\include\10.0.16299.0\cppwinrt
-set LIB=C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Tools\MSVC\14.16.27023\lib\x86\store\;C:\Program Files (x86)\Windows Kits\10\lib\10.0.16299.0\ucrt\x86;C:\Program Files (x86)\Windows Kits\10\lib\10.0.16299.0\um\x86;
-set LIBPATH=C:\Program Files (x86)\Microsoft SDKs\Windows Kits\10\ExtensionSDKs\Microsoft.VCLibs\14.0\References\CommonConfiguration\neutral;C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Tools\MSVC\14.16.27023\lib\x86\store\references;C:\Program Files (x86)\Windows Kits\10\UnionMetadata\10.0.16299.0;C:\Program Files (x86)\Windows Kits\10\References\10.0.16299.0;C:\Windows\Microsoft.NET\Framework\v4.0.30319;
-set WindowsLibPath=C:\Program Files (x86)\Windows Kits\10\UnionMetadata\10.0.16299.0;C:\Program Files (x86)\Windows Kits\10\References\10.0.16299.0
-set WindowsSdkBinPath=C:\Program Files (x86)\Windows Kits\10\bin\
-set WindowsSdkDir=C:\Program Files (x86)\Windows Kits\10\
-set WindowsSDKLibVersion=10.0.16299.0\
-set WindowsSdkVerBinPath=C:\Program Files (x86)\Windows Kits\10\bin\10.0.16299.0\
-set WindowsSDKVersion=10.0.16299.0\
-
--- a/build-web/build.sh
+++ b/build-web/build.sh
@@ -0,0 +1,97 @@
+#!/bin/bash
+
+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
+
+source /root/emsdk/emsdk_env.sh
+
+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 Web..."
+
+  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
+
+echo "Web build successful"
--- a/build-windows/build.sh
+++ b/build-windows/build.sh
@@ -5,10 +5,9 @@ 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 mono_static=yes"
-export MONO_PREFIX_X86_64="/root/mono-installs/desktop-windows-x86_64-release"
-export MONO_PREFIX_X86="/root/mono-installs/desktop-windows-x86-release"
+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

 rm -rf godot
@@ -21,27 +20,49 @@ tar xf /root/godot.tar.gz --strip-components=1
 if [ "${CLASSICAL}" == "1" ]; then
  echo "Starting classical build for Windows..."

-  $SCONS platform=windows bits=64 $OPTIONS tools=yes target=release_debug
-  mkdir -p /root/out/x64/tools
-  cp -rvp bin/* /root/out/x64/tools
+  $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
-  mkdir -p /root/out/x64/templates
-  cp -rvp bin/* /root/out/x64/templates
+  $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
-  mkdir -p /root/out/x86/tools
-  cp -rvp bin/* /root/out/x86/tools
+  $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 bits=32 $OPTIONS tools=no target=release_debug
-  $SCONS platform=windows bits=32 $OPTIONS tools=no target=release
-  mkdir -p /root/out/x86/templates
-  cp -rvp bin/* /root/out/x86/templates
+  $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
@@ -49,34 +70,43 @@ fi
 if [ "${MONO}" == "1" ]; then
  echo "Starting Mono build for Windows..."

-  cp /root/mono-glue/*.cpp modules/mono/glue/
  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 OPTIONS_MONO_PREFIX="${OPTIONS} ${OPTIONS_MONO} mono_prefix=${MONO_PREFIX_X86_64}"
-
-  $SCONS platform=windows bits=64 $OPTIONS_MONO_PREFIX tools=yes target=release_debug copy_mono_root=yes
-  mkdir -p /root/out/x64/tools-mono
-  cp -rvp bin/* /root/out/x64/tools-mono
+  $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 bits=64 $OPTIONS_MONO_PREFIX tools=no target=release_debug
-  $SCONS platform=windows bits=64 $OPTIONS_MONO_PREFIX tools=no target=release
-  mkdir -p /root/out/x64/templates-mono
-  cp -rvp bin/* /root/out/x64/templates-mono
+  $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

-  export OPTIONS_MONO_PREFIX="${OPTIONS} ${OPTIONS_MONO} mono_prefix=${MONO_PREFIX_X86}"
-
-  $SCONS platform=windows bits=32 $OPTIONS_MONO_PREFIX tools=yes target=release_debug copy_mono_root=yes
-  mkdir -p /root/out/x86/tools-mono
-  cp -rvp bin/* /root/out/x86/tools-mono
+  $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 bits=32 $OPTIONS_MONO_PREFIX tools=no target=release_debug
-  $SCONS platform=windows bits=32 $OPTIONS_MONO_PREFIX tools=no target=release
-  mkdir -p /root/out/x86/templates-mono
-  cp -rvp bin/* /root/out/x86/templates-mono
+  $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

--- a/build.sh
+++ b/build.sh
@@ -4,6 +4,14 @@ set -e

 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.
@@ -28,6 +36,7 @@ godot_version=""
 git_treeish="master"
 build_classical=1
 build_mono=1
+build_steam=0
 force_download=0
 skip_download=1
 skip_git_checkout=0
@@ -83,21 +92,7 @@ while getopts "h?r:u:p:v:g:b:fsc" opt; do
  esac
 done

-export podman=none
-if which podman > /dev/null; then
-  export podman=podman
-elif which docker > /dev/null; then
-  export podman=docker
-fi
-
-if [ "${podman}" == "none" ]; then
-  echo "Either podman or docker needs to be installed"
-  exit 1
-fi
-
-if [ $UID != 0 ]; then
-  echo "WARNING: Running as non-root may cause problems for the uwp build"
-fi
+export podman=${PODMAN}

 if [ -z "${godot_version}" ]; then
  echo "-v <version> is mandatory!"
@@ -114,6 +109,10 @@ 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
@@ -122,7 +121,7 @@ fi

 if [ $skip_download == 0 ]; then
  echo "Fetching images"
-  for image in mono-glue windows linux javascript; do
+  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"
@@ -134,7 +133,7 @@ if [ $skip_download == 0 ]; then
  if [ ! -z "${logged_in}" ]; then
    echo "Fetching private images"

-    for image in macosx android ios uwp; do
+    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"
@@ -145,6 +144,71 @@ if [ $skip_download == 0 ]; then
  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
@@ -172,45 +236,34 @@ EOF
  popd
 fi

-export basedir="$(pwd)"
-mkdir -p ${basedir}/out
-mkdir -p ${basedir}/out/logs
-
-export podman_run="${podman} run -it --rm --env BUILD_NAME --env GODOT_VERSION_STATUS --env 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 img_version=3.x-mono-6.12.0.158
-
-# Get AOT compilers from their containers.
-mkdir -p ${basedir}/out/aot-compilers
-${podman} run -it --rm -w /root -v ${basedir}/out/aot-compilers:/root/out localhost/godot-ios:${img_version} bash -c "cp -r /root/aot-compilers/* /root/out"
-chmod +x ${basedir}/out/aot-compilers/*/*
+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 img_version=$IMAGE_VERSION

 mkdir -p ${basedir}/mono-glue
-${podman_run} -v ${basedir}/build-mono-glue:/root/build localhost/godot-mono-glue:${img_version} bash build/build.sh 2>&1 | tee ${basedir}/out/logs/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 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 --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

-mkdir -p ${basedir}/out/javascript
-${podman_run} -v ${basedir}/build-javascript:/root/build -v ${basedir}/out/javascript:/root/out localhost/godot-javascript:${img_version} bash build/build.sh 2>&1 | tee ${basedir}/out/logs/javascript
+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/macosx
-${podman_run} -v ${basedir}/build-macosx:/root/build -v ${basedir}/out/macosx:/root/out localhost/godot-osx:${img_version} bash build/build.sh 2>&1 | tee ${basedir}/out/logs/macosx
+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

 mkdir -p ${basedir}/out/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
+${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

-mkdir -p ${basedir}/out/server
-${podman_run} -v ${basedir}/build-server:/root/build -v ${basedir}/out/server:/root/out localhost/godot-linux:${img_version} bash build/build.sh 2>&1 | tee ${basedir}/out/logs/server
-
-mkdir -p ${basedir}/out/uwp
-${podman_run} --ulimit nofile=32768:32768 -v ${basedir}/build-uwp:/root/build -v ${basedir}/out/uwp:/root/out ${registry}/godot-private/uwp:latest bash build/build.sh 2>&1 | tee ${basedir}/out/logs/uwp
-
+uid=$(id -un)
+gid=$(id -gn)
 if [ ! -z "$SUDO_UID" ]; then
-  chown -R "${SUDO_UID}":"${SUDO_GID}" ${basedir}/git ${basedir}/out ${basedir}/mono-glue ${basedir}/godot*.tar.gz
+  uid="${SUDO_UID}"
+  gid="${SUDO_GID}"
 fi
+chown -R -f $uid:$gid ${basedir}/git ${basedir}/out ${basedir}/mono-glue ${basedir}/godot*.tar.gz
--- a/clean-release.sh
+++ b/clean-release.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+rm -rf releases steam tmp web
--- a/clean.sh
+++ b/clean.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+rm -rf godot*.tar.gz mono-glue out releases steam tmp web
+git status
--- a/config.sh.in
+++ b/config.sh.in
@@ -3,16 +3,51 @@
 # Configuration file for user-specific details.
 # This file is gitignore'd and will be sourced by build scripts.

+# Note: For passwords or GPG keys, make sure that special characters such
+# as $ won't be expanded, by using single quotes to enclose the string,
+# or escaping with \$.
+
+# These scripts are designed and tested against podman. They may also work
+# with docker, but it's not guaranteed. You can set this variable to the
+# 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"
+export REGISTRY='registry.prehensile-tales.com'
+
+# Version string of the images to use in build.sh.
+export IMAGE_VERSION='4.x-f36'

 # Default build name used to distinguish between official and custom builds.
-export BUILD_NAME="custom_build"
+export BUILD_NAME='custom_build'

 # Default number of parallel cores for each build.
 export NUM_CORES=16
@@ -21,24 +56,51 @@ export NUM_CORES=16
 # If you do not fill all SIGN_* fields, signing will be skipped.

 # Path to pkcs12 archive.
-export SIGN_KEYSTORE=""
+export SIGN_KEYSTORE=''

 # Password for the private key.
-export SIGN_PASSWORD=""
+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 SIGN_NAME=''
+export SIGN_URL=''

 # Hostname or IP address of an OSX host (Needed for signing)
-# eg "user@10.1.0.10"
-export OSX_HOST=""
+# eg 'user@10.1.0.10'
+export OSX_HOST=''
 # ID of the Apple certificate used to sign
-export OSX_KEY_ID=""
+export OSX_KEY_ID=''
 # Bundle id for the signed app
-export OSX_BUNDLE_ID=""
-# Username/password for Apple's signing APIs (used for atltool)
-export APPLE_ID=""
-export APPLE_ID_PASSWORD=""
+export OSX_BUNDLE_ID=''
+# Username/password for Apple's signing APIs (used for notarytool)
+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/publish-release.sh
+++ b/publish-release.sh
@@ -0,0 +1,229 @@
+#!/bin/bash
+
+set -e
+
+# Log output to a file automatically.
+exec > >(tee -a "out/logs/publish-release") 2>&1
+
+# Config
+
+# For upload tools and signing/release keys.
+source ./config.sh
+
+godot_version=""
+latest_stable=0
+skip_stable=0
+draft_arg=""
+
+while getopts "h?v:lsd" 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
+    exit 1
+    ;;
+  v)
+    godot_version=$OPTARG
+    ;;
+  l)
+    latest_stable=1
+    ;;
+  s)
+    skip_stable=1
+    ;;
+  d)
+    draft_arg="-d"
+    ;;
+  esac
+done
+
+if [ -z "${godot_version}" ]; then
+  echo "Mandatory argument -v missing."
+  exit 1
+fi
+
+basedir=$(pwd)
+reldir=${basedir}/releases/${godot_version}
+
+# Confirm
+
+IFS=- read version status <<< "${godot_version}"
+echo "Publishing Godot ${version} ${status}."
+read -p "Is this correct (y/n)? " choice
+case "$choice" in
+  y|Y ) echo "yes";;
+  n|N ) echo "No, aborting."; exit 0;;
+  * ) echo "Invalid choice, aborting."; exit 1;;
+esac
+template_version=${version}.${status}
+
+# Config checks for stable releases.
+
+if [ "${status}" == "stable" -a "${skip_stable}" == "0" ]; then
+  echo "Publishing a stable release. Checking that configuration is valid to perform stable release specific steps."
+
+  read -p "Enter personal access token (GH_TOKEN) for godotengine/godot: " personal_gh_token
+  if [[ "${personal_gh_token}" != "github_pat_"* ]]; then
+    echo "Provided personal access token should start with 'github_pat', aborting."
+    exit 1
+  fi
+
+  if ! gh api repos/godotengine/godot/git/refs/tags | grep -q ${godot_version}; then
+    echo "The tag '${godot_version}' does not exist in godotengine/godot, aborting."
+    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
+
+echo "Uploading release to to godotengine/godot-builds repository."
+
+if [ -z "${GODOT_BUILDS_PATH}" ]; then
+  echo "Missing path to godotengine/godot-builds clone in config.sh, necessary to upload releases. Aborting."
+  exit 1
+fi
+
+${GODOT_BUILDS_PATH}/tools/upload-github.sh -v ${version} -f ${status} ${draft_arg}
+
+# Stable release only
+
+if [ "${status}" == "stable" -a "${skip_stable}" == "0" ]; then
+  namever=Godot_v${godot_version}
+
+  echo "Uploading stable release to main GitHub repository."
+
+  export GH_TOKEN=${personal_gh_token}
+  pushd git
+  # Get release details from existing godot-builds release.
+  release_info=$(gh release view ${godot_version} --repo godotengine/godot-builds --json name,body)
+  release_title=$(echo "$release_info" | jq -r '.name')
+  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]*
+  # 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	6def3039b1	publish-release: Add -d argument to publish as draft release on GH (#135 ) (cherry picked from commit `fd3bd4ad89`)	2025-10-29 10:53:15 +01:00
Rémi Verschelde	6f0a10f6f9	publish-release: Add support to upload stable builds to GH, Steam, EGS and itch.io (cherry picked from commit `73402a1c9f`)	2025-03-27 11:27:38 +01:00
Rémi Verschelde	d2e5eab17c	Merge pull request #108 from godotengine/steam build-release: Copy and sign Steam Windows exe for stable releases	2025-03-18 17:12:16 +01:00
Rémi Verschelde	fb34c3ff3e	build-release: Copy and sign Steam Windows exe for stable releases	2025-03-12 23:43:17 +01:00
Rémi Verschelde	e2e01f05df	Merge pull request #106 from darksylinc/matias-swappy-2025-01 Update to latest version of Swappy	2025-03-04 00:45:26 +01:00
Matias N. Goldberg	c9f1d801ae	Update to latest version of Swappy Fixes #103294	2025-03-03 20:44:32 -03:00
Rémi Verschelde	7cfa88aaaf	Merge pull request #105 from godotengine/android-picoos-editor Add support for Android editor builds for PicoOS devices	2025-02-07 01:44:25 +01:00
Rémi Verschelde	c9d351ab67	Add support for Android editor builds for PicoOS devices	2025-01-15 18:01:31 +01:00
Rémi Verschelde	e7210ecc92	Merge pull request #104 from godotengine/update-toolchains-f41 Update toolchains based on Fedora 41 for Godot 4.4	2024-12-16 23:03:04 +01:00
Rémi Verschelde	5e3a9b9cdc	Update toolchains based on Fedora 41 for Godot 4.4	2024-12-16 23:01:51 +01:00
HP van Braam	b4613cec24	Merge pull request #102 from bruvzg/ts_data_in_template Add ICU data to export templates.	2024-12-12 16:19:01 +01:00
Pāvels Nadtočajevs	bf0dd1992c	Add ICU data to export templates.	2024-12-09 15:58:49 +02:00
Rémi Verschelde	1e4dc88253	Add script to publish releases everywhere - GitHub godot-builds - Web editor - NuGet - MavenCentral Still missing instructions for uploading stable releases to stores, etc.	2024-11-21 10:57:27 +01:00
Rémi Verschelde	8c176b460b	Android: Download and copy swappy libraries	2024-11-08 14:39:11 +01:00
Rémi Verschelde	e0891e9fde	Adapt build scripts to run with passwordless sudo podman	2024-11-07 22:36:40 +01:00
Rémi Verschelde	251cea182e	Merge pull request #94 from raulsntos/dotnet/android-monovm .NET: Build Android templates with 'mono' edition	2024-11-07 20:50:02 +01:00
Rémi Verschelde	9259edf571	Merge pull request #99 from adamscott/add-gitignore-dsstore Add `.DS_Store` to .gitignore	2024-09-16 15:44:41 +02:00
Rémi Verschelde	cc7ca0f706	Merge pull request #101 from m4gr3d/main Update the Android editor build scripts	2024-09-16 15:44:26 +02:00
Fredia Huya-Kouadio	5f48331f5d	Update the Android editor build scripts to match the updated build flavors in https://github.com/godotengine/godot/pull/96967	2024-09-14 12:15:22 -07:00
Fredia Huya-Kouadio	fa404f8c17	Add support for Android editor builds for Meta devices (#100 )	2024-09-08 23:07:07 +02:00
Adam Scott	d808ce84ce	Add `.DS_Store` to .gitignore	2024-08-21 12:04:20 -04:00
Rémi Verschelde	c3d199c4d4	Merge pull request #98 from godotengine/stable-windows-steamapi Windows: Add extra editor build with `steamapi=yes` for stable releases	2024-08-15 00:56:16 +02:00
Rémi Verschelde	629090d76e	Windows: Add extra editor build with steamapi=yes for stable releases	2024-08-15 00:39:35 +02:00
Rémi Verschelde	834f6223d8	New ANGLE build, fixes macOS crash by removing conflicting astcenc lib	2024-07-30 11:31:37 +02:00
Rémi Verschelde	1bf0772565	New ANGLE build, restores Windows 7 support	2024-07-28 19:23:17 +02:00
Rémi Verschelde	7131e406ae	build_release: Fix name of new Windows ARM64 binaries	2024-07-25 20:07:01 +02:00
Rémi Verschelde	62a88ec262	build_release: Fix path to MoltenVK after `b3ba0ae93` I didn't run into it before as I had an old `deps/vulkansdk-macos` folder locally. (Which means we've been shipping an old MoltenVK version on iOS for a bit.)	2024-07-25 19:08:03 +02:00
Rémi Verschelde	0c96c1ea15	Merge pull request #96 from bruvzg/arm64_win Add commands to make ARM64 Windows engine builds, update Mesa/NIR and ANGLE downloads to the latest releases.	2024-07-22 11:53:43 +02:00
bruvzg	c3f202946a	Add commands to make ARM64 Windows engine builds, update Mesa/NIR and ANGLE downloads to the latest releases.	2024-07-22 12:13:53 +03:00
Rémi Verschelde	3cb13f27ea	Merge pull request #97 from godotengine/no-strip Don't strip Windows and macOS binaries, already done at build time	2024-07-22 11:12:32 +02:00
Rémi Verschelde	d99668ccaa	Don't strip Windows and macOS binaries, already done at build time	2024-07-22 10:59:45 +02:00
Rémi Verschelde	a29f0a255d	Update MoltenVK build to re-add support for macOS 10.13 See https://github.com/godotengine/moltenvk-osxcross/pull/1 for context.	2024-07-11 22:50:56 +02:00
Rémi Verschelde	d36a865ff1	Merge pull request #95 from godotengine/xcode-15.4 macOS/iOS: Update SDK versions to Xcode 15.4	2024-06-20 10:07:35 +02:00
Rémi Verschelde	15810984ed	macOS/iOS: Update SDK versions to Xcode 15.4 Following merge of https://github.com/godotengine/build-containers/pull/141.	2024-06-20 10:06:58 +02:00
Rémi Verschelde	a79a7d16ce	macOS: Update ANGLE library build to support ANGLE over GL	2024-05-30 23:18:03 +02:00
Rémi Verschelde	b3ba0ae932	macOS: Download custom osxcross-compatible MoltenVK build automatically	2024-05-16 15:23:29 +02:00
Raul Santos	232be2e47f	.NET: Build Android templates with 'mono' edition Build the Android templates for .NET using the 'mono' edition that contains additional dependencies required by .NET projects to support Android OS APIs (like crypto).	2024-04-29 03:56:22 +02:00
Rémi Verschelde	0f11496664	macOS/iOS: Update SDK versions to Xcode 15.2 Following merge of https://github.com/godotengine/build-containers/pull/138.	2024-03-13 22:04:40 +01:00
Rémi Verschelde	e321eca2bf	Web: Tweak build concurrency, doesn't seem to work with all in parallel	2024-02-28 10:21:27 +01:00
Rémi Verschelde	ef6c745075	Web: Add `threads=no` template builds	2024-02-07 10:48:09 +01:00
Rémi Verschelde	3fd3880077	deps: Update godot-nir-static to 23.1.9	2024-02-05 15:24:31 +01:00
Rémi Verschelde	0da7793d2d	Merge pull request #92 from bruvzg/dx12_enable [Windows] Enable D3D12 support.	2024-01-29 23:14:31 +01:00
bruvzg	9bba647a8b	[Windows] Enabled D3D12 support.	2024-01-04 12:12:26 +02:00
Rémi Verschelde	ceadb16e22	Revert "Linux: Disable LTO for ARM64/ARM32, it crashes on Raspberry Pi OS" This reverts commit `f8a41bc69f`. This wasn't actually the cause for the crash. The issue is fixed by https://github.com/godotengine/build-containers/pull/134.	2023-12-11 22:21:31 +01:00
Rémi Verschelde	ee35cb71ca	Merge pull request #91 from godotengine/linux-arm64-disable-lto Linux: Disable LTO for ARM64/ARM32, it crashes on Raspberry Pi OS	2023-11-24 12:30:50 +01:00
Rémi Verschelde	f8a41bc69f	Linux: Disable LTO for ARM64/ARM32, it crashes on Raspberry Pi OS Needs further investigation and reporting the bug upstream.	2023-11-24 00:03:24 +01:00
Rémi Verschelde	2398d61b29	Merge pull request #90 from godotengine/linux-buildroot-update-arm Linux: Update to new SDK with GCC 13, add ARM64 and ARM32	2023-11-01 17:47:03 +01:00
Rémi Verschelde	96b8f89a22	Linux: Update to new SDK with GCC 13, add ARM64 and ARM32	2023-11-01 17:42:57 +01:00
Rémi Verschelde	09b9dcf969	Merge pull request #76 from bruvzg/notarytool [macOS] Use notarytool instead of deprecated altool.	2023-10-31 18:50:31 +01:00
bruvzg	7b9e4271f4	[macOS] Use notarytool instead of deprecated altool.	2023-10-31 19:26:52 +02:00
Rémi Verschelde	93d253330f	Merge pull request #89 from godotengine/f39-images Update scripts for new Fedora 39 based images for 4.2-beta3 and later	2023-10-24 16:31:23 +02:00
Rémi Verschelde	65cca8165a	Update scripts for new Fedora 39 based images for 4.2-beta3 and later Follow-up to https://github.com/godotengine/build-containers/pull/128. Also reverts #88 since these new images include JDK 17, and the closure compiler issue was fixed upstream. And removes the manual install of gettext which is now also part of the images. X11 libs should not be needed to generate the Mono glue anymore (they've been unnecessary for a while already).	2023-10-24 11:45:29 +02:00
Rémi Verschelde	be182f1ed7	Merge pull request #88 from godotengine/4.2-beta2-jdk-17 Android: Install JDK 17 needed for 4.2-beta2 and later	2023-10-19 10:47:04 +02:00
Rémi Verschelde	2c7419a7ed	Android: Install JDK 17 needed for 4.2-beta2 and later Temporary change until we switch to newer build containers with it. Also temporarily disable closure compiler for Web editor, needed for 4.2 beta 1 and beta 2, should be fixed upstream afterwarads.	2023-10-19 10:45:43 +02:00
Rémi Verschelde	ad9e3b238a	Merge pull request #87 from YuriSizov/publish-maven Publish Android library from the main build-release script	2023-10-11 20:43:40 +02:00
Yuri Sizov	9d40b39c01	Publish Android library from the main build-release script	2023-10-11 20:08:40 +02:00
Rémi Verschelde	066ede3602	Merge pull request #86 from godotengine/dotnet-ios .NET: Add support for iOS builds	2023-10-10 08:12:52 +02:00
Rémi Verschelde	75877451f2	.NET: Add support for iOS builds	2023-10-04 01:15:30 +02:00
Rémi Verschelde	02e092ce76	Merge pull request #84 from godotengine/angle-libs Download static ANGLE libs to link them in Windows and macOS builds	2023-09-25 21:49:56 +02:00
Rémi Verschelde	4863750c00	Download static ANGLE libs to link them in Windows and macOS builds	2023-09-25 15:32:14 +02:00
Rémi Verschelde	37938758d8	Merge pull request #83 from godotengine/drop-uwp Drop UWP build scripts since it was removed upstream	2023-09-21 15:35:33 +02:00
Rémi Verschelde	79967d5bb9	Drop UWP build scripts since it was removed upstream	2023-09-21 15:33:31 +02:00
Rémi Verschelde	37876d4d40	Merge pull request #82 from godotengine/dotnet-android .NET: Add support for Android builds	2023-09-05 11:02:27 +02:00
Rémi Verschelde	9f25ceccfb	.NET: Add support for Android builds	2023-09-05 10:03:29 +02:00
Rémi Verschelde	21af2c7666	Add clean-release.sh script to remove only release artifacts	2023-07-11 16:05:45 +02:00
Rémi Verschelde	360fa39095	Add clean.sh script to removed past build artifacts	2023-06-26 19:42:46 +02:00
Rémi Verschelde	80ea8aadde	Merge pull request #78 from m4gr3d/add_logic_to_upload_to_maven_central Add logic to upload the Godot Android library to MavenCentral	2023-05-25 09:29:51 +02:00
Fredia Huya-Kouadio	0780ea4a4f	Add logic to upload the Godot Android library to MavenCentral Add environment variables to sign the release build for the Godot Android editor and to publish the library to MavenCentral. If the environment vars are not defined, we do a simple unsigned `release_debug` build for the Android editor. Change `config.sh.in` template to use single quotes by default, to prevent expanding special characters in environment variables. To publish to MavenCentral, a new `build-android/upload-mavencentral.sh` script is added. It needs to run after the build using gradle, but we still want it to be optional and used only when making an official release, so we copy the compiled sources in the first step. Co-authored-by: Rémi Verschelde <rverschelde@gmail.com>	2023-05-25 09:28:43 +02:00
Rémi Verschelde	72cb40ffad	Install gettext in all editor build containers This enables compiling the PO files to smaller binary MO files, reducing the size of the editor binary which embeds them. gettext will be added to the base container but I haven't done it yet, so for now adding it manually here.	2023-02-14 11:20:33 +01:00
Rémi Verschelde	e3827e123c	build-release: Rename --publish-nuget option to -n I can never remember the long form.	2022-11-16 13:44:30 +01:00
Rémi Verschelde	1dcd8b7985	Merge pull request #74 from bruvzg/win_wrapper	2022-11-04 11:07:37 +01:00
Rémi Verschelde	ef964dc2a3	Merge pull request #75 from godotengine/xcode-14.1	2022-11-04 10:10:42 +01:00
Rémi Verschelde	9ad27f9f92	Xcode: Update macOS and iOS scripts for to Xcode 14.1 (macOS 13.0, iOS 16.1)	2022-11-03 13:44:56 +01:00
bruvzg	b5240cd977	Add console wrapper app to handle console i/o redirection on Windows.	2022-10-17 11:20:16 +03:00
Rémi Verschelde	631c5d216e	Merge pull request #73 from godotengine/build-release-publish-nuget-only	2022-10-13 15:29:11 +02:00
Rémi Verschelde	6d25f64f31	Merge pull request #72 from godotengine/unify-target-tools	2022-10-13 15:29:04 +02:00
Rémi Verschelde	eecf436ac7	build_release: Allow `-b none --publish-nuget --no-cleanup --no-tarball` Useful when I forget to add `--publish-nuget` the first time and want to bypass the builds already packaged, and only publish the nupkgs.	2022-10-13 15:26:42 +02:00
Rémi Verschelde	f95a42611b	Unify `target`/`tools` arguments after upstream change	2022-10-13 14:10:59 +02:00
Rémi Verschelde	872c9bfe0e	Fix wildcard expansion for bash in --publish-nuget Apparently this worked under zsh but not under bash.	2022-09-14 15:54:40 +02:00
Rémi Verschelde	4e9ee976b2	Merge pull request #70 from raulsntos/publish-nuget	2022-09-14 12:00:29 +02:00
Raul Santos	e244d6f9e3	Add support for publishing NuGet packages	2022-09-10 03:45:12 +02:00
Rémi Verschelde	9080ead63c	Merge pull request #69 from godotengine/dotnet-working-desktop-builds	2022-09-09 12:55:25 +02:00
Rémi Verschelde	c996282abe	.NET 6: Further update build scripts for 4.0, works for desktop releases Does not attempt to build Android, iOS and Web since it's not supported currently.	2022-09-08 15:45:39 +02:00
Rémi Verschelde	4a37b8e5cb	Merge pull request #68 from godotengine/android-fix-arch	2022-09-07 11:56:16 +02:00
Rémi Verschelde	46773439b7	Android: Fix still using android_arch over arch Needed after https://github.com/godotengine/godot/pull/55778. Not sure how alpha15 built properly without this :O	2022-09-07 11:52:57 +02:00
Rémi Verschelde	41f2a836cf	Merge pull request #66 from godotengine/web-parallel-builds-full-lto	2022-09-07 11:12:45 +02:00
Rémi Verschelde	f37caa728a	Web: Refactor build script to run in parallel with full LTO Fabio found that full LTO produces smaller binaries than ThinLTO, and that's quite important for the Web platform. But for an obscure reason LLVM's full LTO cannot linking with multiple threads, and so it's slow as heck (10-15 min per build). So we work it around by starting all builds in parallel so that they can all link at the same time. The code to do so is pretty ugly, could be refactored further.	2022-09-07 11:07:21 +02:00
Rémi Verschelde	9aa0cb9d3b	Merge pull request #67 from godotengine/web-templates-rename	2022-09-07 11:05:43 +02:00
Rémi Verschelde	0bd0362372	Web: Handle new template names and `dlink_enabled=yes` Follow-up to https://github.com/godotengine/godot/pull/65094. Also reverts LTO change from #62, we found that while it's much slower to link, full LTO still produces smaller binaries and that's quite important for the Web platform.	2022-09-07 10:28:28 +02:00
Rémi Verschelde	12627036d2	Merge pull request #64 from godotengine/godot4-dotnet	2022-08-30 10:14:49 +02:00
Rémi Verschelde	23187596fb	.NET 6: Initial port of build scripts for 4.0 Not working yet but cleans up a lot of the Mono stuff we won't need anymore.	2022-08-30 10:12:58 +02:00
Rémi Verschelde	36fc7fca83	Merge pull request #65 from godotengine/js-is-web	2022-08-30 09:57:42 +02:00
Rémi Verschelde	2c6469a904	Web: Rename javascript to web	2022-08-29 15:09:39 +02:00
Rémi Verschelde	ccb6b90e0b	Merge pull request #62 from godotengine/godot4-enable-web	2022-08-29 09:14:20 +02:00
Rémi Verschelde	dd1128fea0	JavaScript: Re-enable build for 4.0 now that WebGL 2 works	2022-08-26 14:44:05 +02:00
Rémi Verschelde	409efd043a	Merge pull request #38 from godotengine/godot4	2022-08-26 14:43:47 +02:00
Rémi Verschelde	0bcbc8fca2	Merge pull request #60 from aaronfranke/use-arch-btw	2022-08-25 17:09:35 +02:00
Aaron Franke	d68cf1a26e	CPU architecture name changes for Windows/Linux outputs from SCons	2022-08-25 09:28:45 -05:00
Rémi Verschelde	83b71cbf8b	macOS: Change option for Vulkan SDK	2022-07-26 12:06:23 +02:00
Aaron Franke	9973556e65	CPU architecture name changes for Windows, Mac, and Linux templates	2022-07-26 12:05:43 +02:00
Aaron Franke	e544bb91dc	CPU architecture folder name changes	2022-07-22 18:30:56 -05:00
bruvzg	0dc9509c1f	Rename OSX to macOS and iPhoneOS to iOS.	2022-07-21 12:23:09 +02:00
Rémi Verschelde	0fe855cc72	macOS: Disable volk to link MoltenVK statically	2022-07-21 12:23:09 +02:00
Rémi Verschelde	edd1194d3f	macOS and iOS: Link MoltenVK statically Also move angle to a 'deps' folder for all downloaded or manually copied deps used by the builds.	2022-07-21 12:23:09 +02:00
Rémi Verschelde	6463e8b60a	Port scripts to Godot 4.0.dev, remove server build The `server` platform has now been replaced by the "headless" `DisplayServer` which is registered on all desktop platforms. Disable JavaScript and UWP builds which are not currently supported in 4.0.	2022-07-21 12:23:09 +02:00
Rémi Verschelde	8405945b79	Android: Fix mono_prefix after godot-mono-builds NDK r23 support The target options were renamed in https://github.com/godotengine/godot-mono-builds/pull/69. Also removes the commented out code for Mono Android editor because it will likely never be meaningful to build. There's no MSBuild on Android to compile C#.	2022-07-19 23:04:11 +02:00
Rémi Verschelde	b2aef95606	Merge pull request #56 from godotengine/img-update	2022-06-27 12:22:12 +02:00
Rémi Verschelde	4c9e58d98f	Use new containers with Mono 6.12.0.182, Android NDK r23, Emscripten 3.1.14	2022-06-27 12:19:24 +02:00
Rémi Verschelde	135ad22e07	Merge pull request #55 from godotengine/windows-mono-bat-console Windows: Add .cmd script to run Mono editor with console	2022-06-10 12:19:07 +02:00
Rémi Verschelde	26bb927614	Windows: Add .cmd script to run Mono editor with console Same as done for non-Mono builds already. Fixes https://github.com/godotengine/godot/issues/61672.	2022-06-10 12:17:13 +02:00
Rémi Verschelde	81c1fa10ef	Merge pull request #54 from godotengine/img-f36-xcode13 Use new containers with Fedora 36, Mono 6.12.0.179, Xcode 13.3.1	2022-05-24 10:41:18 +02:00
Rémi Verschelde	a0675bb238	Use new containers with Fedora 36, Mono 6.12.0.179, Xcode 13.3.1 Remove ad-hoc java install from Android build script, it's now included in the build container.	2022-05-24 10:38:22 +02:00
Rémi Verschelde	6ebf52fda5	Merge pull request #53 from godotengine/osslsigncode-from-PATH	2022-05-10 13:41:13 +02:00
Rémi Verschelde	8adfdd068e	Windows: Use osslsigncode from PATH for signing We were shipping a pre-built version but it only works on specific distros as it's tightly coupled to openssl. When upgrading from F34 to F35 it started segfaulting. We now rely on the version packaged by Fedora which should be installed on the host, or compiled and installed manually in PATH by users.	2022-05-10 10:39:42 +02:00
Rémi Verschelde	720b0fe6c0	Android: Also build editor for armv7/x86 It makes the APK twice as big but there's been some demand for it, so let's give it a try for now.	2022-05-03 11:40:13 +02:00
Rémi Verschelde	d5ba16cc46	Merge pull request #51 from godotengine/android-editor	2022-03-30 17:56:42 +02:00
Rémi Verschelde	59559971b5	Android: Add editor build for arm64v8/x86_64 (no Mono for now)	2022-03-30 15:44:10 +02:00
Rémi Verschelde	45abfae75f	Add check to prevent mistakes with templates version Also switched web release dir to use templates version as it's what we use online.	2022-03-15 10:43:43 +01:00
Rémi Verschelde	7ac3b65e39	Windows: Delete bat files after zipping	2022-01-31 23:42:25 +01:00
Rémi Verschelde	a679b94dfc	Merge pull request #49 from bruvzg/gen_win_cmd [Windows] Generate "cmd" file to run Godot with open console.	2022-01-13 20:33:39 +01:00
bruvzg	0d2393cf02	[Windows] Generate "cmd" file to run Godot with open console.	2022-01-13 19:05:03 +02:00