From 8800450e95a039f11340cd5f463c9b79eb8dc376 Mon Sep 17 00:00:00 2001
From: Hugo Locurcio <hugo.locurcio@hugo.pro>
Date: Thu, 11 Aug 2022 23:51:42 +0200
Subject: [PATCH] Update scripts for Godot 3.5

Ubuntu 20.04 is now the baseline for Linux binaries.
---
 Dockerfile                         | 8 +++++++-
 README.md                          | 3 ++-
 build_linux.sh                     | 2 +-
 build_windows_editor.bat           | 2 +-
 build_windows_template_debug.bat   | 2 +-
 build_windows_template_release.bat | 2 +-
 compress.sh                        | 2 +-
 7 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 0817337..d3bda5a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,14 @@
 # This Dockerfile only installs dependencies for compiling Godot.
 # See `build_linux.sh` for the actual build commands.
-FROM ubuntu:18.04
+FROM ubuntu:20.04
+
+# Set timezone programmatically so building isn't interrupted by tzdata asking
+# for a timezone.
+ENV TZ=Europe/Paris
 
 RUN \
+    ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && \
+    echo $TZ > /etc/timezone && \
     apt-get update -qq && \
     apt-get install -yqq \
         git build-essential scons pkg-config libx11-dev libxcursor-dev \
diff --git a/README.md b/README.md
index 781d0ef..1c43021 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,8 @@ Studio or WinDbg to get backtraces. If you're on Windows 10, you may want to use
 the newer
 [WinDbg Preview](https://docs.microsoft.com/en-us/windows-hardware/drivers/debugger/debugger-download-tools).
 
-For Godot 3.3 and later, Linux binaries were compiled on Ubuntu 18.04 with GCC 7.5.
+For Godot 3.5 and later, Linux binaries were compiled on Ubuntu 20.04 with GCC 9.3.
+For Godot 3.4.5 and older, Linux binaries were compiled on Ubuntu 18.04 with GCC 7.5.
 For Godot 3.2.3 and older, Linux binaries were compiled on Ubuntu 16.04 with GCC 5.4.
 
 See [BUILD.md](BUILD.md) if you want to compile your own debug builds easily.
diff --git a/build_linux.sh b/build_linux.sh
index 911d414..24d0ac8 100755
--- a/build_linux.sh
+++ b/build_linux.sh
@@ -6,7 +6,7 @@ cd "$(dirname "${BASH_SOURCE[0]}")"
 # See `Dockerfile` for the dependency installation.
 docker build -t godot-debug-builder .
 docker run --rm --volume "$PWD/bin/linux":/opt/artifacts godot-debug-builder sh -c '
-git clone --branch="3.4.5-stable" --depth=1 https://github.com/godotengine/godot.git /opt/godot/
+git clone --branch="3.5-stable" --depth=1 https://github.com/godotengine/godot.git /opt/godot/
 cd /opt/godot/
 scons platform=x11 -j$(nproc) debug_symbols=yes progress=no
 scons platform=x11 -j$(nproc) debug_symbols=yes progress=no tools=no
diff --git a/build_windows_editor.bat b/build_windows_editor.bat
index 877c8da..bab853c 100644
--- a/build_windows_editor.bat
+++ b/build_windows_editor.bat
@@ -3,7 +3,7 @@
 :: Clean up old build directly in case the previous build was aborted.
 rmdir /s /q %TEMP%\godot-debug-build-editor
 
-git clone --branch="3.4.5-stable" --depth=1 https://github.com/godotengine/godot.git %TEMP%\godot-debug-build-editor
+git clone --branch="3.5-stable" --depth=1 https://github.com/godotengine/godot.git %TEMP%\godot-debug-build-editor
 pushd %TEMP%\godot-debug-build-editor
 scons -j%NUMBER_OF_PROCESSORS% debug_symbols=yes progress=no
 popd
diff --git a/build_windows_template_debug.bat b/build_windows_template_debug.bat
index 85933c1..0b419bb 100644
--- a/build_windows_template_debug.bat
+++ b/build_windows_template_debug.bat
@@ -3,7 +3,7 @@
 :: Clean up old build directly in case the previous build was aborted.
 rmdir /s /q %TEMP%\godot-debug-build-template-debug
 
-git clone --branch="3.4.5-stable" --depth=1 https://github.com/godotengine/godot.git %TEMP%\godot-debug-build-template-debug
+git clone --branch="3.5-stable" --depth=1 https://github.com/godotengine/godot.git %TEMP%\godot-debug-build-template-debug
 pushd %TEMP%\godot-debug-build-template-debug
 scons -j%NUMBER_OF_PROCESSORS% debug_symbols=yes progress=no tools=no
 popd
diff --git a/build_windows_template_release.bat b/build_windows_template_release.bat
index 75e757b..72dfa89 100644
--- a/build_windows_template_release.bat
+++ b/build_windows_template_release.bat
@@ -3,7 +3,7 @@
 :: Clean up old build directly in case the previous build was aborted.
 rmdir /s /q %TEMP%\godot-debug-build-template-release
 
-git clone --branch="3.4.5-stable" --depth=1 https://github.com/godotengine/godot.git %TEMP%\godot-debug-build-template-release
+git clone --branch="3.5-stable" --depth=1 https://github.com/godotengine/godot.git %TEMP%\godot-debug-build-template-release
 pushd %TEMP%\godot-debug-build-template-release
 scons -j%NUMBER_OF_PROCESSORS% debug_symbols=yes progress=no tools=no target=release
 popd
diff --git a/compress.sh b/compress.sh
index df26d0c..73b7641 100755
--- a/compress.sh
+++ b/compress.sh
@@ -5,7 +5,7 @@ cd "$(dirname "${BASH_SOURCE[0]}")"
 
 # This script should be run after running both `build_linux.sh` and `build_windows.bat`.
 
-GODOT_VERSION="3.4.5"
+GODOT_VERSION="3.5"
 
 parallel 7z a -mx9 "{}.zip" "{}" ::: bin/linux/*.64