Backport clean scripts from main branch

(cherry picked from commit 4834ab1eab)
UWP: Fix logic to download and copy ANGLE
2026-01-01 09:48:47 +03:00 · 2024-05-01 12:17:42 +02:00 · 2024-01-18 09:56:23 +01:00 · 2023-10-31 18:58:47 +01:00 · 2023-10-04 01:16:18 +02:00 · 2023-02-09 22:58:18 +01:00
19 changed files with 1194 additions and 513 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,15 +1,20 @@
 # User-specific configuration and signing key
 config.sh
+*.jks
+*.pfx
 *.pkcs12

 # Generated by build scripts
 angle/
+deps/
 git/
 mono-glue/
-godot.tar.gz
+godot*.tar.gz
+angle.7z

 # Output
-mono/
 out/
-release-*/
-templates/
+releases/
+sha512sums/
+tmp/
+web/
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -0,0 +1,19 @@
+Copyright (c) 2019-2020 Godot Engine contributors.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
--- a/README.md
+++ b/README.md
@@ -0,0 +1,34 @@
+# Godot in-container build scripts
+
+Build scripts used for official Godot Engine releases using containers
+built from https://github.com/godotengine/build-containers
+
+## Disclaimer
+
+This repository is **not** intended for end users, and thus not
+supported. It's only public as a way to document our build workflow,
+and for anyone to use as reference for their own buildsystems.
+
+We will eventually release a public build script that integrates all
+this in a simple and user-friendly interface.
+
+## Usage
+
+- Build containers using https://github.com/godotengine/build-containers
+- Copy `config.sh.in` as `config.sh` and configure it as you want.
+- Edit `build.sh` to properly reference those containers if local, or
+  use `config.sh` to point to your own registry if you uploaded
+  containers.
+- Build with `build.sh` (check `--help` for usage).
+- Package binaries with `build-release.sh` (check `--help` for usage).
+
+Example that builds Godot 3.2-stable Classical (not Mono):
+```
+./build.sh -v 3.2-stable -g 3.2-stable -b classical
+./build-release.sh -v 3.2-stable -t 3.2.stable -b classical
+```
+
+Again, this is intended for release managers and usability is not the
+main focus. Tweak the build scripts to match your own requirements if
+you want to use this until we provide a better, user-friendly
+interface.
--- a/build-android/build.sh
+++ b/build-android/build.sh
@@ -2,33 +2,90 @@

 set -e

-export BUILD_NAME=official
+# Config
+
 export SCONS="scons -j${NUM_CORES} verbose=yes warnings=no progress=no"
-export OPTIONS="builtin_libpng=yes builtin_openssl=yes builtin_zlib=yes debug_symbols=no use_static_cpp=yes use_lto=yes"
-export OPTIONS_MONO="module_mono_enabled=yes mono_static=yes"
+export OPTIONS="production=yes"
+export OPTIONS_MONO="module_mono_enabled=yes mono_static=no"
 export TERM=xterm
-export ANDROID_HOME=/root/
-export ANDROID_NDK_ROOT=/root/ndk-bundle/

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

-$SCONS platform=android android_arch=armv7 $OPTIONS tools=no target=release_debug
-$SCONS platform=android android_arch=armv7 $OPTIONS tools=no target=release
+# Classical

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

-$SCONS platform=android android_arch=x86 $OPTIONS tools=no target=release_debug
-$SCONS platform=android android_arch=x86 $OPTIONS tools=no target=release
+  $SCONS platform=android android_arch=armv7 $OPTIONS tools=yes target=release_debug
+  $SCONS platform=android android_arch=arm64v8 $OPTIONS tools=yes target=release_debug
+  $SCONS platform=android android_arch=x86 $OPTIONS tools=yes target=release_debug
+  $SCONS platform=android android_arch=x86_64 $OPTIONS tools=yes target=release_debug

-$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
+  pushd platform/android/java
+  ./gradlew generateGodotEditor
+  popd

-pushd platform/android/java
-./gradlew build
-popd
+  mkdir -p /root/out/tools
+  cp bin/android_editor.apk /root/out/tools/

-cp bin/*.apk /root/out
+  $SCONS platform=android android_arch=armv7 $OPTIONS tools=no target=release_debug
+  $SCONS platform=android android_arch=armv7 $OPTIONS tools=no target=release
+
+  $SCONS platform=android android_arch=arm64v8 $OPTIONS tools=no target=release_debug
+  $SCONS platform=android android_arch=arm64v8 $OPTIONS tools=no target=release
+
+  $SCONS platform=android android_arch=x86 $OPTIONS tools=no target=release_debug
+  $SCONS platform=android android_arch=x86 $OPTIONS tools=no target=release
+
+  $SCONS platform=android android_arch=x86_64 $OPTIONS tools=no target=release_debug
+  $SCONS platform=android android_arch=x86_64 $OPTIONS tools=no target=release
+
+  pushd platform/android/java
+  ./gradlew generateGodotTemplates
+  popd
+
+  mkdir -p /root/out/templates
+  cp bin/android_source.zip /root/out/templates/
+  cp bin/android_debug.apk /root/out/templates/
+  cp bin/android_release.apk /root/out/templates/
+  cp bin/godot-lib.release.aar /root/out/templates/
+fi
+
+# Mono
+
+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/
+
+  $SCONS platform=android android_arch=armv7 $OPTIONS $OPTIONS_MONO mono_prefix=/root/mono-installs/android-armv7-release tools=no target=release_debug
+  $SCONS platform=android android_arch=armv7 $OPTIONS $OPTIONS_MONO mono_prefix=/root/mono-installs/android-armv7-release tools=no target=release
+
+  $SCONS platform=android android_arch=arm64v8 $OPTIONS $OPTIONS_MONO mono_prefix=/root/mono-installs/android-arm64v8-release tools=no target=release_debug
+  $SCONS platform=android android_arch=arm64v8 $OPTIONS $OPTIONS_MONO mono_prefix=/root/mono-installs/android-arm64v8-release tools=no target=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 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
+
+  pushd platform/android/java
+  ./gradlew generateGodotTemplates
+  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/
+  cp bin/android_release.apk /root/out/templates-mono/
+  cp bin/godot-lib.release.aar /root/out/templates-mono/
+
+  mkdir -p /root/out/templates-mono/bcl
+  cp -r /root/mono-installs/android-bcl/* /root/out/templates-mono/bcl/
+fi
+
+echo "Android build successful"
--- a/build-ios/build.sh
+++ b/build-ios/build.sh
@@ -2,36 +2,115 @@

 set -e

-export BUILD_NAME=official
+# Config
+
 export SCONS="scons -j${NUM_CORES} verbose=yes warnings=no progress=no"
-export IOS_SDK="11.2"
-export OPTIONS="osxcross_sdk=darwin15 builtin_libpng=yes builtin_openssl=yes builtin_zlib=yes debug_symbols=no use_static_cpp=yes"
+# 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 TERM=xterm
-export OSXCROSS_IOS=not_nothing
+
+export IOS_SDK="15.4"
+export IOS_LIPO="/root/ioscross/arm64/bin/arm-apple-darwin11-lipo"

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

-$SCONS platform=iphone $OPTIONS arch=arm tools=no target=release_debug IPHONESDK="/root/ioscross/arm64/SDK/iPhoneOS${IOS_SDK}.sdk" IPHONEPATH="/root/ioscross/arm64/" ios_triple="arm-apple-darwin11-"
+# Classical

-$SCONS platform=iphone $OPTIONS arch=arm tools=no target=release IPHONESDK="/root/ioscross/arm64/SDK/iPhoneOS${IOS_SDK}.sdk" IPHONEPATH="/root/ioscross/arm64/" ios_triple="arm-apple-darwin11-"
+if [ "${CLASSICAL}" == "1" ]; then
+  echo "Starting classical build for iOS..."

-$SCONS platform=iphone $OPTIONS arch=arm64 tools=no target=release_debug IPHONESDK="/root/ioscross/arm64/SDK/iPhoneOS${IOS_SDK}.sdk" IPHONEPATH="/root/ioscross/arm64/" ios_triple="arm-apple-darwin11-"
+  # 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=iphone $OPTIONS arch=arm64 tools=no target=release IPHONESDK="/root/ioscross/arm64/SDK/iPhoneOS${IOS_SDK}.sdk" IPHONEPATH="/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=iphone $OPTIONS arch=x86 tools=no target=release_debug IPHONESDK="/root/ioscross/x86_64/SDK/iPhoneOS${IOS_SDK}.sdk" IPHONEPATH="/root/ioscross/x86_64/" ios_triple="x86_64-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=iphone $OPTIONS arch=x86 tools=no target=release IPHONESDK="/root/ioscross/x86_64/SDK/iPhoneOS${IOS_SDK}.sdk" IPHONEPATH="/root/ioscross/x86_64/" 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
+fi

-$SCONS platform=iphone $OPTIONS arch=x86_64 tools=no target=release_debug IPHONESDK="/root/ioscross/x86_64/SDK/iPhoneOS${IOS_SDK}.sdk" IPHONEPATH="/root/ioscross/x86_64/" ios_triple="x86_64-apple-darwin11-"
+# Mono

-$SCONS platform=iphone $OPTIONS arch=x86_64 tools=no target=release IPHONESDK="/root/ioscross/x86_64/SDK/iPhoneOS${IOS_SDK}.sdk" IPHONEPATH="/root/ioscross/x86_64/" ios_triple="x86_64-apple-darwin11-"
+if [ "${MONO}" == "1" ]; then
+  echo "Starting Mono build for iOS..."

-/root/ioscross/arm64/bin/arm-apple-darwin11-lipo -create bin/libgodot.iphone.opt.arm.a bin/libgodot.iphone.opt.arm64.a bin/libgodot.iphone.opt.x86.a bin/libgodot.iphone.opt.x86_64.a -output /root/out/libgodot.iphone.opt.fat
-/root/ioscross/arm64/bin/arm-apple-darwin11-lipo -create bin/libgodot.iphone.opt.debug.arm.a bin/libgodot.iphone.opt.debug.arm64.a bin/libgodot.iphone.opt.debug.x86.a bin/libgodot.iphone.opt.debug.x86_64.a -output /root/out/libgodot.iphone.opt.debug.fat
+  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-"
+
+  # 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-"
+
+  # 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-"
+
+  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
+fi

 echo "iOS build successful"
--- a/build-javascript/build.sh
+++ b/build-javascript/build.sh
@@ -2,20 +2,66 @@

 set -e

-export BUILD_NAME=official
-export SCONS="scons -j${NUM_CORES} verbose=yes warnings=no progress=no"
-export OPTIONS="builtin_libpng=yes builtin_openssl=yes builtin_zlib=yes debug_symbols=no use_static_cpp=yes use_lto=yes"
-export OPTIONS_MONO="module_mono_enabled=yes mono_static=yes"
-export TERM=xterm
+# Config

-source /root/emsdk/emsdk_env.sh
+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

-$SCONS platform=javascript ${OPTIONS} target=release_debug tools=no
-$SCONS platform=javascript ${OPTIONS} target=release tools=no
+# Classical

-cp -rvp bin/* /root/out/
+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
@@ -2,42 +2,88 @@

 set -e

-export BUILD_NAME=official
+# Config
+
 export SCONS="scons -j${NUM_CORES} verbose=yes warnings=no progress=no"
-export OPTIONS="builtin_libpng=yes builtin_openssl=yes builtin_zlib=yes debug_symbols=no use_static_cpp=yes use_lto=yes"
+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 TERM=xterm
-export MONO32_PREFIX=/usr
-export MONO64_PREFIX=/usr
-export CC="gcc-8"
-export CXX="g++-8"

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

-cp /root/mono-glue/*.cpp modules/mono/glue
+# Classical

-$SCONS platform=x11 CC=$CC CXX=$CXX $OPTIONS tools=yes target=release_debug
-mkdir -p /root/out/tools
-cp -rvp bin/* /root/out/tools
-rm -rf bin
+if [ "${CLASSICAL}" == "1" ]; then
+  echo "Starting classical build for Linux..."

-$SCONS platform=x11 CC=$CC CXX=$CXX $OPTIONS tools=no target=release_debug
-$SCONS platform=x11 CC=$CC CXX=$CXX $OPTIONS tools=no target=release
-mkdir -p /root/out/templates
-cp -rvp bin/* /root/out/templates
-rm -rf bin
+  export PATH="${GODOT_SDK_LINUX_X86_64}/bin:${BASE_PATH}"

-$SCONS platform=x11 CC=$CC CXX=$CXX $OPTIONS $OPTIONS_MONO tools=yes target=release_debug copy_mono_root=yes
-mkdir -p /root/out/tools-mono
-cp -rvp bin/* /root/out/tools-mono
-rm -rf bin
+  $SCONS platform=x11 $OPTIONS tools=yes target=release_debug
+  mkdir -p /root/out/x64/tools
+  cp -rvp bin/* /root/out/x64/tools
+  rm -rf bin

-$SCONS platform=x11 CC=$CC CXX=$CXX $OPTIONS $OPTIONS_MONO tools=no target=release_debug
-$SCONS platform=x11 CC=$CC CXX=$CXX $OPTIONS $OPTIONS_MONO tools=no target=release
-mkdir -p /root/out/templates-mono
-cp -rvp bin/* /root/out/templates-mono
-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
+  rm -rf bin

+  export PATH="${GODOT_SDK_LINUX_X86}/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
+  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
+  rm -rf bin
+fi
+
+# Mono
+
+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
+  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
+  rm -rf bin
+
+  export PATH="${GODOT_SDK_LINUX_X86}/bin:${BASE_PATH}"
+  export OPTIONS_MONO_PREFIX="${OPTIONS} ${OPTIONS_MONO} mono_prefix=${MONO_PREFIX_X86}"
+
+  $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
+  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
+  rm -rf bin
+fi
+
+echo "Linux build successful"
--- a/build-macosx/build.sh
+++ b/build-macosx/build.sh
@@ -2,48 +2,98 @@

 set -e

-export BUILD_NAME=official
+# Config
+
 export SCONS="scons -j${NUM_CORES} verbose=yes warnings=no progress=no"
-export OPTIONS="osxcross_sdk=darwin17 builtin_libpng=yes builtin_openssl=yes builtin_zlib=yes debug_symbols=no use_static_cpp=yes use_lto=yes"
+export OPTIONS="osxcross_sdk=darwin21.4 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-darwin21.4-strip -u -r"
 export TERM=xterm
-export MONO64_PREFIX=/root/dependencies/mono
-export PATH=/root/osxcross/target/bin:$PATH
-export OSXCROSS_ROOT=/root/osxcross

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

-cp /root/mono-glue/*.cpp modules/mono/glue
+# Classical

-$SCONS platform=osx $OPTIONS tools=yes target=release_debug
+if [ "${CLASSICAL}" == "1" ]; then
+  echo "Starting classical build for macOS..."

-mkdir -p /root/out/tools
-cp -rvp bin/* /root/out/tools
-rm -rf bin
+  $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

-$SCONS platform=osx $OPTIONS tools=no target=release_debug
-$SCONS platform=osx $OPTIONS tools=no target=release
+  mkdir -p /root/out/tools
+  cp -rvp bin/* /root/out/tools
+  rm -rf bin

-mkdir -p /root/out/templates
-cp -rvp bin/* /root/out/templates
-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

-$SCONS platform=osx $OPTIONS $OPTIONS_MONO tools=yes target=release_debug copy_mono_root=yes
+  mkdir -p /root/out/templates
+  cp -rvp bin/* /root/out/templates
+  rm -rf bin
+fi

-mkdir -p /root/out/tools-mono
-cp -rvp bin/* /root/out/tools-mono
-rm -rf bin
+# Mono

-$SCONS platform=osx $OPTIONS $OPTIONS_MONO tools=no target=release_debug
-$SCONS platform=osx $OPTIONS $OPTIONS_MONO tools=no target=release
+if [ "${MONO}" == "1" ]; then
+  echo "Starting Mono build for macOS..."

-mkdir -p /root/out/templates-mono
-cp -rvp bin/* /root/out/templates-mono
-rm -rf bin
+  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/

-find /root/out -name config -exec cp /root/dependencies/mono/etc/config {} \;
+  # 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}

-echo "MacOS build successful"
+  $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
+  lipo -create tmp-lib/x86_64/libmono-btls-shared.dylib tmp-lib/arm64/libmono-btls-shared.dylib -output tmp-lib/libmono-btls-shared.dylib
+
+  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
@@ -2,23 +2,30 @@

 set -e

-export BUILD_NAME=official
-export OPTIONS="builtin_libpng=yes builtin_openssl=yes builtin_zlib=yes debug_symbols=no"
+# Config
+
 export SCONS="scons -j${NUM_CORES} verbose=yes warnings=no progress=no"
+export OPTIONS="debug_symbols=no use_static_cpp=no"
 export TERM=xterm
-export MONO32_PREFIX=/usr
-export MONO64_PREFIX=/usr
+export DISPLAY=:0

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

-${SCONS} platform=x11 bits=64 ${OPTIONS} target=release_debug tools=yes module_mono_enabled=yes mono_glue=no
-xvfb-run bin/godot.x11.opt.tools.64.mono --generate-mono-glue /root/mono-glue || /bin/true
+# Mono

-xvfb-run bin/godot.x11.opt.tools.64.mono --generate-cs-api /tmp/build_GodotSharp || /bin/true
-xvfb-run msbuild /tmp/build_GodotSharp/GodotSharp.sln /p:Configuration=Release
-mkdir -p /root/mono-glue/Api
-cp -r /tmp/build_GodotSharp/GodotSharp/bin/Release/{GodotSharp.dll,GodotSharp.pdb,GodotSharp.xml} /root/mono-glue/Api
-cp -r /tmp/build_GodotSharp/GodotSharpEditor/bin/Release/{GodotSharpEditor.dll,GodotSharpEditor.pdb,GodotSharpEditor.xml} /root/mono-glue/Api
+if [ "${MONO}" == "1" ]; then
+  echo "Building and generating Mono glue..."
+
+  mono --version
+  export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/usr/lib/pkgconfig/
+
+  ${SCONS} platform=x11 bits=64 ${OPTIONS} target=release_debug tools=yes module_mono_enabled=yes mono_glue=no
+
+  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
+fi
+
+echo "Mono glue generated successfully"
--- a/build-release.sh
+++ b/build-release.sh
@@ -2,326 +2,554 @@

 set -e

-if [ -z $1 ]; then
-  echo "Usage: $0 <version>"
-  echo "  For example: $0 3.0.3-rc3"
-  echo ""
-  exit 1
-fi
+# Config

 # For signing keystore and password.
 source ./config.sh

-can_sign=0
-if [ ! -z "${SIGN_KEYSTORE}" ] && [ ! -z "${SIGN_PASSWORD}" ]; then
-  can_sign=1
+can_sign_windows=0
+if [ ! -z "${SIGN_KEYSTORE}" ] && [ ! -z "${SIGN_PASSWORD}" ] && [[ $(type -P "osslsigncode") ]]; then
+  can_sign_windows=1
 else
-  echo "Disabling binary signing as config.sh does not define the required data."
+  echo "Disabling Windows binary signing as config.sh does not define the required data (SIGN_KEYSTORE, SIGN_PASSWORD), or osslsigncode can't be found in PATH."
 fi

-function sign {
-  if [ $can_sign == 0 ]; then
+sign_windows() {
+  if [ $can_sign_windows == 0 ]; then
    return
  fi
-  ./osslsigncode -pkcs12 ${SIGN_KEYSTORE} -pass "${SIGN_PASSWORD}" -n "${SIGN_NAME}" -i "${SIGN_URL}" -t http://timestamp.comodoca.com -in $1 -out $1-signed
+  osslsigncode sign -pkcs12 ${SIGN_KEYSTORE} -pass "${SIGN_PASSWORD}" -n "${SIGN_NAME}" -i "${SIGN_URL}" -t http://timestamp.comodoca.com -in $1 -out $1-signed
  mv $1-signed $1
 }

-export GODOT_VERSION=$1
+sign_macos() {
+  if [ -z "${OSX_HOST}" ]; then
+    return
+  fi
+  _osx_tmpdir=$(ssh "${OSX_HOST}" "mktemp -d")
+  _reldir="$1"
+  _binname="$2"
+  _is_mono="$3"
+
+  if [[ "${_is_mono}" == "1" ]]; then
+    _appname="Godot_mono.app"
+    _sharpdir="${_appname}/Contents/Resources/GodotSharp"
+    _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}"
+  ssh "${OSX_HOST}" "
+            cd ${_osx_tmpdir} && \
+            unzip ${_binname}.zip && \
+            codesign --force --timestamp \
+              --options=runtime --entitlements editor.entitlements \
+              -s ${OSX_KEY_ID} -v ${_extra_files} ${_appname} && \
+            zip -r ${_binname}_signed.zip ${_appname}"
+
+  _request_uuid=$(ssh "${OSX_HOST}" "xcrun notarytool submit ${_osx_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 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}"
+    exit 1
+  else
+    ssh "${OSX_HOST}" "
+            cd ${_osx_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}"
+  fi
+}
+
+sign_macos_template() {
+  if [ -z "${OSX_HOST}" ]; then
+    return
+  fi
+  _osx_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}"
+  ssh "${OSX_HOST}" "
+            cd ${_osx_tmpdir} && \
+            unzip osx.zip && \
+            codesign --force -s - \
+              --options=linker-signed \
+              -v ${_extra_files} osx_template.app/Contents/MacOS/* && \
+            zip -r osx_signed.zip osx_template.app"
+
+  scp "${OSX_HOST}:${_osx_tmpdir}/osx_signed.zip" "${_reldir}/osx.zip"
+  ssh "${OSX_HOST}" "rm -rf ${_osx_tmpdir}"
+}
+
+godot_version=""
+templates_version=""
+build_classical=1
+build_mono=1
+
+while getopts "h?v:t:b:" 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
+    exit 1
+    ;;
+  v)
+    godot_version=$OPTARG
+    ;;
+  t)
+    templates_version=$OPTARG
+    ;;
+  b)
+    if [ "$OPTARG" == "classical" ]; then
+      build_mono=0
+    elif [ "$OPTARG" == "mono" ]; then
+      build_classical=0
+    fi
+    ;;
+  esac
+done
+
+if [ -z "${godot_version}" -o -z "${templates_version}" ]; then
+  echo "Mandatory argument -v or -t missing."
+  exit 1
+elif [[ "{$templates_version}" == *"-"* ]]; then
+  echo "Templates version (-t) shouldn't contain '-'. It should use a dot to separate version from status."
+  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 godot_basename="Godot_v${godot_version}"
+
+# Cleanup and setup
+
+rm -rf ${webdir}
+rm -rf ${reldir}
+rm -rf ${tmpdir}
+
+mkdir -p ${webdir}
+mkdir -p ${reldir}
+mkdir -p ${reldir_mono}
+mkdir -p ${templatesdir}
+mkdir -p ${templatesdir_mono}

 # Tarball

-mkdir -p release-${GODOT_VERSION}
-rm -rf release-${GODOT_VERSION}/*.xz release-${GODOT_VERSION}/*.sha256
-zcat godot.tar.gz | xz -c > release-${GODOT_VERSION}/godot-${GODOT_VERSION}.tar.xz
-sha256sum release-${GODOT_VERSION}/godot-${GODOT_VERSION}.tar.xz > release-${GODOT_VERSION}/godot-${GODOT_VERSION}.tar.xz.sha256
+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

-# Linux 64
+# Classical

-mkdir -p templates
-rm -f templates/linux_x11_64*
+if [ "${build_classical}" == "1" ]; then

-cp out/linux/x64/templates/godot.x11.opt.debug.64 templates/linux_x11_64_debug
-cp out/linux/x64/templates/godot.x11.opt.64 templates/linux_x11_64_release
+  ## Linux (Classical) ##

-mkdir -p release-${GODOT_VERSION}
-rm -f release-${GODOT_VERSION}/*linux*64*
+  # Editor
+  binname="${godot_basename}_x11.64"
+  cp out/linux/x64/tools/godot.x11.opt.tools.64 ${binname}
+  strip ${binname}
+  zip -q -9 "${reldir}/${binname}.zip" ${binname}
+  rm ${binname}

-cp out/linux/x64/tools/godot.x11.opt.tools.64 Godot_v${GODOT_VERSION}_x11.64
-zip -q -9 Godot_v${GODOT_VERSION}_x11.64.zip Godot_v${GODOT_VERSION}_x11.64
-mv Godot_v${GODOT_VERSION}_x11.64.zip release-${GODOT_VERSION}
-rm Godot_v${GODOT_VERSION}_x11.64
+  binname="${godot_basename}_x11.32"
+  cp out/linux/x86/tools/godot.x11.opt.tools.32 ${binname}
+  strip ${binname}
+  zip -q -9 "${reldir}/${binname}.zip" ${binname}
+  rm ${binname}

-mkdir -p mono/release-${GODOT_VERSION}
-rm -rf mono/release-${GODOT_VERSION}/*linux*64*
+  # 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_*

-mkdir -p Godot_v${GODOT_VERSION}_mono_x11_64
-cp out/linux/x64/tools-mono/godot.x11.opt.tools.64.mono Godot_v${GODOT_VERSION}_mono_x11_64/Godot_v${GODOT_VERSION}_mono_x11.64
-cp -rp out/linux/x64/tools-mono/GodotSharp Godot_v${GODOT_VERSION}_mono_x11_64
-cp -rp mono-glue/Api Godot_v${GODOT_VERSION}_mono_x11_64/GodotSharp/Api
-zip -r -q -9 Godot_v${GODOT_VERSION}_mono_x11_64.zip Godot_v${GODOT_VERSION}_mono_x11_64
-mv Godot_v${GODOT_VERSION}_mono_x11_64.zip mono/release-${GODOT_VERSION}
-rm -rf Godot_v${GODOT_VERSION}_mono_x11_64
+  ## Windows (Classical) ##

-mkdir -p mono/templates
-rm -rf mono/templates/*linux*64*
+  # Editor
+  binname="${godot_basename}_win64.exe"
+  batname="${godot_basename}_win64_console.cmd"
+  cp out/windows/x64/tools/godot.windows.opt.tools.64.exe ${binname}
+  strip ${binname}
+  sign_windows ${binname}
+  echo "@echo off" > ${batname}
+  echo ${binname} >> ${batname}
+  echo "pause > nul" >> ${batname}
+  zip -q -9 "${reldir}/${binname}.zip" ${binname} ${batname}
+  rm ${binname} ${batname}

-cp -rp out/linux/x64/templates-mono/data.mono.x11.64.* mono/templates/
-cp out/linux/x64/templates-mono/godot.x11.opt.debug.64.mono mono/templates/linux_x11_64_debug
-cp out/linux/x64/templates-mono/godot.x11.opt.64.mono mono/templates/linux_x11_64_release
+  binname="${godot_basename}_win32.exe"
+  batname="${godot_basename}_win32_console.cmd"
+  cp out/windows/x86/tools/godot.windows.opt.tools.32.exe ${binname}
+  strip ${binname}
+  sign_windows ${binname}
+  echo "@echo off" > ${batname}
+  echo ${binname} >> ${batname}
+  echo "pause > nul" >> ${batname}
+  zip -q -9 "${reldir}/${binname}.zip" ${binname} ${batname}
+  rm ${binname} ${batname}

-# Linux 32
+  # 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

-mkdir -p templates
-rm -f templates/linux_x11_32*
+  ## OSX (Classical) ##

-cp out/linux/x86/templates/godot.x11.opt.debug.32 templates/linux_x11_32_debug
-cp out/linux/x86/templates/godot.x11.opt.32 templates/linux_x11_32_release
+  # Editor
+  binname="${godot_basename}_osx.universal"
+  rm -rf Godot.app
+  cp -r git/misc/dist/osx_tools.app Godot.app
+  mkdir -p Godot.app/Contents/MacOS
+  cp out/macosx/tools/godot.osx.opt.tools.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

-mkdir -p release-${GODOT_VERSION}
-rm -f release-${GODOT_VERSION}/*linux*32*
+  # Templates
+  rm -rf osx_template.app
+  cp -r git/misc/dist/osx_template.app .
+  mkdir -p osx_template.app/Contents/MacOS

-cp out/linux/x86/tools/godot.x11.opt.tools.32 Godot_v${GODOT_VERSION}_x11.32
-zip -q -9 Godot_v${GODOT_VERSION}_x11.32.zip Godot_v${GODOT_VERSION}_x11.32
-mv Godot_v${GODOT_VERSION}_x11.32.zip release-${GODOT_VERSION}
-rm Godot_v${GODOT_VERSION}_x11.32
+  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
+  sign_macos_template ${templatesdir} 0

-mkdir -p mono/release-${GODOT_VERSION}
-rm -rf mono/release-${GODOT_VERSION}/*linux*32*
+  ## Server (Classical) ##

-mkdir -p Godot_v${GODOT_VERSION}_mono_x11_32
-cp out/linux/x86/tools-mono/godot.x11.opt.tools.32.mono Godot_v${GODOT_VERSION}_mono_x11_32/Godot_v${GODOT_VERSION}_mono_x11.32
-cp -rp out/linux/x86/tools-mono/GodotSharp/ Godot_v${GODOT_VERSION}_mono_x11_32
-cp -rp mono-glue/Api Godot_v${GODOT_VERSION}_mono_x11_32/GodotSharp/Api
-zip -r -q -9 Godot_v${GODOT_VERSION}_mono_x11_32.zip Godot_v${GODOT_VERSION}_mono_x11_32
-mv Godot_v${GODOT_VERSION}_mono_x11_32.zip mono/release-${GODOT_VERSION}
-rm -rf Godot_v${GODOT_VERSION}_mono_x11_32
+  # 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}

-mkdir -p mono/templates
-rm -rf mono/templates/*linux*32*
+  # 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}

-cp -rp out/linux/x86/templates-mono/data.mono.x11.32.* mono/templates/
-cp out/linux/x86/templates-mono/godot.x11.opt.debug.32.mono mono/templates/linux_x11_32_debug
-cp out/linux/x86/templates-mono/godot.x11.opt.32.mono mono/templates/linux_x11_32_release
+  ## Javascript (Classical) ##

-# Windows
+  # Editor
+  unzip out/javascript/tools/godot.javascript.opt.tools.threads.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}

-mkdir -p release-${GODOT_VERSION}
-rm -f release-${GODOT_VERSION}/*win*zip
+  # 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/windows/x64/tools/godot.windows.opt.tools.64.exe Godot_v${GODOT_VERSION}_win64.exe
-strip Godot_v${GODOT_VERSION}_win64.exe
-sign Godot_v${GODOT_VERSION}_win64.exe
-zip -q -9 Godot_v${GODOT_VERSION}_win64.exe.zip Godot_v${GODOT_VERSION}_win64.exe
-mv Godot_v${GODOT_VERSION}_win64.exe.zip release-${GODOT_VERSION}
-rm Godot_v${GODOT_VERSION}_win64.exe
+  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/windows/x86/tools/godot.windows.opt.tools.32.exe Godot_v${GODOT_VERSION}_win32.exe
-strip Godot_v${GODOT_VERSION}_win32.exe
-sign Godot_v${GODOT_VERSION}_win32.exe
-zip -q -9 Godot_v${GODOT_VERSION}_win32.exe.zip Godot_v${GODOT_VERSION}_win32.exe
-mv Godot_v${GODOT_VERSION}_win32.exe.zip release-${GODOT_VERSION}
-rm Godot_v${GODOT_VERSION}_win32.exe
+  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

-mkdir -p templates
-rm -rf templates/*win*
+  ## Android (Classical) ##

-cp out/windows/x64/templates/godot.windows.opt.64.exe templates/windows_64_release.exe
-cp out/windows/x64/templates/godot.windows.opt.debug.64.exe templates/windows_64_debug.exe
-cp out/windows/x86/templates/godot.windows.opt.32.exe templates/windows_32_release.exe
-cp out/windows/x86/templates/godot.windows.opt.debug.32.exe templates/windows_32_debug.exe
+  # Lib for direct download
+  cp out/android/templates/godot-lib.release.aar ${reldir}/godot-lib.${templates_version}.release.aar

-strip templates/windows*.exe
+  # Editor
+  binname="${godot_basename}_android_editor.apk"
+  cp out/android/tools/android_editor.apk ${reldir}/${binname}

-sign templates/windows_64_release.exe
-sign templates/windows_64_debug.exe
-sign templates/windows_32_release.exe
-sign templates/windows_32_debug.exe
+  # Templates
+  cp out/android/templates/*.apk ${templatesdir}/
+  cp out/android/templates/android_source.zip ${templatesdir}/

-mkdir -p mono/release-${GODOT_VERSION}
-rm -rf mono/release-${GODOT_VERSION}/*win*
+  ## iOS (Classical) ##

-mkdir -p mono/templates
-rm -rf mono/templates/*win*
+  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
+  cd ios_xcode
+  zip -q -9 -r "${templatesdir}/iphone.zip" *
+  cd ..
+  rm -rf ios_xcode

-mkdir -p Godot_v${GODOT_VERSION}_mono_win64
-cp out/windows/x64/tools-mono/godot.windows.opt.tools.64.mono.exe Godot_v${GODOT_VERSION}_mono_win64/Godot_v${GODOT_VERSION}_mono_win64.exe
-strip Godot_v${GODOT_VERSION}_mono_win64/Godot_v${GODOT_VERSION}_mono_win64.exe
-sign Godot_v${GODOT_VERSION}_mono_win64/Godot_v${GODOT_VERSION}_mono_win64.exe
-cp -rp out/windows/x64/tools-mono/GodotSharp Godot_v${GODOT_VERSION}_mono_win64
-cp -rp mono-glue/Api Godot_v${GODOT_VERSION}_mono_win64/GodotSharp/Api
-zip -r -q -9 Godot_v${GODOT_VERSION}_mono_win64.zip Godot_v${GODOT_VERSION}_mono_win64
-mv Godot_v${GODOT_VERSION}_mono_win64.zip mono/release-${GODOT_VERSION}
-rm -rf Godot_v${GODOT_VERSION}_mono_win64
+  ## UWP (Classical) ##

-cp -rp out/windows/x64/templates-mono/data.mono.windows.64.* mono/templates/
-cp out/windows/x64/templates-mono/godot.windows.opt.debug.64.mono.exe mono/templates/windows_64_debug.exe
-cp out/windows/x64/templates-mono/godot.windows.opt.64.mono.exe mono/templates/windows_64_release.exe
+  if [ ! -d "deps/angle-uwp" ]; then
+    echo "Downloading ANGLE binaries from https://github.com/godotengine/godot-build-scripts/releases/tag/_deps/"
+    mkdir -p deps && cd deps
+    curl -L -o angle-uwp.7z https://github.com/godotengine/godot-build-scripts/releases/download/_deps/angle-uwp-2.1.13.7z
+    7z x angle-uwp.7z && rm -f angle-uwp.7z
+    cd ..
+  fi

-mkdir -p Godot_v${GODOT_VERSION}_mono_win32
-cp out/windows/x86/tools-mono/godot.windows.opt.tools.32.mono.exe Godot_v${GODOT_VERSION}_mono_win32/Godot_v${GODOT_VERSION}_mono_win32.exe
-strip Godot_v${GODOT_VERSION}_mono_win32/Godot_v${GODOT_VERSION}_mono_win32.exe
-sign Godot_v${GODOT_VERSION}_mono_win32/Godot_v${GODOT_VERSION}_mono_win32.exe
-cp -rp  out/windows/x86/tools-mono/GodotSharp Godot_v${GODOT_VERSION}_mono_win32
-cp -rp mono-glue/Api Godot_v${GODOT_VERSION}_mono_win32/GodotSharp/Api
-zip -r -q -9 Godot_v${GODOT_VERSION}_mono_win32.zip Godot_v${GODOT_VERSION}_mono_win32
-mv Godot_v${GODOT_VERSION}_mono_win32.zip mono/release-${GODOT_VERSION}
-rm -rf Godot_v${GODOT_VERSION}_mono_win32
+  rm -rf uwp_template_*
+  for arch in ARM Win32 x64; do
+    cp -r git/misc/dist/uwp_template uwp_template_${arch}
+    cp deps/angle-uwp/${arch}/libEGL.dll \
+      deps/angle-uwp/${arch}/libGLESv2.dll \
+      uwp_template_${arch}/
+    cp -r uwp_template_${arch} uwp_template_${arch}_debug
+  done

-cp -rp out/windows/x86/templates-mono/data.mono.windows.32.* mono/templates/
-cp out/windows/x86/templates-mono/godot.windows.opt.debug.32.mono.exe mono/templates/windows_32_debug.exe
-cp out/windows/x86/templates-mono/godot.windows.opt.32.mono.exe mono/templates/windows_32_release.exe
+  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*

-strip mono/templates/windows*.exe
+  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*

-sign mono/templates/windows_64_debug.exe
-sign mono/templates/windows_64_release.exe
-sign mono/templates/windows_32_debug.exe
-sign mono/templates/windows_32_release.exe
+  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*

-# OSX
+  ## Templates TPZ (Classical) ##

-mkdir -p templates
-rm -f templates/osx*
+  echo "${templates_version}" > ${templatesdir}/version.txt
+  pushd ${templatesdir}/..
+  zip -q -9 -r -D "${reldir}/${godot_basename}_export_templates.tpz" templates/*
+  popd

-rm -rf osx_template
-mkdir -p osx_template
-cd osx_template
+  ## SHA-512 sums (Classical) ##

-cp -r ../git/misc/dist/osx_template.app .
-mkdir osx_template.app/Contents/MacOS
+  pushd ${reldir}
+  sha512sum [Gg]* > SHA512-SUMS.txt
+  mkdir -p ${basedir}/sha512sums/${godot_version}
+  cp SHA512-SUMS.txt ${basedir}/sha512sums/${godot_version}/
+  popd

-cp ../out/macosx/x64/templates/godot.osx.opt.64 osx_template.app/Contents/MacOS/godot_osx_release.64
-cp ../out/macosx/x64/templates/godot.osx.opt.debug.64 osx_template.app/Contents/MacOS/godot_osx_debug.64
-chmod +x osx_template.app/Contents/MacOS/godot_osx*
-zip -q -9 -r osx.zip osx_template.app
-cd ..
-
-mv osx_template/osx.zip templates
-rm -rf osx_template
-
-mkdir -p release-${GODOT_VERSION}
-rm -f release-${GODOT_VERSION}/*osx*
-
-cp -r git/misc/dist/osx_tools.app Godot.app
-mkdir -p Godot.app/Contents/MacOS
-cp out/macosx/x64/tools/godot.osx.opt.tools.64 Godot.app/Contents/MacOS/Godot
-chmod +x Godot.app/Contents/MacOS/Godot
-zip -q -9 -r "release-${GODOT_VERSION}/Godot_v${GODOT_VERSION}_osx.64.zip" Godot.app
-rm -rf Godot.app
-
-mkdir -p mono/templates
-rm -rf mono/templates/osx*
-
-rm -rf osx_template
-mkdir -p osx_template
-cd osx_template
-
-cp -r ../git/misc/dist/osx_template.app .
-mkdir osx_template.app/Contents/MacOS
-
-cp ../out/macosx/x64/templates-mono/godot.osx.opt.64.mono osx_template.app/Contents/MacOS/godot_osx_release.64
-cp ../out/macosx/x64/templates-mono/godot.osx.opt.debug.64.mono osx_template.app/Contents/MacOS/godot_osx_debug.64
-cp -rp ../out/macosx/x64/templates-mono/data.mono.osx.64.* osx_template.app/Contents/MacOS/
-chmod +x osx_template.app/Contents/MacOS/godot_osx*
-zip -q -9 -r osx.zip osx_template.app
-cd ..
-
-mv osx_template/osx.zip mono/templates
-rm -rf osx_template
-
-mkdir -p mono/release-${GODOT_VERSION}
-rm -f mono/release-${GODOT_VERSION}/*osx*
-
-cp -r git/misc/dist/osx_tools.app Godot_mono.app
-mkdir -p Godot_mono.app/Contents/MacOS
-cp out/macosx/x64/tools-mono/godot.osx.opt.tools.64.mono Godot_mono.app/Contents/MacOS/Godot
-mkdir -p Godot_mono.app/Contents/{Frameworks,Resources}
-mkdir -p Godot_mono.app/Contents/{Frameworks,Resources}/GodotSharp
-mkdir -p Godot_mono.app/Contents/{Frameworks,Resources}/GodotSharp/Mono
-cp -rp out/macosx/x64/tools-mono/GodotSharp/Mono/lib Godot_mono.app/Contents/Frameworks/GodotSharp/Mono
-cp -rp out/macosx/x64/tools-mono/GodotSharp/Tools Godot_mono.app/Contents/Frameworks/GodotSharp
-cp -rp mono-glue/Api Godot_mono.app/Contents/Frameworks/GodotSharp
-cp -rp out/macosx/x64/tools-mono/GodotSharp/Mono/etc Godot_mono.app/Contents/Resources/GodotSharp/Mono
-chmod +x Godot_mono.app/Contents/MacOS/Godot
-zip -q -9 -r "mono/release-${GODOT_VERSION}/Godot_v${GODOT_VERSION}_mono_osx.64.zip" Godot_mono.app
-rm -rf Godot_mono.app
-
-# Server
-
-cp out/server/x64/templates/godot_server.x11.opt.64 Godot_v${GODOT_VERSION}_linux_server.64
-zip -q -9 Godot_v${GODOT_VERSION}_linux_server.64.zip Godot_v${GODOT_VERSION}_linux_server.64
-mv Godot_v${GODOT_VERSION}_linux_server.64.zip release-${GODOT_VERSION}
-rm Godot_v${GODOT_VERSION}_linux_server.64
-
-cp out/server/x64/tools/godot_server.x11.opt.tools.64 Godot_v${GODOT_VERSION}_linux_headless.64
-zip -q -9 Godot_v${GODOT_VERSION}_linux_headless.64.zip Godot_v${GODOT_VERSION}_linux_headless.64
-mv Godot_v${GODOT_VERSION}_linux_headless.64.zip release-${GODOT_VERSION}
-rm Godot_v${GODOT_VERSION}_linux_headless.64
-
-# Javascript
-
-cp out/javascript/godot.javascript.opt.zip templates/webassembly_release.zip
-cp out/javascript/godot.javascript.opt.debug.zip templates/webassembly_debug.zip
-
-# Android
-
-cp out/android/*.apk templates
-
-# iOS
-
-cp -r git/misc/dist/ios_xcode ios_xcode
-cp out/ios/libgodot.iphone.opt.fat ios_xcode/libgodot.iphone.release.fat.a
-cp out/ios/libgodot.iphone.opt.debug.fat ios_xcode/libgodot.iphone.debug.fat.a
-
-chmod +x ios_xcode/libgodot.iphone.*
-cd ios_xcode
-zip -q -9 -r ../templates/iphone.zip *
-cd ..
-rm -rf ios_xcode
-
-# UWP
-
-if [ ! -d "angle" ]; then
-  echo "Downloading ANGLE binaries from https://github.com/GodotBuilder/godot-builds/releases/tag/_tools"
-  curl -LO https://github.com/GodotBuilder/godot-builds/releases/download/_tools/angle.7z
-  7z x angle.7z && rm -f angle.7z
 fi

-mkdir -p templates
-rm -f templates/uwp*
-rm -rf uwp_template_*
+# Mono

-for arch in ARM Win32 x64; do
-  cp -r git/misc/dist/uwp_template uwp_template_${arch}
+if [ "${build_mono}" == "1" ]; then

-  cp angle/winrt/10/src/Release_${arch}/libEGL.dll \
-     angle/winrt/10/src/Release_${arch}/libGLESv2.dll \
-     uwp_template_${arch}/
-  cp -r uwp_template_${arch} uwp_template_${arch}_debug
-done
+  ## Linux (Mono) ##

-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
-sign uwp_template_ARM/godot.uwp.exe
-sign uwp_template_ARM_debug/godot.uwp.exe
-cd uwp_template_ARM && zip -q -9 -r ../templates/uwp_arm_release.zip * && cd ..
-cd uwp_template_ARM_debug && zip -q -9 -r ../templates/uwp_arm_debug.zip * && cd ..
+  # 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

-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
-sign uwp_template_Win32/godot.uwp.exe
-sign uwp_template_Win32_debug/godot.uwp.exe
-cd uwp_template_Win32 && zip -q -9 -r ../templates/uwp_x86_release.zip * && cd ..
-cd uwp_template_Win32_debug && zip -q -9 -r ../templates/uwp_x86_debug.zip * && cd ..
+  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

-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
-sign uwp_template_x64/godot.uwp.exe
-sign uwp_template_x64_debug/godot.uwp.exe
-cd uwp_template_x64 && zip -q -9 -r ../templates/uwp_x64_release.zip * && cd ..
-cd uwp_template_x64_debug && zip -q -9 -r ../templates/uwp_x64_debug.zip * && cd ..
+  # 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*

-rm -rf uwp_template_*
+  mkdir -p ${templatesdir_mono}/bcl
+  cp -r out/linux/x64/tools-mono/GodotSharp/Mono/lib/mono/4.5/ ${templatesdir_mono}/bcl/net_4_x

-exit 0
+  ## Windows (Mono) ##
+
+  # Editor
+  binname="${godot_basename}_mono_win64"
+  batname="${godot_basename}_mono_win64_console.cmd"
+  mkdir -p ${binname}
+  cp out/windows/x64/tools-mono/godot.windows.opt.tools.64.mono.exe ${binname}/${binname}.exe
+  strip ${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/
+  echo "@echo off" > ${batname}
+  echo ${binname}.exe >> ${batname}
+  echo "pause > nul" >> ${batname}
+  mv ${batname} ${binname}/
+  zip -r -q -9 "${reldir_mono}/${binname}.zip" ${binname}
+  rm -rf ${binname}
+
+  binname="${godot_basename}_mono_win32"
+  batname="${godot_basename}_mono_win32_console.cmd"
+  mkdir -p ${binname}
+  cp out/windows/x86/tools-mono/godot.windows.opt.tools.32.mono.exe ${binname}/${binname}.exe
+  strip ${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/
+  echo "@echo off" > ${batname}
+  echo ${binname}.exe >> ${batname}
+  echo "pause > nul" >> ${batname}
+  mv ${batname} ${binname}/
+  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
+
+  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) ##
+
+  # Editor
+  binname="${godot_basename}_mono_osx.universal"
+  rm -rf Godot_mono.app
+  cp -r git/misc/dist/osx_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/
+  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
+  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
+
+  # Editor
+  #binname="${godot_basename}_mono_android_editor.apk"
+  #cp out/android/tools-mono/android_editor.apk ${reldir_mono}/${binname}
+
+  # 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
+  cd ios_xcode
+  zip -q -9 -r "${templatesdir_mono}/iphone.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}
+
+  ## UWP (Mono) ##
+
+  # Not supported yet.
+
+  ## Templates TPZ (Mono) ##
+
+  echo "${templates_version}.mono" > ${templatesdir_mono}/version.txt
+  pushd ${templatesdir_mono}/..
+  zip -q -9 -r -D "${reldir_mono}/${godot_basename}_mono_export_templates.tpz" templates/*
+  popd
+
+  ## SHA-512 sums (Mono) ##
+
+  pushd ${reldir_mono}
+  sha512sum [Gg]* >> SHA512-SUMS.txt
+  mkdir -p ${basedir}/sha512sums/${godot_version}/mono
+  cp SHA512-SUMS.txt ${basedir}/sha512sums/${godot_version}/mono/
+  popd
+
+fi
+
+echo "All editor binaries and templates prepared successfully for release"
--- a/build-server/build.sh
+++ b/build-server/build.sh
@@ -2,29 +2,53 @@

 set -e

-export BUILD_NAME=official
+# Config
+
 export SCONS="scons -j${NUM_CORES} verbose=yes warnings=no progress=no"
-export OPTIONS="builtin_libpng=yes builtin_openssl=yes builtin_zlib=yes debug_symbols=no use_static_cpp=yes use_lto=yes"
-export MONO_OPTIONS="module_mono_enabled=yes mono_static=yes copy_mono_root=yes"
+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 MONO32_PREFIX=/usr
-export MONO64_PREFIX=/usr
-export CC="gcc-8"
-export CXX="g++-8"
+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

-$SCONS platform=server CC=$CC CXX=$CXX $OPTIONS tools=no target=release_debug
-$SCONS platform=server CC=$CC CXX=$CXX $OPTIONS tools=no target=release
-mkdir -p /root/out/templates
-cp -rvp bin/* /root/out/templates
-rm -rf bin
+# Classical

-$SCONS platform=server CC=$CC CXX=$CXX $OPTIONS tools=yes target=release_debug
-mkdir -p /root/out/tools
-cp -rvp bin/* /root/out/tools
-rm -rf bin
+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-templates.sh
+++ b/build-templates.sh
@@ -1,26 +0,0 @@
-#!/bin/bash
-
-set -e
-
-if [ -z "$1" ] || [ -z "$2" ]; then
-  echo "usage: $0 <version> <file version>"
-  echo "  like : $0 3.0.3.rc1 3.0.3-rc1"
-  exit 1
-fi
-
-VERSION=$1
-FILE_VERSION=$2
-MONO_VERSION=$3
-
-echo "$VERSION" > templates/version.txt
-
-mkdir -p release-${FILE_VERSION}
-rm -f release-${FILE_VERSION}/*templates.tpz
-zip -q -9 -r -D release-${FILE_VERSION}/Godot_v${FILE_VERSION}_export_templates.tpz templates
-
-mkdir -p mono/release-${FILE_VERSION}
-rm -f mono/release-${FILE_VERSION}/*templates.tpz
-cd mono
-echo "$VERSION".mono > templates/version.txt
-zip -q -9 -r -D release-${FILE_VERSION}/Godot_v${FILE_VERSION}_mono_export_templates.tpz templates
-cd ..
--- a/build-uwp/build.sh
+++ b/build-uwp/build.sh
@@ -2,25 +2,42 @@

 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'
-export BUILD_NAME=official
-export SCONS="call scons -j4 verbose=yes warnings=no progress=no"
-export OPTIONS="builtin_libpng=yes builtin_openssl=yes builtin_zlib=yes debug_symbols=no"

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

-for arch in x86 x64 arm; do
-  for release in release release_debug; do
-    wine cmd /c /root/build/build.bat $arch $release
+# Classical

-    sync
-    wineserver -kw
+if [ "${CLASSICAL}" == "1" ]; then
+  echo "Starting classical build for UWP..."

-    mkdir -p /root/out/$arch
-    mv bin/* /root/out/$arch
+  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
-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-windows/build.sh
+++ b/build-windows/build.sh
@@ -2,61 +2,82 @@

 set -e

-export BUILD_NAME=official
+# Config
+
 export SCONS="scons -j${NUM_CORES} verbose=yes warnings=no progress=no"
-export OPTIONS="builtin_libpng=yes builtin_openssl=yes builtin_zlib=yes debug_symbols=no use_static_cpp=yes use_lto=yes"
+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 TERM=xterm
-export MONO32_PREFIX=/root/dependencies/mono-32
-export MONO64_PREFIX=/root/dependencies/mono-64

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

-cp /root/mono-glue/*.cpp modules/mono/glue
+# Classical

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

-$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
-rm -rf bin
+  $SCONS platform=windows bits=64 $OPTIONS tools=yes target=release_debug
+  mkdir -p /root/out/x64/tools
+  cp -rvp bin/* /root/out/x64/tools
+  rm -rf bin

-$SCONS platform=windows bits=32 $OPTIONS $OPTIONS_MONO tools=yes target=release_debug copy_mono_root=yes
-mkdir -p /root/out/x86/tools-mono
-cp -rvp bin/* /root/out/x86/tools-mono
-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
+  rm -rf bin

-$SCONS platform=windows bits=32 $OPTIONS $OPTIONS_MONO tools=no target=release_debug
-$SCONS platform=windows bits=32 $OPTIONS $OPTIONS_MONO tools=no target=release
-mkdir -p /root/out/x86/templates-mono
-cp -rvp bin/* /root/out/x86/templates-mono
-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
+  rm -rf bin

-$SCONS platform=windows bits=64 $OPTIONS tools=yes target=release_debug
-mkdir -p /root/out/x64/tools
-cp -rvp bin/* /root/out/x64/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
+  rm -rf bin
+fi

-$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
-rm -rf bin
+# Mono

-$SCONS platform=windows bits=64 $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
+if [ "${MONO}" == "1" ]; then
+  echo "Starting Mono build for Windows..."

-$SCONS platform=windows bits=64 $OPTIONS $OPTIONS_MONO tools=no target=release_debug
-$SCONS platform=windows bits=64 $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
+  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
+  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
+  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
+  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
+  rm -rf bin
+fi
+
+echo "Windows build successful"
--- a/build.sh
+++ b/build.sh
@@ -4,6 +4,8 @@ set -e

 OPTIND=1

+# Config
+
 # For default registry and number of cores.
 if [ ! -e config.sh ]; then
  echo "No config.sh, copying default values from config.sh.in."
@@ -11,6 +13,10 @@ if [ ! -e config.sh ]; then
 fi
 source ./config.sh

+if [ -z "${BUILD_NAME}" ]; then
+  export BUILD_NAME="custom_build"
+fi
+
 if [ -z "${NUM_CORES}" ]; then
  export NUM_CORES=16
 fi
@@ -20,43 +26,61 @@ username=""
 password=""
 godot_version=""
 git_treeish="master"
+build_classical=1
+build_mono=1
 force_download=0
-skip_download=0
+skip_download=1
 skip_git_checkout=0

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

 export podman=none
@@ -80,6 +104,16 @@ if [ -z "${godot_version}" ]; then
  exit 1
 fi

+IFS=- read version status <<< "$godot_version"
+echo "Building Godot ${version} ${status} from commit or branch ${git_treeish}."
+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
+export GODOT_VERSION_STATUS="${status}"
+
 if [ ! -z "${username}" ] && [ ! -z "${password}" ]; then
  if ${podman} login ${registry} -u "${username}" -p "${password}"; then
    export logged_in=true
@@ -88,7 +122,7 @@ fi

 if [ $skip_download == 0 ]; then
  echo "Fetching images"
-  for image in mono-glue windows ubuntu-64 ubuntu-32 javascript; do
+  for image in mono-glue windows linux javascript; 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"
@@ -119,7 +153,22 @@ if [ "${skip_git_checkout}" == 0 ]; then
  git clean -fdx
  git pull origin ${git_treeish} || /bin/true

-  git archive --format=tar $git_treeish --prefix=godot-${godot_version}/ | gzip > ../godot.tar.gz
+  # Validate version
+  correct_version=$(python3 << EOF
+import version;
+if hasattr(version, "patch") and version.patch != 0:
+  git_version = f"{version.major}.{version.minor}.{version.patch}"
+else:
+  git_version = f"{version.major}.{version.minor}"
+print(git_version == "${version}")
+EOF
+  )
+  if [[ "$correct_version" != "True" ]]; then
+    echo "Version in version.py doesn't match the passed ${version}."
+    exit 1
+  fi
+
+  sh misc/scripts/make_tarball.sh -v ${godot_version} -g ${git_treeish}
  popd
 fi

@@ -127,38 +176,41 @@ export basedir="$(pwd)"
 mkdir -p ${basedir}/out
 mkdir -p ${basedir}/out/logs

-export podman_run="${podman} run -it --rm --env NUM_CORES -v ${basedir}/godot.tar.gz:/root/godot.tar.gz -v ${basedir}/mono-glue:/root/mono-glue -w /root/"
+export podman_run="${podman} run -it --rm --env BUILD_NAME --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-f36-mono-6.12.0.182
+
+# 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/*/*

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

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

-mkdir -p ${basedir}/out/linux/x64
-${podman_run} -v ${basedir}/build-linux:/root/build -v ${basedir}/out/linux/x64:/root/out ${registry}/godot/ubuntu-64:latest bash build/build.sh 2>&1 | tee ${basedir}/out/logs/linux64
-
-mkdir -p ${basedir}/out/linux/x86
-${podman_run} -v ${basedir}/build-linux:/root/build -v ${basedir}/out/linux/x86:/root/out ${registry}/godot/ubuntu-32:latest bash build/build.sh 2>&1 | tee ${basedir}/out/logs/linux32
-
-mkdir -p ${basedir}/out/server/x64
-${podman_run} -v ${basedir}/build-server:/root/build -v ${basedir}/out/server/x64:/root/out ${registry}/godot/ubuntu-64:latest bash build/build.sh 2>&1 | tee ${basedir}/out/logs/server
+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 ${registry}/godot/javascript:latest bash build/build.sh 2>&1 | tee ${basedir}/out/logs/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/macosx/x64
-${podman_run} -v ${basedir}/build-macosx:/root/build -v ${basedir}/out/macosx/x64:/root/out ${registry}/godot-private/macosx:latest bash build/build.sh 2>&1 | tee ${basedir}/out/logs/macosx
+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/android
-${podman_run} -v ${basedir}/build-android:/root/build -v ${basedir}/out/android:/root/out ${registry}/godot-private/android:latest bash build/build.sh 2>&1 | tee ${basedir}/out/logs/android
+${podman_run} -v ${basedir}/build-android:/root/build -v ${basedir}/out/android:/root/out localhost/godot-android:${img_version} bash build/build.sh 2>&1 | tee ${basedir}/out/logs/android

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

 if [ ! -z "$SUDO_UID" ]; then
-  chown -R "${SUDO_UID}":"${SUDO_GID}" ${basedir}/out
+  chown -R "${SUDO_UID}":"${SUDO_GID}" ${basedir}/git ${basedir}/out ${basedir}/mono-glue ${basedir}/godot*.tar.gz
 fi
--- a/clean-release.sh
+++ b/clean-release.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+rm -rf releases tmp web
--- a/clean.sh
+++ b/clean.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+rm -rf godot*.tar.gz mono-glue out releases tmp web
+git status
--- a/config.sh.in
+++ b/config.sh.in
@@ -11,6 +11,9 @@
 # https://github.com/godotengine/build-containers
 export REGISTRY="registry.prehensile-tales.com"

+# Default build name used to distinguish between official and custom builds.
+export BUILD_NAME="custom_build"
+
 # Default number of parallel cores for each build.
 export NUM_CORES=16

@@ -27,3 +30,15 @@ export SIGN_PASSWORD=""
 # Use your own when making a thirdparty build.
 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=""
+# ID of the Apple certificate used to sign
+export OSX_KEY_ID=""
+# Bundle id for the signed app
+export OSX_BUNDLE_ID=""
+# Username/password for Apple's signing APIs (used for notarytool)
+export APPLE_TEAM=""
+export APPLE_ID=""
+export APPLE_ID_PASSWORD=""
--- a/BIN
+++ b/BIN