Skip to content

Commit 93d2533

Browse files
akien-mgaakien-mga
authored
Merge pull request #89 from godotengine/f39-images
Update scripts for new Fedora 39 based images for 4.2-beta3 and later
2 parents be182f1 + 65cca81 commit 93d2533

File tree

8 files changed

+13
-33
lines changed

8 files changed

+13
-33
lines changed

‎build-android/build.sh

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,6 @@ tar xf /root/godot.tar.gz --strip-components=1
1818
# as well as signing and publishing to MavenCentral.
1919
source /root/keystore/config.sh
2020

21-
# Temporary, until we make new build containers.
22-
dnf install -y java-17-openjdk-devel
23-
2421
store_release="yes"
2522
if [ -z "${GODOT_ANDROID_SIGN_KEYSTORE}" ]; then
2623
echo "No keystore provided to sign the Android release editor build, using debug build instead."
@@ -29,8 +26,6 @@ fi
2926

3027
# Classical
3128

32-
dnf -y install gettext
33-
3429
if [ "${CLASSICAL}" == "1" ]; then
3530
echo "Starting classical build for Android..."
3631

‎build-android/upload-mavencentral.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ ${PODMAN} run -it --rm \
1313
-v ${basedir}/out/android/source:/root/godot -v ${basedir}/deps/keystore:/root/keystore \
1414
localhost/godot-android:${IMAGE_VERSION} bash -c \
1515
"source /root/keystore/config.sh && \
16-
dnf install -y java-17-openjdk-devel && \
1716
cp -r /root/godot/.gradle /root && \
1817
cd /root/godot/platform/android/java && \
1918
./gradlew publishTemplateReleasePublicationToSonatypeRepository --max-workers 1 closeAndReleaseSonatypeStagingRepository"

‎build-ios/build.sh

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ export OPTIONS="production=yes use_lto=no"
1111
export OPTIONS_MONO="module_mono_enabled=yes"
1212
export TERM=xterm
1313

14-
export IOS_SDK="16.1"
14+
export IOS_SDK="17.0"
1515
export IOS_LIPO="/root/ioscross/arm64/bin/arm-apple-darwin11-lipo"
1616

1717
rm -rf godot
@@ -21,8 +21,6 @@ tar xf /root/godot.tar.gz --strip-components=1
2121

2222
# Classical
2323

24-
dnf -y install gettext
25-
2624
if [ "${CLASSICAL}" == "1" ]; then
2725
echo "Starting classical build for iOS..."
2826

@@ -36,15 +34,15 @@ if [ "${CLASSICAL}" == "1" ]; then
3634
# Disabled for now as it doesn't work with cctools-port and current LLVM.
3735
# See https://github.com/godotengine/build-containers/pull/85.
3836
#$SCONS platform=ios $OPTIONS arch=arm64 ios_simulator=yes target=template_debug \
39-
# IOS_SDK_PATH="/root/ioscross/arm64_sim/SDK/iPhoneOS${IOS_SDK}.sdk" IOS_TOOLCHAIN_PATH="/root/ioscross/arm64_sim/" ios_triple="arm-apple-darwin11-"
40-
#$SCONS platform=ios $OPTIONS arch=arm64 ios_simulator=no target=template_release \
41-
# IOS_SDK_PATH="/root/ioscross/arm64_sim/SDK/iPhoneOS${IOS_SDK}.sdk" IOS_TOOLCHAIN_PATH="/root/ioscross/arm64_sim/" ios_triple="arm-apple-darwin11-"
37+
# IOS_SDK_PATH="/root/ioscross/arm64_sim/SDK/iPhoneSimulator${IOS_SDK}.sdk" IOS_TOOLCHAIN_PATH="/root/ioscross/arm64_sim/" ios_triple="arm-apple-darwin11-"
38+
#$SCONS platform=ios $OPTIONS arch=arm64 ios_simulator=yes target=template_release \
39+
# IOS_SDK_PATH="/root/ioscross/arm64_sim/SDK/iPhoneSimulator${IOS_SDK}.sdk" IOS_TOOLCHAIN_PATH="/root/ioscross/arm64_sim/" ios_triple="arm-apple-darwin11-"
4240

4341
# x86_64 simulator
4442
$SCONS platform=ios $OPTIONS arch=x86_64 ios_simulator=yes target=template_debug \
45-
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-"
43+
IOS_SDK_PATH="/root/ioscross/x86_64_sim/SDK/iPhoneSimulator${IOS_SDK}.sdk" IOS_TOOLCHAIN_PATH="/root/ioscross/x86_64_sim/" ios_triple="x86_64-apple-darwin11-"
4644
$SCONS platform=ios $OPTIONS arch=x86_64 ios_simulator=yes target=template_release \
47-
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-"
45+
IOS_SDK_PATH="/root/ioscross/x86_64_sim/SDK/iPhoneSimulator${IOS_SDK}.sdk" IOS_TOOLCHAIN_PATH="/root/ioscross/x86_64_sim/" ios_triple="x86_64-apple-darwin11-"
4846

4947
mkdir -p /root/out/templates
5048
cp bin/libgodot.ios.template_release.arm64.a /root/out/templates/libgodot.ios.a
@@ -72,15 +70,15 @@ if [ "${MONO}" == "1" ]; then
7270
# Disabled for now as it doesn't work with cctools-port and current LLVM.
7371
# See https://github.com/godotengine/build-containers/pull/85.
7472
#$SCONS platform=ios $OPTIONS $OPTIONS_MONO arch=arm64 ios_simulator=yes target=template_debug \
75-
# IOS_SDK_PATH="/root/ioscross/arm64_sim/SDK/iPhoneOS${IOS_SDK}.sdk" IOS_TOOLCHAIN_PATH="/root/ioscross/arm64_sim/" ios_triple="arm-apple-darwin11-"
73+
# IOS_SDK_PATH="/root/ioscross/arm64_sim/SDK/iPhoneSimulator${IOS_SDK}.sdk" IOS_TOOLCHAIN_PATH="/root/ioscross/arm64_sim/" ios_triple="arm-apple-darwin11-"
7674
#$SCONS platform=ios $OPTIONS $OPTIONS_MONO arch=arm64 ios_simulator=yes target=template_release \
77-
# IOS_SDK_PATH="/root/ioscross/arm64_sim/SDK/iPhoneOS${IOS_SDK}.sdk" IOS_TOOLCHAIN_PATH="/root/ioscross/arm64_sim/" ios_triple="arm-apple-darwin11-"
75+
# IOS_SDK_PATH="/root/ioscross/arm64_sim/SDK/iPhoneSimulator${IOS_SDK}.sdk" IOS_TOOLCHAIN_PATH="/root/ioscross/arm64_sim/" ios_triple="arm-apple-darwin11-"
7876

7977
# x86_64 simulator
8078
$SCONS platform=ios $OPTIONS $OPTIONS_MONO arch=x86_64 ios_simulator=yes target=template_debug \
81-
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-"
79+
IOS_SDK_PATH="/root/ioscross/x86_64_sim/SDK/iPhoneSimulator${IOS_SDK}.sdk" IOS_TOOLCHAIN_PATH="/root/ioscross/x86_64_sim/" ios_triple="x86_64-apple-darwin11-"
8280
$SCONS platform=ios $OPTIONS $OPTIONS_MONO arch=x86_64 ios_simulator=yes target=template_release \
83-
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-"
81+
IOS_SDK_PATH="/root/ioscross/x86_64_sim/SDK/iPhoneSimulator${IOS_SDK}.sdk" IOS_TOOLCHAIN_PATH="/root/ioscross/x86_64_sim/" ios_triple="x86_64-apple-darwin11-"
8482

8583
mkdir -p /root/out/templates-mono
8684

‎build-linux/build.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@ tar xf /root/godot.tar.gz --strip-components=1
1717
# pkg-config wrongly points to lib instead of lib64 for arch-dependent header.
1818
sed -i ${GODOT_SDK_LINUX_X86_64}/x86_64-godot-linux-gnu/sysroot/usr/lib/pkgconfig/dbus-1.pc -e "s@/lib@/lib64@g"
1919

20-
dnf -y install gettext
21-
2220
# Classical
2321

2422
if [ "${CLASSICAL}" == "1" ]; then

‎build-macos/build.sh

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ set -e
55
# Config
66

77
export SCONS="scons -j${NUM_CORES} verbose=yes warnings=no progress=no"
8-
export OPTIONS="osxcross_sdk=darwin22 production=yes use_volk=no vulkan_sdk_path=/root/vulkansdk angle_libs=/root/angle"
8+
export OPTIONS="osxcross_sdk=darwin23 production=yes use_volk=no vulkan_sdk_path=/root/vulkansdk angle_libs=/root/angle"
99
export OPTIONS_MONO="module_mono_enabled=yes"
10-
export STRIP="x86_64-apple-darwin22-strip -u -r"
10+
export STRIP="x86_64-apple-darwin23-strip -u -r"
1111
export TERM=xterm
1212

1313
rm -rf godot
@@ -17,8 +17,6 @@ tar xf /root/godot.tar.gz --strip-components=1
1717

1818
# Classical
1919

20-
dnf -y install gettext
21-
2220
if [ "${CLASSICAL}" == "1" ]; then
2321
echo "Starting classical build for macOS..."
2422

‎build-mono-glue/build.sh

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,6 @@ tar xf ../godot.tar.gz --strip-components=1
1818
# pkg-config wrongly points to lib instead of lib64 for arch-dependent header.
1919
sed -i ${GODOT_SDK_LINUX_X86_64}/x86_64-godot-linux-gnu/sysroot/usr/lib/pkgconfig/dbus-1.pc -e "s@/lib@/lib64@g"
2020

21-
# Temporarily until we make --headless mode actually skip X11.
22-
dnf install -y libX11 libXcursor libXrandr libXinerama libXi mesa-libGL
23-
dnf -y install gettext
24-
2521
# Mono
2622

2723
if [ "${MONO}" == "1" ]; then

‎build-web/build.sh

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ set -e
88
# we run all builds in parallel each from their own folder.
99
export NUM_JOBS=5
1010
declare -a JOBS=(
11-
"target=editor use_closure_compiler=no"
11+
"target=editor use_closure_compiler=yes"
1212
"target=template_debug"
1313
"target=template_release"
1414
"target=template_debug dlink_enabled=yes"
@@ -29,8 +29,6 @@ tar xf /root/godot.tar.gz --strip-components=1
2929

3030
# Classical
3131

32-
dnf -y install gettext
33-
3432
if [ "${CLASSICAL}" == "1" ]; then
3533
echo "Starting classical build for Web..."
3634

‎build-windows/build.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@ tar xf /root/godot.tar.gz --strip-components=1
1616

1717
# Classical
1818

19-
dnf -y install gettext
20-
2119
if [ "${CLASSICAL}" == "1" ]; then
2220
echo "Starting classical build for Windows..."
2321

0 commit comments

Comments
 (0)