Skip to content

Commit

Permalink
Update scripts for Godot 3.5
Browse files Browse the repository at this point in the history
Ubuntu 20.04 is now the baseline for Linux binaries.
  • Loading branch information
Calinou committed Aug 14, 2022
1 parent 3d4d754 commit 8800450
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 7 deletions.
8 changes: 7 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -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 \
Expand Down
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion build_linux.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion build_windows_editor.bat
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion build_windows_template_debug.bat
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion build_windows_template_release.bat
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion compress.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit 8800450

Please sign in to comment.