[macOS] Use notarytool instead of deprecated altool.

(cherry picked from commit 7b9e4271f4)

.gitignore

@@ -3,7 +3,6 @@ config.sh
 *.jks
 *.pfx
 *.pkcs12
-/*.json
 
 # Generated by build scripts
 angle/
@@ -17,9 +16,5 @@ angle.7z
 out/
 releases/
 sha512sums/
-steam/
 tmp/
 web/
-
-# macOS
-.DS_Store

build-android/build.sh

@@ -4,32 +4,118 @@ set -e
 
 # Config
 
-# Debug symbols are enabled for the Android builds so we can generate a separate debug symbols file.
-# Gradle will strip them out of the final artifacts.
 export SCONS="scons -j${NUM_CORES} verbose=yes warnings=no progress=no"
-export OPTIONS=""
+export OPTIONS="production=yes"
+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
 
-echo "Starting classical build for Android..."
-$SCONS platform=android android_arch=armv7 $OPTIONS tools=no target=release_debug
-$SCONS platform=android android_arch=armv7 $OPTIONS tools=no target=release
-$SCONS platform=android android_arch=arm64v8 $OPTIONS tools=no target=release_debug
-$SCONS platform=android android_arch=arm64v8 $OPTIONS tools=no target=release
-$SCONS platform=android android_arch=x86 $OPTIONS tools=no target=release_debug
-$SCONS platform=android android_arch=x86 $OPTIONS tools=no target=release
-$SCONS platform=android android_arch=x86_64 $OPTIONS tools=no target=release_debug
-$SCONS platform=android android_arch=x86_64 $OPTIONS tools=no target=release
+# Environment variables and keystore needed for signing store editor build,
+# as well as signing and publishing to MavenCentral.
+source /root/keystore/config.sh
 
-pushd platform/android/java
-./gradlew build
-popd
+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
 
-mkdir -p /root/out/templates
-cp bin/android_debug.apk /root/out/templates/
-cp bin/android_release.apk /root/out/templates/
+# Classical
+
+dnf -y install gettext
+
+if [ "${CLASSICAL}" == "1" ]; then
+  echo "Starting classical build for Android..."
+
+  $SCONS platform=android arch=arm32 $OPTIONS target=editor store_release=${store_release}
+  $SCONS platform=android arch=arm64 $OPTIONS target=editor store_release=${store_release}
+  $SCONS platform=android arch=x86_32 $OPTIONS target=editor store_release=${store_release}
+  $SCONS platform=android arch=x86_64 $OPTIONS target=editor store_release=${store_release}
+
+  pushd platform/android/java
+  ./gradlew generateGodotEditor
+  popd
+
+  mkdir -p /root/out/tools
+  # Copy the generated Android editor binaries (apk & aab).
+  if [ "$store_release" == "yes" ]; then
+    cp bin/android_editor_builds/android_editor-release.apk /root/out/tools/android_editor.apk
+    cp bin/android_editor_builds/android_editor-release.aab /root/out/tools/android_editor.aab
+  else
+    cp bin/android_editor_builds/android_editor-debug.apk /root/out/tools/android_editor.apk
+    cp bin/android_editor_builds/android_editor-debug.aab /root/out/tools/android_editor.aab
+  fi
+
+  # Restart from a clean tarball, as we'll copy all the contents
+  # outside the container for the MavenCentral upload.
+  rm -rf /root/godot/*
+  tar xf /root/godot.tar.gz --strip-components=1
+
+  $SCONS platform=android arch=arm32 $OPTIONS target=template_debug
+  $SCONS platform=android arch=arm32 $OPTIONS target=template_release
+
+  $SCONS platform=android arch=arm64 $OPTIONS target=template_debug
+  $SCONS platform=android arch=arm64 $OPTIONS target=template_release
+
+  $SCONS platform=android arch=x86_32 $OPTIONS target=template_debug
+  $SCONS platform=android arch=x86_32 $OPTIONS target=template_release
+
+  $SCONS platform=android arch=x86_64 $OPTIONS target=template_debug
+  $SCONS platform=android arch=x86_64 $OPTIONS target=template_release
+
+  pushd platform/android/java
+  ./gradlew generateGodotTemplates
+
+  if [ "$store_release" == "yes" ]; then
+    # Copy source folder with compiled libs so we can optionally use it
+    # in a separate script to upload the templates to MavenCentral.
+    cp -r /root/godot /root/out/source/
+    # Backup ~/.gradle too so we can reuse all the downloaded stuff.
+    cp -r /root/.gradle /root/out/source/.gradle
+  fi
+  popd
+
+  mkdir -p /root/out/templates
+  cp bin/android_source.zip /root/out/templates/
+  cp bin/android_debug.apk /root/out/templates/
+  cp bin/android_release.apk /root/out/templates/
+  cp bin/godot-lib.template_release.aar /root/out/templates/
+fi
+
+# Mono
+
+# No Android support with .NET 6 yet.
+#if [ "${MONO}" == "1" ]; then
+if false; then
+  echo "Starting Mono build for Android..."
+
+  cp -r /root/mono-glue/GodotSharp/GodotSharp/Generated modules/mono/glue/GodotSharp/GodotSharp/
+
+  $SCONS platform=android arch=arm32 $OPTIONS $OPTIONS_MONO target=template_debug
+  $SCONS platform=android arch=arm32 $OPTIONS $OPTIONS_MONO target=template_release
+
+  $SCONS platform=android arch=arm64 $OPTIONS $OPTIONS_MONO target=template_debug
+  $SCONS platform=android arch=arm64 $OPTIONS $OPTIONS_MONO target=template_release
+
+  $SCONS platform=android arch=x86_32 $OPTIONS $OPTIONS_MONO target=template_debug
+  $SCONS platform=android arch=x86_32 $OPTIONS $OPTIONS_MONO target=template_release
+
+  $SCONS platform=android arch=x86_64 $OPTIONS $OPTIONS_MONO target=template_debug
+  $SCONS platform=android arch=x86_64 $OPTIONS $OPTIONS_MONO target=template_release
+
+  pushd platform/android/java
+  ./gradlew 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/
+fi
 
 echo "Android build successful"

build-android/playstore_upload_script.py

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

build-android/upload-mavencentral.sh

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

build-android/upload-playstore.sh

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

build-ios/build.sh

@@ -5,21 +5,93 @@ set -e
 # Config
 
 export SCONS="scons -j${NUM_CORES} verbose=yes warnings=no progress=no"
-export IOS_SDK="18.5"
-export IOS_OPTIONS_ARM64="SDKVERSION=${IOS_SDK} ios_triple=arm-apple-darwin11- IPHONEPATH=/root/ioscross/arm64/ IPHONESDK=/root/ioscross/arm64/SDK/iPhoneOS${IOS_SDK}.sdk/"
+# Keep LTO disabled for iOS - it works but it makes linking apps on deploy very slow,
+# which is seen as a regression in the current workflow.
+export OPTIONS="production=yes use_lto=no"
+export OPTIONS_MONO="module_mono_enabled=yes"
+export TERM=xterm
+
+export IOS_SDK="16.1"
+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
 
-echo "Starting classical build for iOS..."
+# Classical
 
-# arm64 device
-$SCONS platform=iphone $IOS_OPTIONS_ARM64 arch=arm64 tools=no target=release_debug
-$SCONS platform=iphone $IOS_OPTIONS_ARM64 arch=arm64 tools=no target=release
+dnf -y install gettext
 
-mkdir -p /root/out/templates
-cp bin/godot.iphone.*.arm64 /root/out/templates/
+if [ "${CLASSICAL}" == "1" ]; then
+  echo "Starting classical build for iOS..."
+
+  # arm64 device
+  $SCONS platform=ios $OPTIONS arch=arm64 ios_simulator=no target=template_debug \
+    IOS_SDK_PATH="/root/ioscross/arm64/SDK/iPhoneOS${IOS_SDK}.sdk" IOS_TOOLCHAIN_PATH="/root/ioscross/arm64/" ios_triple="arm-apple-darwin11-"
+  $SCONS platform=ios $OPTIONS arch=arm64 ios_simulator=no target=template_release \
+    IOS_SDK_PATH="/root/ioscross/arm64/SDK/iPhoneOS${IOS_SDK}.sdk" IOS_TOOLCHAIN_PATH="/root/ioscross/arm64/" ios_triple="arm-apple-darwin11-"
+
+  # arm64 simulator
+  # Disabled for now as it doesn't work with cctools-port and current LLVM.
+  # See https://github.com/godotengine/build-containers/pull/85.
+  #$SCONS platform=ios $OPTIONS arch=arm64 ios_simulator=yes target=template_debug \
+  #  IOS_SDK_PATH="/root/ioscross/arm64_sim/SDK/iPhoneOS${IOS_SDK}.sdk" IOS_TOOLCHAIN_PATH="/root/ioscross/arm64_sim/" ios_triple="arm-apple-darwin11-"
+  #$SCONS platform=ios $OPTIONS arch=arm64 ios_simulator=no target=template_release \
+  #  IOS_SDK_PATH="/root/ioscross/arm64_sim/SDK/iPhoneOS${IOS_SDK}.sdk" IOS_TOOLCHAIN_PATH="/root/ioscross/arm64_sim/" ios_triple="arm-apple-darwin11-"
+
+  # x86_64 simulator
+  $SCONS platform=ios $OPTIONS arch=x86_64 ios_simulator=yes target=template_debug \
+    IOS_SDK_PATH="/root/ioscross/x86_64_sim/SDK/iPhoneOS${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/iPhoneOS${IOS_SDK}.sdk" IOS_TOOLCHAIN_PATH="/root/ioscross/x86_64_sim/" ios_triple="x86_64-apple-darwin11-"
+
+  mkdir -p /root/out/templates
+  cp bin/libgodot.ios.template_release.arm64.a /root/out/templates/libgodot.ios.a
+  cp bin/libgodot.ios.template_debug.arm64.a /root/out/templates/libgodot.ios.debug.a
+  #$IOS_LIPO -create bin/libgodot.ios.template_release.arm64.simulator.a bin/libgodot.ios.template_release.x86_64.simulator.a -output /root/out/templates/libgodot.ios.simulator.a
+  #$IOS_LIPO -create bin/libgodot.ios.template_debug.arm64.simulator.a bin/libgodot.ios.template_debug.x86_64.simulator.a -output /root/out/templates/libgodot.ios.debug.simulator.a
+  cp bin/libgodot.ios.template_release.x86_64.simulator.a /root/out/templates/libgodot.ios.simulator.a
+  cp bin/libgodot.ios.template_debug.x86_64.simulator.a /root/out/templates/libgodot.ios.debug.simulator.a
+fi
+
+# Mono
+
+# No iOS support with .NET 6 yet.
+#if [ "${MONO}" == "1" ]; then
+if false; then
+  echo "Starting Mono build for iOS..."
+
+  cp -r /root/mono-glue/GodotSharp/GodotSharp/Generated modules/mono/glue/GodotSharp/GodotSharp/
+
+  # arm64 device
+  $SCONS platform=ios $OPTIONS $OPTIONS_MONO arch=arm64 ios_simulator=no target=template_debug \
+    IOS_SDK_PATH="/root/ioscross/arm64/SDK/iPhoneOS${IOS_SDK}.sdk" IOS_TOOLCHAIN_PATH="/root/ioscross/arm64/" ios_triple="arm-apple-darwin11-"
+  $SCONS platform=ios $OPTIONS $OPTIONS_MONO arch=arm64 ios_simulator=no target=template_release \
+    IOS_SDK_PATH="/root/ioscross/arm64/SDK/iPhoneOS${IOS_SDK}.sdk" IOS_TOOLCHAIN_PATH="/root/ioscross/arm64/" ios_triple="arm-apple-darwin11-"
+
+  # arm64 simulator
+  # Disabled for now as it doesn't work with cctools-port and current LLVM.
+  # See https://github.com/godotengine/build-containers/pull/85.
+  #$SCONS platform=ios $OPTIONS $OPTIONS_MONO arch=arm64 ios_simulator=yes target=template_debug \
+  #  IOS_SDK_PATH="/root/ioscross/arm64_sim/SDK/iPhoneOS${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/iPhoneOS${IOS_SDK}.sdk" IOS_TOOLCHAIN_PATH="/root/ioscross/arm64_sim/" ios_triple="arm-apple-darwin11-"
+
+  # x86_64 simulator
+  $SCONS platform=ios $OPTIONS $OPTIONS_MONO arch=x86_64 ios_simulator=yes target=template_debug \
+    IOS_SDK_PATH="/root/ioscross/x86_64_sim/SDK/iPhoneOS${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/iPhoneOS${IOS_SDK}.sdk" IOS_TOOLCHAIN_PATH="/root/ioscross/x86_64_sim/" ios_triple="x86_64-apple-darwin11-"
+
+  mkdir -p /root/out/templates-mono
+
+  cp bin/libgodot.ios.template_release.arm64.a /root/out/templates-mono/libgodot.ios.a
+  cp bin/libgodot.ios.template_debug.arm64.a /root/out/templates-mono/libgodot.ios.debug.a
+  #$IOS_LIPO -create bin/libgodot.ios.template_release.arm64.simulator.a bin/libgodot.ios.template_release.x86_64.simulator.a -output /root/out/templates-mono/libgodot.ios.simulator.a
+  #$IOS_LIPO -create bin/libgodot.ios.template_debug.arm64.simulator.a bin/libgodot.ios.template_debug.x86_64.simulator.a -output /root/out/templates-mono/libgodot.ios.debug.simulator.a
+  cp bin/libgodot.ios.template_release.x86_64.simulator.a /root/out/templates-mono/libgodot.ios.simulator.a
+  cp bin/libgodot.ios.template_debug.x86_64.simulator.a /root/out/templates-mono/libgodot.ios.debug.simulator.a
+fi
 
 echo "iOS build successful"

build-linux/build.sh

@@ -5,53 +5,87 @@ set -e
 # Config
 
 export SCONS="scons -j${NUM_CORES} verbose=yes warnings=no progress=no"
-export OPTIONS="use_static_cpp=yes"
-export STRIP="strip"
+export OPTIONS="production=yes"
+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
 
-echo "Starting classical build for Linux..."
+# pkg-config wrongly points to lib instead of lib64 for arch-dependent header.
+sed -i ${GODOT_SDK_LINUX_X86_64}/x86_64-godot-linux-gnu/sysroot/usr/lib/pkgconfig/dbus-1.pc -e "s@/lib@/lib64@g"
 
-export PATH="${GODOT_SDK_LINUX_X86_64}/bin:${BASE_PATH}"
+dnf -y install gettext
 
-$SCONS platform=x11 bits=64 $OPTIONS tools=yes target=release_debug
-$STRIP bin/godot.x11.*
-mkdir -p /root/out/x86_64/tools
-cp -rvp bin/* /root/out/x86_64/tools
-rm -rf bin
+# Classical
 
-$SCONS platform=x11 bits=64 $OPTIONS tools=no target=release_debug
-$SCONS platform=x11 bits=64 $OPTIONS tools=no target=release
-$STRIP bin/godot.x11.*
-mkdir -p /root/out/x86_64/templates
-cp -rvp bin/* /root/out/x86_64/templates
-rm -rf bin
+if [ "${CLASSICAL}" == "1" ]; then
+  echo "Starting classical build for Linux..."
 
-export PATH="${GODOT_SDK_LINUX_X86_32}/bin:${BASE_PATH}"
+  export PATH="${GODOT_SDK_LINUX_X86_64}/bin:${BASE_PATH}"
 
-$SCONS platform=x11 bits=32 $OPTIONS tools=yes target=release_debug
-$STRIP bin/godot.x11.*
-mkdir -p /root/out/x86_32/tools
-cp -rvp bin/* /root/out/x86_32/tools
-rm -rf bin
+  $SCONS platform=linuxbsd arch=x86_64 $OPTIONS target=editor
+  mkdir -p /root/out/x86_64/tools
+  cp -rvp bin/* /root/out/x86_64/tools
+  rm -rf bin
 
-$SCONS platform=x11 bits=32 $OPTIONS tools=no target=release_debug
-$SCONS platform=x11 bits=32 $OPTIONS tools=no target=release
-$STRIP bin/godot.x11.*
-mkdir -p /root/out/x86_32/templates
-cp -rvp bin/* /root/out/x86_32/templates
-rm -rf bin
+  $SCONS platform=linuxbsd arch=x86_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_64}/bin:${BASE_PATH}"
+  export PATH="${GODOT_SDK_LINUX_X86}/bin:${BASE_PATH}"
 
-$SCONS platform=server bits=64 $OPTIONS tools=yes target=release_debug
-mkdir -p /root/out/x86_64/server
-cp -rvp bin/* /root/out/x86_64/server
-rm -rf bin
+  $SCONS platform=linuxbsd arch=x86_32 $OPTIONS target=editor
+  mkdir -p /root/out/x86_32/tools
+  cp -rvp bin/* /root/out/x86_32/tools
+  rm -rf bin
 
-export PATH="${BASE_PATH}"
+  $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
+fi
+
+# Mono
+
+if [ "${MONO}" == "1" ]; then
+  echo "Starting Mono build for Linux..."
+
+  cp -r /root/mono-glue/GodotSharp/GodotSharp/Generated modules/mono/glue/GodotSharp/GodotSharp/
+  cp -r /root/mono-glue/GodotSharp/GodotSharpEditor/Generated modules/mono/glue/GodotSharp/GodotSharpEditor/
+
+  export PATH="${GODOT_SDK_LINUX_X86_64}/bin:${BASE_PATH}"
+
+  $SCONS platform=linuxbsd arch=x86_64 $OPTIONS $OPTIONS_MONO target=editor
+  ./modules/mono/build_scripts/build_assemblies.py --godot-output-dir=./bin --godot-platform=linuxbsd
+  mkdir -p /root/out/x86_64/tools-mono
+  cp -rvp bin/* /root/out/x86_64/tools-mono
+  rm -rf bin
+
+  $SCONS platform=linuxbsd arch=x86_64 $OPTIONS $OPTIONS_MONO target=template_debug
+  $SCONS platform=linuxbsd arch=x86_64 $OPTIONS $OPTIONS_MONO target=template_release
+  mkdir -p /root/out/x86_64/templates-mono
+  cp -rvp bin/* /root/out/x86_64/templates-mono
+  rm -rf bin
+
+  export PATH="${GODOT_SDK_LINUX_X86}/bin:${BASE_PATH}"
+
+  $SCONS platform=linuxbsd arch=x86_32 $OPTIONS $OPTIONS_MONO target=editor
+  ./modules/mono/build_scripts/build_assemblies.py --godot-output-dir=./bin --godot-platform=linuxbsd
+  mkdir -p /root/out/x86_32/tools-mono
+  cp -rvp bin/* /root/out/x86_32/tools-mono
+  rm -rf bin
+
+  $SCONS platform=linuxbsd arch=x86_32 $OPTIONS $OPTIONS_MONO target=template_debug
+  $SCONS platform=linuxbsd arch=x86_32 $OPTIONS $OPTIONS_MONO target=template_release
+  mkdir -p /root/out/x86_32/templates-mono
+  cp -rvp bin/* /root/out/x86_32/templates-mono
+  rm -rf bin
+fi
 
 echo "Linux build successful"

build-macos/build.sh

@@ -5,27 +5,76 @@ set -e
 # Config
 
 export SCONS="scons -j${NUM_CORES} verbose=yes warnings=no progress=no"
-export OPTIONS="osxcross_sdk=darwin24.5"
-export STRIP="x86_64-apple-darwin24.5-strip"
+export OPTIONS="osxcross_sdk=darwin22 production=yes use_volk=no vulkan_sdk_path=/root/vulkansdk"
+export OPTIONS_MONO="module_mono_enabled=yes"
+export STRIP="x86_64-apple-darwin22-strip -u -r"
+export TERM=xterm
 
 rm -rf godot
 mkdir godot
 cd godot
 tar xf /root/godot.tar.gz --strip-components=1
 
-echo "Starting classical build for macOS..."
+# Classical
 
-$SCONS platform=osx $OPTIONS bits=64 tools=yes target=release_debug
-$STRIP bin/godot.osx.*
-mkdir -p /root/out/tools
-cp -rvp bin/* /root/out/tools
-rm -rf bin
+dnf -y install gettext
 
-$SCONS platform=osx $OPTIONS bits=64 tools=no target=release_debug
-$SCONS platform=osx $OPTIONS bits=64 tools=no target=release
-$STRIP bin/godot.osx.*
-mkdir -p /root/out/templates
-cp -rvp bin/* /root/out/templates
-rm -rf bin
+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
+  $STRIP 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
+  $STRIP 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
+  $STRIP 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
+  $STRIP 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
+  $STRIP 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
+  $STRIP 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"

build-mono-glue/build.sh

@@ -0,0 +1,39 @@
+#!/bin/bash
+
+set -e
+
+# Config
+
+export SCONS="scons -j${NUM_CORES} verbose=yes warnings=no progress=no"
+export OPTIONS="debug_symbols=no use_static_cpp=no"
+export TERM=xterm
+export DISPLAY=:0
+export PATH="${GODOT_SDK_LINUX_X86_64}/bin:${BASE_PATH}"
+
+rm -rf godot
+mkdir godot
+cd godot
+tar xf ../godot.tar.gz --strip-components=1
+
+# pkg-config wrongly points to lib instead of lib64 for arch-dependent header.
+sed -i ${GODOT_SDK_LINUX_X86_64}/x86_64-godot-linux-gnu/sysroot/usr/lib/pkgconfig/dbus-1.pc -e "s@/lib@/lib64@g"
+
+# Temporarily until we make --headless mode actually skip X11.
+dnf install -y libX11 libXcursor libXrandr libXinerama libXi mesa-libGL
+dnf -y install gettext
+
+# Mono
+
+if [ "${MONO}" == "1" ]; then
+  echo "Building and generating Mono glue..."
+
+  dotnet --info
+  export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/usr/lib/pkgconfig/
+
+  ${SCONS} platform=linuxbsd ${OPTIONS} target=editor module_mono_enabled=yes
+
+  rm -rf /root/mono-glue/*
+  bin/godot.linuxbsd.editor.x86_64.mono --headless --generate-mono-glue /root/mono-glue
+fi
+
+echo "Mono glue generated successfully"

build-release.sh

@@ -1,10 +1,6 @@
 #!/bin/bash
 
 set -e
-export basedir=$(pwd)
-
-# Log output to a file automatically.
-exec > >(tee -a "out/logs/build-release") 2>&1
 
 # Config
 
@@ -12,17 +8,17 @@ exec > >(tee -a "out/logs/build-release") 2>&1
 source ./config.sh
 
 can_sign_windows=0
-if [ ! -z "${WINDOWS_SIGN_NAME}" ] && [ ! -z "${WINDOWS_SIGN_URL}" ] && [[ $(type -P "osslsigncode") ]]; then
+if [ ! -z "${SIGN_KEYSTORE}" ] && [ ! -z "${SIGN_PASSWORD}" ] && [[ $(type -P "osslsigncode") ]]; then
   can_sign_windows=1
 else
-  echo "Disabling Windows binary signing as config.sh does not define the required data (WINDOWS_SIGN_NAME, WINDOWS_SIGN_URL), or osslsigncode can't be found in PATH."
+  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
 
 sign_windows() {
   if [ $can_sign_windows == 0 ]; then
     return
   fi
-  P11_KIT_SERVER_ADDRESS=unix:path=/run/p11-kit/p11kit.sock osslsigncode sign -pkcs11module /usr/lib64/pkcs11/p11-kit-client.so -pkcs11cert 'pkcs11:model=SimplySign%20C' -key 'pkcs11:model=SimplySign%20C' -t http://time.certum.pl/ -n "${WINDOWS_SIGN_NAME}" -i "${WINDOWS_SIGN_URL}" -in $1 -out $1-signed
+  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
 }
 
@@ -33,14 +29,22 @@ sign_macos() {
   _macos_tmpdir=$(ssh "${OSX_HOST}" "mktemp -d")
   _reldir="$1"
   _binname="$2"
-  _appname="Godot.app"
+  _is_mono="$3"
+
+  if [[ "${_is_mono}" == "1" ]]; then
+    _appname="Godot_mono.app"
+    _sharpdir="${_appname}/Contents/Resources/GodotSharp"
+  else
+    _appname="Godot.app"
+  fi
 
   scp "${_reldir}/${_binname}.zip" "${OSX_HOST}:${_macos_tmpdir}"
+  scp "${basedir}/git/misc/dist/macos/editor.entitlements" "${OSX_HOST}:${_macos_tmpdir}"
   ssh "${OSX_HOST}" "
             cd ${_macos_tmpdir} && \
             unzip ${_binname}.zip && \
             codesign --force --timestamp \
-              --options=runtime \
+              --options=runtime --entitlements editor.entitlements \
               -s ${OSX_KEY_ID} -v ${_appname} && \
             zip -r ${_binname}_signed.zip ${_appname}"
 
@@ -68,25 +72,44 @@ sign_macos_template() {
   fi
   _macos_tmpdir=$(ssh "${OSX_HOST}" "mktemp -d")
   _reldir="$1"
+  _is_mono="$2"
 
-  scp "${_reldir}/osx.zip" "${OSX_HOST}:${_macos_tmpdir}"
+  scp "${_reldir}/macos.zip" "${OSX_HOST}:${_macos_tmpdir}"
   ssh "${OSX_HOST}" "
             cd ${_macos_tmpdir} && \
-            unzip osx.zip && \
+            unzip macos.zip && \
             codesign --force -s - \
               --options=linker-signed \
-              -v 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}:${_macos_tmpdir}/osx_signed.zip" "${_reldir}/osx.zip"
+  scp "${OSX_HOST}:${_macos_tmpdir}/macos_signed.zip" "${_reldir}/macos.zip"
   ssh "${OSX_HOST}" "rm -rf ${_macos_tmpdir}"
 }
 
+can_publish_nuget=0
+if [ ! -z "${NUGET_SOURCE}" ] && [ ! -z "${NUGET_API_KEY}" ] && [[ $(type -P "dotnet") ]]; then
+  can_publish_nuget=1
+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
+
+publish_nuget_packages() {
+  if [ $can_publish_nuget == 0 ]; then
+    return
+  fi
+  for pkg in "$@"; do
+    dotnet nuget push $pkg --source "${NUGET_SOURCE}" --api-key "${NUGET_API_KEY}" --skip-duplicate
+  done
+}
+
 godot_version=""
 templates_version=""
 do_cleanup=1
 make_tarball=1
 build_classical=1
+build_mono=1
+publish_nuget=0
 
 while getopts "h?v:t:b:n-:" opt; do
   case "$opt" in
@@ -95,7 +118,8 @@ while getopts "h?v:t:b:n-:" opt; do
     echo
     echo "  -v godot version (e.g: 3.2-stable) [mandatory]"
     echo "  -t templates version (e.g. 3.2.stable) [mandatory]"
-    echo "  -b build target: classical|none (default: classical)"
+    echo "  -b build target: all|classical|mono|none (default: all)"
+    echo "  -n publish nuget packages (default: false)"
     echo "  --no-cleanup disable deleting pre-existing output folders (default: false)"
     echo "  --no-tarball disable generating source tarball (default: false)"
     echo
@@ -109,11 +133,17 @@ while getopts "h?v:t:b:n-:" opt; do
     ;;
   b)
     if [ "$OPTARG" == "classical" ]; then
-      build_classical=1
+      build_mono=0
+    elif [ "$OPTARG" == "mono" ]; then
+      build_classical=0
     elif [ "$OPTARG" == "none" ]; then
       build_classical=0
+      build_mono=0
     fi
     ;;
+  n)
+    publish_nuget=1
+    ;;
   -)
     case "${OPTARG}" in
     no-cleanup)
@@ -141,9 +171,13 @@ 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 godot_basename="Godot_v${godot_version}"
 
@@ -151,11 +185,15 @@ export godot_basename="Godot_v${godot_version}"
 
 if [ "${do_cleanup}" == "1" ]; then
 
+  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}
 
 fi
 
@@ -177,95 +215,168 @@ if [ "${build_classical}" == "1" ]; then
   ## Linux (Classical) ##
 
   # Editor
-  binname="${godot_basename}_x11.64"
-  cp out/linux/x86_64/tools/godot.x11.opt.tools.64 ${binname}
+  binname="${godot_basename}_linux.x86_64"
+  cp out/linux/x86_64/tools/godot.linuxbsd.editor.x86_64 ${binname}
+  strip ${binname}
   zip -q -9 "${reldir}/${binname}.zip" ${binname}
   rm ${binname}
 
-  binname="${godot_basename}_x11.32"
-  cp out/linux/x86_32/tools/godot.x11.opt.tools.32 ${binname}
+  binname="${godot_basename}_linux.x86_32"
+  cp out/linux/x86_32/tools/godot.linuxbsd.editor.x86_32 ${binname}
+  strip ${binname}
   zip -q -9 "${reldir}/${binname}.zip" ${binname}
   rm ${binname}
 
   # Templates
-  cp out/linux/x86_64/templates/godot.x11.opt.64 ${templatesdir}/linux_x11_64_release
-  cp out/linux/x86_64/templates/godot.x11.opt.debug.64 ${templatesdir}/linux_x11_64_debug
-  cp out/linux/x86_32/templates/godot.x11.opt.32 ${templatesdir}/linux_x11_32_release
-  cp out/linux/x86_32/templates/godot.x11.opt.debug.32 ${templatesdir}/linux_x11_32_debug
+  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
+  strip ${templatesdir}/linux*
 
   ## Windows (Classical) ##
 
   # Editor
   binname="${godot_basename}_win64.exe"
-  cp out/windows/x86_64/tools/godot.windows.opt.tools.64.exe ${binname}
+  wrpname="${godot_basename}_win64_console.exe"
+  cp out/windows/x86_64/tools/godot.windows.editor.x86_64.exe ${binname}
+  strip ${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}
+  strip ${wrpname}
+  sign_windows ${wrpname}
+  zip -q -9 "${reldir}/${binname}.zip" ${binname} ${wrpname}
+  rm ${binname} ${wrpname}
 
   binname="${godot_basename}_win32.exe"
-  cp out/windows/x86_32/tools/godot.windows.opt.tools.32.exe ${binname}
+  wrpname="${godot_basename}_win32_console.exe"
+  cp out/windows/x86_32/tools/godot.windows.editor.x86_32.exe ${binname}
+  strip ${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}
+  strip ${wrpname}
+  sign_windows ${wrpname}
+  zip -q -9 "${reldir}/${binname}.zip" ${binname} ${wrpname}
+  rm ${binname} ${wrpname}
 
   # Templates
-  cp out/windows/x86_64/templates/godot.windows.opt.64.exe ${templatesdir}/windows_64_release.exe
-  cp out/windows/x86_64/templates/godot.windows.opt.debug.64.exe ${templatesdir}/windows_64_debug.exe
-  cp out/windows/x86_32/templates/godot.windows.opt.32.exe ${templatesdir}/windows_32_release.exe
-  cp out/windows/x86_32/templates/godot.windows.opt.debug.32.exe ${templatesdir}/windows_32_debug.exe
+  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/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
+  strip ${templatesdir}/windows*.exe
 
   ## macOS (Classical) ##
 
   # Editor
-  binname="${godot_basename}_osx.64"
+  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/macos/tools/godot.osx.opt.tools.64 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}
+  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/macos/templates/godot.osx.opt.64 osx_template.app/Contents/MacOS/godot_osx_release.64
-  cp out/macos/templates/godot.osx.opt.debug.64 osx_template.app/Contents/MacOS/godot_osx_debug.64
-  chmod +x osx_template.app/Contents/MacOS/godot_osx*
-  zip -q -9 -r "${templatesdir}/osx.zip" osx_template.app
-  rm -rf osx_template.app
-  sign_macos_template ${templatesdir}
+  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
 
   ## Web (Classical) ##
 
-  cp git/misc/dist/html/default.html godot.html
-  cp out/web/templates/godot.javascript.opt.asm.js godot.asm.js
-  cp out/web/templates/godot.javascript.opt.js godot.js
-  cp out/web/templates/godot.javascript.opt.html.mem godot.mem
-  zip -q -9 ${templatesdir}/javascript_release.zip godot.{html,asm.js,js,mem}
-  cp out/web/templates/godot.javascript.opt.debug.asm.js godot.asm.js
-  cp out/web/templates/godot.javascript.opt.debug.js godot.js
-  cp out/web/templates/godot.javascript.opt.debug.html.mem godot.mem
-  zip -q -9 ${templatesdir}/javascript_debug.zip godot.{html,asm.js,js,mem}
-  rm -f godot.{html,asm.js,js,mem}
+  # Editor
+  unzip out/web/tools/godot.web.editor.wasm32.zip -d ${webdir}/
+  brotli --keep --force --quality=11 ${webdir}/*
+  binname="${godot_basename}_web_editor.zip"
+  cp out/web/tools/godot.web.editor.wasm32.zip ${reldir}/${binname}
+
+  # Templates
+  cp out/web/templates/godot.web.template_release.wasm32.zip ${templatesdir}/web_release.zip
+  cp out/web/templates/godot.web.template_debug.wasm32.zip ${templatesdir}/web_debug.zip
+
+  cp out/web/templates/godot.web.template_release.wasm32.dlink.zip ${templatesdir}/web_dlink_release.zip
+  cp out/web/templates/godot.web.template_debug.wasm32.dlink.zip ${templatesdir}/web_dlink_debug.zip
 
   ## Android (Classical) ##
 
+  # Lib for direct download
+  cp out/android/templates/godot-lib.template_release.aar ${reldir}/godot-lib.${templates_version}.template_release.aar
+
+  # Editor
+  binname="${godot_basename}_android_editor.apk"
+  cp out/android/tools/android_editor.apk ${reldir}/${binname}
+  binname="${godot_basename}_android_editor.aab"
+  cp out/android/tools/android_editor.aab ${reldir}/${binname}
+
+  # Templates
   cp out/android/templates/*.apk ${templatesdir}/
+  cp out/android/templates/android_source.zip ${templatesdir}/
 
   ## iOS (Classical) ##
 
   rm -rf ios_xcode
   cp -r git/misc/dist/ios_xcode ios_xcode
-  cp out/ios/templates/godot.iphone.opt.arm64 ios_xcode/godot_opt.iphone
-  cp out/ios/templates/godot.iphone.opt.debug.arm64 ios_xcode/godot_debug.iphone
-  chmod +x ios_xcode/godot*.iphone
-  zip -q -9 -r "${templatesdir}/GodotiOSXCode.zip" ios_xcode
+  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/vulkansdk-macos/MoltenVK/MoltenVK.xcframework ios_xcode/
+  rm -rf ios_xcode/MoltenVK.xcframework/{macos,tvos}*
+  cd ios_xcode
+  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.template_release.32.arm.exe uwp_template_ARM/godot.uwp.exe
+#  cp out/uwp/arm/godot.uwp.template_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.template_release.32.x86.exe uwp_template_Win32/godot.uwp.exe
+#  cp out/uwp/x86/godot.uwp.template_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.template_release.64.x64.exe uwp_template_x64/godot.uwp.exe
+#  cp out/uwp/x64/godot.uwp.template_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
@@ -283,4 +394,161 @@ if [ "${build_classical}" == "1" ]; then
 
 fi
 
+# Mono
+
+if [ "${build_mono}" == "1" ]; then
+
+  ## Linux (Mono) ##
+
+  # Editor
+  binbasename="${godot_basename}_mono_linux"
+  mkdir -p ${binbasename}_x86_64
+  cp out/linux/x86_64/tools-mono/godot.linuxbsd.editor.x86_64.mono ${binbasename}_x86_64/${binbasename}.x86_64
+  strip ${binbasename}_x86_64/${binbasename}.x86_64
+  cp -rp out/linux/x86_64/tools-mono/GodotSharp ${binbasename}_x86_64/
+  zip -r -q -9 "${reldir_mono}/${binbasename}_x86_64.zip" ${binbasename}_x86_64
+  rm -rf ${binbasename}_x86_64
+
+  binbasename="${godot_basename}_mono_linux"
+  mkdir -p ${binbasename}_x86_32
+  cp out/linux/x86_32/tools-mono/godot.linuxbsd.editor.x86_32.mono ${binbasename}_x86_32/${binbasename}.x86_32
+  strip ${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
+
+  # Templates
+  cp out/linux/x86_64/templates-mono/godot.linuxbsd.template_debug.x86_64.mono ${templatesdir_mono}/linux_debug.x86_64
+  cp out/linux/x86_64/templates-mono/godot.linuxbsd.template_release.x86_64.mono ${templatesdir_mono}/linux_release.x86_64
+  cp out/linux/x86_32/templates-mono/godot.linuxbsd.template_debug.x86_32.mono ${templatesdir_mono}/linux_debug.x86_32
+  cp out/linux/x86_32/templates-mono/godot.linuxbsd.template_release.x86_32.mono ${templatesdir_mono}/linux_release.x86_32
+  strip ${templatesdir_mono}/linux*
+
+  ## Windows (Mono) ##
+
+  # Editor
+  binname="${godot_basename}_mono_win64"
+  wrpname="${godot_basename}_mono_win64_console"
+  mkdir -p ${binname}
+  cp out/windows/x86_64/tools-mono/godot.windows.editor.x86_64.mono.exe ${binname}/${binname}.exe
+  strip ${binname}/${binname}.exe
+  sign_windows ${binname}/${binname}.exe
+  cp -rp out/windows/x86_64/tools-mono/GodotSharp ${binname}/
+  cp out/windows/x86_64/tools-mono/godot.windows.editor.x86_64.mono.console.exe ${binname}/${wrpname}.exe
+  strip ${binname}/${wrpname}.exe
+  sign_windows ${binname}/${wrpname}.exe
+  zip -r -q -9 "${reldir_mono}/${binname}.zip" ${binname}
+  rm -rf ${binname}
+
+  binname="${godot_basename}_mono_win32"
+  wrpname="${godot_basename}_mono_win32_console"
+  mkdir -p ${binname}
+  cp out/windows/x86_32/tools-mono/godot.windows.editor.x86_32.mono.exe ${binname}/${binname}.exe
+  strip ${binname}/${binname}.exe
+  sign_windows ${binname}/${binname}.exe
+  cp -rp out/windows/x86_32/tools-mono/GodotSharp ${binname}/
+  cp out/windows/x86_32/tools-mono/godot.windows.editor.x86_32.mono.console.exe ${binname}/${wrpname}.exe
+  strip ${binname}/${wrpname}.exe
+  sign_windows ${binname}/${wrpname}.exe
+  zip -r -q -9 "${reldir_mono}/${binname}.zip" ${binname}
+  rm -rf ${binname}
+
+  # Templates
+  cp out/windows/x86_64/templates-mono/godot.windows.template_debug.x86_64.mono.exe ${templatesdir_mono}/windows_debug_x86_64.exe
+  cp out/windows/x86_64/templates-mono/godot.windows.template_release.x86_64.mono.exe ${templatesdir_mono}/windows_release_x86_64.exe
+  cp out/windows/x86_32/templates-mono/godot.windows.template_debug.x86_32.mono.exe ${templatesdir_mono}/windows_debug_x86_32.exe
+  cp out/windows/x86_32/templates-mono/godot.windows.template_release.x86_32.mono.exe ${templatesdir_mono}/windows_release_x86_32.exe
+  cp out/windows/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
+  strip ${templatesdir_mono}/windows*.exe
+
+  ## macOS (Mono) ##
+
+  # Editor
+  binname="${godot_basename}_mono_macos.universal"
+  rm -rf Godot_mono.app
+  cp -r git/misc/dist/macos_tools.app Godot_mono.app
+  mkdir -p Godot_mono.app/Contents/{MacOS,Resources}
+  cp out/macos/tools-mono/godot.macos.editor.universal.mono Godot_mono.app/Contents/MacOS/Godot
+  cp -rp out/macos/tools-mono/GodotSharp Godot_mono.app/Contents/Resources/GodotSharp
+  chmod +x Godot_mono.app/Contents/MacOS/Godot
+  zip -q -9 -r "${reldir_mono}/${binname}.zip" Godot_mono.app
+  rm -rf Godot_mono.app
+  sign_macos ${reldir_mono} ${binname} 1
+
+  # Templates
+  rm -rf macos_template.app
+  cp -r git/misc/dist/macos_template.app .
+  mkdir -p macos_template.app/Contents/{MacOS,Resources}
+  cp out/macos/templates-mono/godot.macos.template_debug.universal.mono macos_template.app/Contents/MacOS/godot_macos_debug.universal
+  cp out/macos/templates-mono/godot.macos.template_release.universal.mono macos_template.app/Contents/MacOS/godot_macos_release.universal
+  chmod +x macos_template.app/Contents/MacOS/godot_macos*
+  zip -q -9 -r "${templatesdir_mono}/macos.zip" macos_template.app
+  rm -rf macos_template.app
+  sign_macos_template ${templatesdir_mono} 1
+
+  # No .NET support for those platforms yet.
+
+  if false; then
+
+  ## Web (Mono) ##
+
+  # Templates
+  cp out/web/templates-mono/godot.web.template_debug.wasm32.mono.zip ${templatesdir_mono}/web_debug.zip
+  cp out/web/templates-mono/godot.web.template_release.wasm32.mono.zip ${templatesdir_mono}/web_release.zip
+
+  ## Android (Mono) ##
+
+  # Lib for direct download
+  cp out/android/templates-mono/godot-lib.template_release.aar ${reldir_mono}/godot-lib.${templates_version}.mono.template_release.aar
+
+  # Templates
+  cp out/android/templates-mono/*.apk ${templatesdir_mono}/
+  cp out/android/templates-mono/android_source.zip ${templatesdir_mono}/
+
+  ## iOS (Mono) ##
+
+  rm -rf ios_xcode
+  cp -r git/misc/dist/ios_xcode ios_xcode
+  cp out/ios/templates-mono/libgodot.ios.simulator.a ios_xcode/libgodot.ios.release.xcframework/ios-arm64_x86_64-simulator/libgodot.a
+  cp out/ios/templates-mono/libgodot.ios.debug.simulator.a ios_xcode/libgodot.ios.debug.xcframework/ios-arm64_x86_64-simulator/libgodot.a
+  cp out/ios/templates-mono/libgodot.ios.a ios_xcode/libgodot.ios.release.xcframework/ios-arm64/libgodot.a
+  cp out/ios/templates-mono/libgodot.ios.debug.a ios_xcode/libgodot.ios.debug.xcframework/ios-arm64/libgodot.a
+  cp -r deps/vulkansdk-macos/MoltenVK/MoltenVK.xcframework ios_xcode/
+  rm -rf ios_xcode/MoltenVK.xcframework/{macos,tvos}*
+  cd ios_xcode
+  zip -q -9 -r "${templatesdir_mono}/ios.zip" *
+  cd ..
+  rm -rf ios_xcode
+
+  fi
+
+  ## Templates TPZ (Mono) ##
+
+  echo "${templates_version}.mono" > ${templatesdir_mono}/version.txt
+  pushd ${templatesdir_mono}/..
+  zip -q -9 -r -D "${reldir_mono}/${godot_basename}_mono_export_templates.tpz" templates/*
+  popd
+
+  ## SHA-512 sums (Mono) ##
+
+  pushd ${reldir_mono}
+  sha512sum [Gg]* >> SHA512-SUMS.txt
+  mkdir -p ${basedir}/sha512sums/${godot_version}/mono
+  cp SHA512-SUMS.txt ${basedir}/sha512sums/${godot_version}/mono/
+  popd
+
+fi
+
+# NuGet packages
+
+if [ "${publish_nuget}" == "1" ]; then
+
+  echo "Publishing NuGet packages..."
+  publish_nuget_packages out/linux/x86_64/tools-mono/GodotSharp/Tools/nupkgs/*.nupkg
+
+fi
+
 echo "All editor binaries and templates prepared successfully for release"

build-uwp/build.bat

@@ -0,0 +1,3 @@
+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\""

build-uwp/build.sh

@@ -0,0 +1,43 @@
+#!/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"

build-uwp/env-arm.bat

@@ -0,0 +1,36 @@
+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\

build-uwp/env-x64.bat

@@ -0,0 +1,35 @@
+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\

build-uwp/env-x86.bat

@@ -0,0 +1,36 @@
+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\
+

build-web/build.sh

@@ -4,23 +4,72 @@ set -e
 
 # Config
 
-export SCONS="scons -j${NUM_CORES} verbose=yes warnings=no progress=no"
-export OPTIONS=""
+# 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=editor use_closure_compiler=yes"
+  "target=template_debug"
+  "target=template_release"
+  "target=template_debug dlink_enabled=yes"
+  "target=template_release dlink_enabled=yes"
+)
+
+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
-export EMSCRIPTEN_ROOT=/root/emsdk/fastcomp/emscripten
 
 rm -rf godot
 mkdir godot
 cd godot
 tar xf /root/godot.tar.gz --strip-components=1
 
-echo "Starting classical build for Web..."
+# Classical
 
-$SCONS platform=javascript ${OPTIONS} tools=no target=release_debug
-$SCONS platform=javascript ${OPTIONS} tools=no target=release
+dnf -y install gettext
 
-mkdir -p /root/out/templates
-cp -rvp bin/* /root/out/templates
+if [ "${CLASSICAL}" == "1" ]; then
+  echo "Starting classical build for Web..."
+
+  for i in {0..4}; 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
+
+  for pid in ${pids[*]}; do
+    wait $pid
+  done
+
+  mkdir -p /root/out/tools
+  cp -rvp /root/godot0/bin/*.editor*.zip /root/out/tools
+
+  mkdir -p /root/out/templates
+  for i in {1..4}; do
+    cp -rvp /root/godot$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"

build-windows/build.sh

@@ -5,40 +5,76 @@ set -e
 # Config
 
 export SCONS="scons -j${NUM_CORES} verbose=yes warnings=no progress=no"
-export OPTIONS=""
-export STRIP="x86_64-w64-mingw32-strip"
+export OPTIONS="production=yes"
+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
 
-echo "Starting classical build for Windows..."
+# Classical
 
-$SCONS platform=windows bits=64 $OPTIONS tools=yes target=release_debug
-$STRIP bin/godot.windows.*
-mkdir -p /root/out/x86_64/tools
-cp -rvp bin/* /root/out/x86_64/tools
-rm -rf bin
+dnf -y install gettext
 
-$SCONS platform=windows bits=64 $OPTIONS tools=no target=release_debug
-$SCONS platform=windows bits=64 $OPTIONS tools=no target=release
-$STRIP bin/godot.windows.*
-mkdir -p /root/out/x86_64/templates
-cp -rvp bin/* /root/out/x86_64/templates
-rm -rf bin
+if [ "${CLASSICAL}" == "1" ]; then
+  echo "Starting classical build for Windows..."
 
-$SCONS platform=windows bits=32 $OPTIONS tools=yes target=release_debug
-$STRIP bin/godot.windows.*
-mkdir -p /root/out/x86_32/tools
-cp -rvp bin/* /root/out/x86_32/tools
-rm -rf bin
+  $SCONS platform=windows arch=x86_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=32 $OPTIONS tools=no target=release_debug
-$SCONS platform=windows bits=32 $OPTIONS tools=no target=release
-$STRIP bin/godot.windows.*
-mkdir -p /root/out/x86_32/templates
-cp -rvp bin/* /root/out/x86_32/templates
-rm -rf bin
+  $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 arch=x86_32 $OPTIONS target=editor
+  mkdir -p /root/out/x86_32/tools
+  cp -rvp bin/* /root/out/x86_32/tools
+  rm -rf bin
+
+  $SCONS platform=windows arch=x86_32 $OPTIONS target=template_debug
+  $SCONS platform=windows arch=x86_32 $OPTIONS target=template_release
+  mkdir -p /root/out/x86_32/templates
+  cp -rvp bin/* /root/out/x86_32/templates
+  rm -rf bin
+fi
+
+# Mono
+
+if [ "${MONO}" == "1" ]; then
+  echo "Starting Mono build for Windows..."
+
+  cp -r /root/mono-glue/GodotSharp/GodotSharp/Generated modules/mono/glue/GodotSharp/GodotSharp/
+  cp -r /root/mono-glue/GodotSharp/GodotSharpEditor/Generated modules/mono/glue/GodotSharp/GodotSharpEditor/
+
+  $SCONS platform=windows arch=x86_64 $OPTIONS $OPTIONS_MONO target=editor
+  ./modules/mono/build_scripts/build_assemblies.py --godot-output-dir=./bin --godot-platform=windows
+  mkdir -p /root/out/x86_64/tools-mono
+  cp -rvp bin/* /root/out/x86_64/tools-mono
+  rm -rf bin
+
+  $SCONS platform=windows arch=x86_64 $OPTIONS $OPTIONS_MONO target=template_debug
+  $SCONS platform=windows arch=x86_64 $OPTIONS $OPTIONS_MONO target=template_release
+  mkdir -p /root/out/x86_64/templates-mono
+  cp -rvp bin/* /root/out/x86_64/templates-mono
+  rm -rf bin
+
+  $SCONS platform=windows arch=x86_32 $OPTIONS $OPTIONS_MONO target=editor
+  ./modules/mono/build_scripts/build_assemblies.py --godot-output-dir=./bin --godot-platform=windows
+  mkdir -p /root/out/x86_32/tools-mono
+  cp -rvp bin/* /root/out/x86_32/tools-mono
+  rm -rf bin
+
+  $SCONS platform=windows arch=x86_32 $OPTIONS $OPTIONS_MONO target=template_debug
+  $SCONS platform=windows arch=x86_32 $OPTIONS $OPTIONS_MONO target=template_release
+  mkdir -p /root/out/x86_32/templates-mono
+  cp -rvp bin/* /root/out/x86_32/templates-mono
+  rm -rf bin
+fi
 
 echo "Windows build successful"

build.sh

@@ -4,15 +4,9 @@ set -e
 
 OPTIND=1
 
-export basedir="$(pwd)"
-mkdir -p ${basedir}/out
-mkdir -p ${basedir}/out/logs
-
-# Log output to a file automatically.
-exec > >(tee -a "out/logs/build") 2>&1
-
 # Config
 
+# For default registry and number of cores.
 if [ ! -e config.sh ]; then
   echo "No config.sh, copying default values from config.sh.in."
   cp config.sh.in config.sh
@@ -27,33 +21,62 @@ if [ -z "${NUM_CORES}" ]; then
   export NUM_CORES=16
 fi
 
+registry="${REGISTRY}"
+username=""
+password=""
 godot_version=""
 git_treeish="master"
 build_classical=1
+build_mono=1
 force_download=0
+skip_download=1
 skip_git_checkout=0
 
-while getopts "h?v:g:fc" opt; do
+while getopts "h?r:u:p:v:g:b:fsc" opt; do
   case "$opt" in
   h|\?)
     echo "Usage: $0 [OPTIONS...]"
     echo
-    echo "  -v godot version (e.g. 2.1.7-stable) [mandatory]"
+    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
     ;;
@@ -62,6 +85,10 @@ done
 
 export podman=${PODMAN}
 
+if [ $UID != 0 ]; then
+  echo "WARNING: Running as non-root may cause problems for the uwp build"
+fi
+
 if [ -z "${godot_version}" ]; then
   echo "-v <version> is mandatory!"
   exit 1
@@ -77,6 +104,54 @@ case "$choice" in
 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
+  fi
+fi
+
+if [ $skip_download == 0 ]; then
+  echo "Fetching images"
+  for image in windows linux web; do
+    if [ ${force_download} == 1 ] || ! ${podman} image exists godot/$image; then
+      if ! ${podman} pull ${registry}/godot/${image}; then
+        echo "ERROR: image $image does not exist and can't be downloaded"
+        exit 1
+      fi
+    fi
+  done
+
+  if [ ! -z "${logged_in}" ]; then
+    echo "Fetching private images"
+
+    for image in macosx android ios uwp; do
+      if [ ${force_download} == 1 ] || ! ${podman} image exists godot-private/$image; then
+        if ! ${podman} pull ${registry}/godot-private/${image}; then
+          echo "ERROR: image $image does not exist and can't be downloaded"
+          exit 1
+        fi
+      fi
+    done
+  fi
+fi
+
+# macOS and iOS need the Vulkan SDK
+if [ ! -d "deps/vulkansdk-macos" ]; then
+  echo "Missing Vulkan SDK for macOS, we're going to run into issues!"
+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
@@ -100,15 +175,23 @@ EOF
     exit 1
   fi
 
-  sh ../make_tarball.sh -v ${godot_version} -g ${git_treeish}
+  sh misc/scripts/make_tarball.sh -v ${godot_version} -g ${git_treeish}
   popd
 fi
 
-export podman_run="${podman} run -it --rm --env BUILD_NAME=${BUILD_NAME} --env GODOT_VERSION_STATUS=${GODOT_VERSION_STATUS} --env NUM_CORES=${NUM_CORES} --env CLASSICAL=${build_classical} -v ${basedir}/godot-${godot_version}.tar.gz:/root/godot.tar.gz -w /root/"
+export basedir="$(pwd)"
+mkdir -p ${basedir}/out
+mkdir -p ${basedir}/out/logs
+mkdir -p ${basedir}/mono-glue
+
+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=$IMAGE_VERSION
 
+mkdir -p ${basedir}/mono-glue
+${podman_run} -v ${basedir}/build-mono-glue:/root/build localhost/godot-linux:${img_version} bash build/build.sh 2>&1 | tee ${basedir}/out/logs/mono-glue
+
 mkdir -p ${basedir}/out/windows
-${podman_run} -v ${basedir}/build-windows:/root/build -v ${basedir}/out/windows:/root/out --env STEAM=${build_steam} localhost/godot-windows:${img_version} bash build/build.sh 2>&1 | tee ${basedir}/out/logs/windows
+${podman_run} -v ${basedir}/build-windows:/root/build -v ${basedir}/out/windows:/root/out 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
@@ -117,20 +200,17 @@ mkdir -p ${basedir}/out/web
 ${podman_run} -v ${basedir}/build-web:/root/build -v ${basedir}/out/web:/root/out localhost/godot-web:${img_version} bash build/build.sh 2>&1 | tee ${basedir}/out/logs/web
 
 mkdir -p ${basedir}/out/macos
-${podman_run} -v ${basedir}/build-macos:/root/build -v ${basedir}/out/macos:/root/out localhost/godot-osx:${img_version} bash build/build.sh 2>&1 | tee ${basedir}/out/logs/macos
+${podman_run} -v ${basedir}/build-macos:/root/build -v ${basedir}/out/macos:/root/out -v ${basedir}/deps/vulkansdk-macos:/root/vulkansdk 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/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
 
-uid=$(id -un)
-gid=$(id -gn)
-if [ ! -z "$SUDO_UID" ]; then
-  uid="${SUDO_UID}"
-  gid="${SUDO_GID}"
-fi
-chown -R -f $uid:$gid ${basedir}/git ${basedir}/out ${basedir}/godot*.tar.gz
+#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
 
-echo "All builds completed. Check `out/logs/` to validate that they all succeeded (e.g. `tail -n 1 out/logs/*`)."
+if [ ! -z "$SUDO_UID" ]; then
+  chown -R "${SUDO_UID}":"${SUDO_GID}" ${basedir}/git ${basedir}/out ${basedir}/mono-glue ${basedir}/godot*.tar.gz
+fi

clean-release.sh

@@ -1,3 +1,2 @@
-#!/bin/bash
+rm -rf releases tmp web
 
-rm -rf releases steam tmp web

clean.sh

@@ -1,4 +1,2 @@
-#!/bin/bash
-
-rm -rf godot*.tar.gz mono-glue out releases steam tmp web
+rm -rf godot*.tar.gz mono-glue out releases tmp web
 git status

config.sh.in

@@ -12,22 +12,36 @@
 # relevant tool in your PATH or an absolute path to run it from.
 export PODMAN='podman'
 
+# Registry for build containers.
+# The default registry is the one used for official Godot builds.
+# Note that some of its images are private and only accessible to selected
+# contributors.
+# You can build your own registry with scripts at
+# https://github.com/godotengine/build-containers
+export REGISTRY='registry.prehensile-tales.com'
+
 # Version string of the images to use in build.sh.
-export IMAGE_VERSION='2.1-f43'
+export IMAGE_VERSION='4.x-f36'
 
 # Default build name used to distinguish between official and custom builds.
-export BUILD_REVISION='custom_build'
+export BUILD_NAME='custom_build'
 
 # Default number of parallel cores for each build.
 export NUM_CORES=16
 
-# Set up your own Windows signing details below.
+# Set up your own signing keystore and relevant details below.
 # If you do not fill all SIGN_* fields, signing will be skipped.
 
+# Path to pkcs12 archive.
+export SIGN_KEYSTORE=''
+
+# Password for the private key.
+export SIGN_PASSWORD=''
+
 # Name and URL of the signed application.
 # Use your own when making a thirdparty build.
-export WINDOWS_SIGN_NAME=''
-export WINDOWS_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'
@@ -40,3 +54,30 @@ export OSX_BUNDLE_ID=''
 export APPLE_TEAM=''
 export APPLE_ID=''
 export APPLE_ID_PASSWORD=''
+
+# NuGet source for publishing .NET packages
+export NUGET_SOURCE='nuget.org'
+# API key for publishing NuGet packages to nuget.org
+export NUGET_API_KEY=''
+
+# MavenCentral (sonatype) credentials
+export OSSRH_GROUP_ID=''
+export OSSRH_USERNAME=''
+export OSSRH_PASSWORD=''
+# Sonatype assigned ID used to upload the generated artifacts
+export SONATYPE_STAGING_PROFILE_ID=''
+# Used to sign the artifacts after they're built
+# ID of the GPG key pair, the last eight characters of its fingerprint
+export SIGNING_KEY_ID=''
+# Passphrase of the key pair
+export SIGNING_PASSWORD=''
+# Base64 encoded private GPG key
+export SIGNING_KEY=''
+
+# Android signing configs
+# Path to the Android keystore file used to sign the release build
+export GODOT_ANDROID_SIGN_KEYSTORE=''
+# Key alias used for signing the release build
+export GODOT_ANDROID_KEYSTORE_ALIAS=''
+# Password for the key used for signing the release build
+export GODOT_ANDROID_SIGN_PASSWORD=''

make_tarball.sh

@@ -1,66 +0,0 @@
-#!/bin/sh
-
-if [ ! -e "version.py" ]; then
-  echo "This script should be ran from the root folder of the Godot repository."
-  exit 1
-fi
-
-while getopts "h?sv:g:" opt; do
-  case "$opt" in
-  h|\?)
-    echo "Usage: $0 [OPTIONS...]"
-    echo
-    echo "  -s script friendly file name (godot.tar.gz)"
-    echo "  -v godot version for file name (e.g. 4.0-stable)"
-    echo "  -g git treeish to archive (e.g. master)"
-    echo
-    exit 1
-    ;;
-  s)
-    script_friendly_name=1
-    ;;
-  v)
-    godot_version=$OPTARG
-    ;;
-  g)
-    git_treeish=$OPTARG
-    ;;
-  esac
-done
-
-if [ ! -z "$git_treeish" ]; then
-  HEAD=$(git rev-parse $git_treeish)
-else
-  HEAD=$(git rev-parse HEAD)
-fi
-
-if [ ! -z "$script_friendly_name" ]; then
-  NAME=godot
-else
-  if [ ! -z "$godot_version" ]; then
-    NAME=godot-$godot_version
-  else
-    NAME=godot-$HEAD
-  fi
-fi
-
-CURDIR=$(pwd)
-TMPDIR=$(mktemp -d -t godot-XXXXXX)
-
-echo "Generating tarball for revision $HEAD with folder name '$NAME'."
-echo
-echo "The tarball will be written to the parent folder:"
-echo "    $(dirname $CURDIR)/$NAME.tar.gz"
-
-git archive $HEAD --prefix=$NAME/ -o $TMPDIR/$NAME.tar
-
-# Adding custom .git/HEAD to tarball so that we can generate VERSION_HASH.
-cd $TMPDIR
-mkdir -p $NAME/.git
-echo $HEAD > $NAME/.git/HEAD
-tar -uf $NAME.tar $NAME
-
-cd $CURDIR
-gzip -c $TMPDIR/$NAME.tar > ../$NAME.tar.gz
-
-rm -rf $TMPDIR

publish-release.sh

@@ -1,114 +0,0 @@
-#!/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=""
-skip_stable=0
-draft_arg=""
-
-while getopts "h?v:sd" opt; do
-  case "$opt" in
-  h|\?)
-    echo "Usage: $0 [OPTIONS...]"
-    echo
-    echo "  -v godot version (e.g: 3.2-stable) [mandatory]"
-    echo "  -s don't run stable specific steps"
-    echo "  -d publish as draft release on GitHub"
-    echo
-    exit 1
-    ;;
-  v)
-    godot_version=$OPTARG
-    ;;
-  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
-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]*
-  # Concatenate SHA sums.
-  cp ${reldir}/SHA512-SUMS.txt .
-  gh release upload ${godot_version} SHA512-SUMS.txt
-  rm SHA512-SUMS.txt
-  popd
-
-  echo "All stable release upload steps done."
-fi
-
-echo "All publishing steps done. Check out/logs/publish-release to double check that all steps succeeded."