Skip to content

Commit 090be3f

Browse files
akien-mgaCalinou
akien-mga
authored and
Calinou
committed
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 090be3f

File tree

9 files changed

+37
-52
lines changed

9 files changed

+37
-52
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-release.sh‎

Lines changed: 24 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,11 @@ export basedir=$(pwd)
88
# For signing keystore and password.
99
source ./config.sh
1010

11+
godot-zip() {
12+
godot-zip "$@"
13+
}
14+
export -f godot-zip
15+
1116
can_sign_windows=0
1217
if [ ! -z "${SIGN_KEYSTORE}" ] && [ ! -z "${SIGN_PASSWORD}" ] && [[ $(type -P "osslsigncode") ]]; then
1318
can_sign_windows=1
@@ -47,7 +52,7 @@ sign_macos() {
4752
codesign --force --timestamp \
4853
--options=runtime --entitlements editor.entitlements \
4954
-s ${OSX_KEY_ID} -v ${_appname} && \
50-
zip -r ${_binname}_signed.zip ${_appname}"
55+
godot-zip ${_binname}_signed.zip ${_appname}"
5156

5257
_request_uuid=$(ssh "${OSX_HOST}" "xcrun altool --notarize-app --primary-bundle-id \"${OSX_BUNDLE_ID}\" --username \"${APPLE_ID}\" --password \"${APPLE_ID_PASSWORD}\" --file ${_macos_tmpdir}/${_binname}_signed.zip")
5358
_request_uuid=$(echo ${_request_uuid} | sed -e 's/.*RequestUUID = //')
@@ -62,7 +67,7 @@ sign_macos() {
6267
ssh "${OSX_HOST}" "
6368
cd ${_macos_tmpdir} && \
6469
xcrun stapler staple ${_appname} && \
65-
zip -r ${_binname}_stapled.zip ${_appname}"
70+
godot-zip ${_binname}_stapled.zip ${_appname}"
6671
scp "${OSX_HOST}:${_macos_tmpdir}/${_binname}_stapled.zip" "${_reldir}/${_binname}.zip"
6772
ssh "${OSX_HOST}" "rm -rf ${_macos_tmpdir}"
6873
fi
@@ -83,7 +88,7 @@ sign_macos_template() {
8388
codesign --force -s - \
8489
--options=linker-signed \
8590
-v macos_template.app/Contents/MacOS/* && \
86-
zip -r macos_signed.zip macos_template.app"
91+
godot-zip macos_signed.zip macos_template.app"
8792

8893
scp "${OSX_HOST}:${_macos_tmpdir}/macos_signed.zip" "${_reldir}/macos.zip"
8994
ssh "${OSX_HOST}" "rm -rf ${_macos_tmpdir}"
@@ -242,13 +247,13 @@ if [ "${build_classical}" == "1" ]; then
242247
binname="${godot_basename}_linux.x86_64"
243248
cp out/linux/x86_64/tools/godot.linuxbsd.editor.x86_64 ${binname}
244249
strip ${binname}
245-
zip -q -9 "${reldir}/${binname}.zip" ${binname}
250+
godot-zip "${reldir}/${binname}.zip" ${binname}
246251
rm ${binname}
247252

248253
binname="${godot_basename}_linux.x86_32"
249254
cp out/linux/x86_32/tools/godot.linuxbsd.editor.x86_32 ${binname}
250255
strip ${binname}
251-
zip -q -9 "${reldir}/${binname}.zip" ${binname}
256+
godot-zip "${reldir}/${binname}.zip" ${binname}
252257
rm ${binname}
253258

254259
# Templates
@@ -269,7 +274,7 @@ if [ "${build_classical}" == "1" ]; then
269274
cp out/windows/x86_64/tools/godot.windows.editor.x86_64.console.exe ${wrpname}
270275
strip ${wrpname}
271276
sign_windows ${wrpname}
272-
zip -q -9 "${reldir}/${binname}.zip" ${binname} ${wrpname}
277+
godot-zip "${reldir}/${binname}.zip" ${binname} ${wrpname}
273278
rm ${binname} ${wrpname}
274279

275280
binname="${godot_basename}_win32.exe"
@@ -280,7 +285,7 @@ if [ "${build_classical}" == "1" ]; then
280285
cp out/windows/x86_32/tools/godot.windows.editor.x86_32.console.exe ${wrpname}
281286
strip ${wrpname}
282287
sign_windows ${wrpname}
283-
zip -q -9 "${reldir}/${binname}.zip" ${binname} ${wrpname}
288+
godot-zip "${reldir}/${binname}.zip" ${binname} ${wrpname}
284289
rm ${binname} ${wrpname}
285290

286291
# Templates
@@ -303,7 +308,7 @@ if [ "${build_classical}" == "1" ]; then
303308
mkdir -p Godot.app/Contents/MacOS
304309
cp out/macos/tools/godot.macos.editor.universal Godot.app/Contents/MacOS/Godot
305310
chmod +x Godot.app/Contents/MacOS/Godot
306-
zip -q -9 -r "${reldir}/${binname}.zip" Godot.app
311+
godot-zip -r "${reldir}/${binname}.zip" Godot.app
307312
rm -rf Godot.app
308313
sign_macos ${reldir} ${binname} 0
309314

@@ -315,7 +320,7 @@ if [ "${build_classical}" == "1" ]; then
315320
cp out/macos/templates/godot.macos.template_release.universal macos_template.app/Contents/MacOS/godot_macos_release.universal
316321
cp out/macos/templates/godot.macos.template_debug.universal macos_template.app/Contents/MacOS/godot_macos_debug.universal
317322
chmod +x macos_template.app/Contents/MacOS/godot_macos*
318-
zip -q -9 -r "${templatesdir}/macos.zip" macos_template.app
323+
godot-zip -r "${templatesdir}/macos.zip" macos_template.app
319324
rm -rf macos_template.app
320325
sign_macos_template ${templatesdir} 0
321326

@@ -360,15 +365,15 @@ if [ "${build_classical}" == "1" ]; then
360365
cp -r deps/vulkansdk-macos/MoltenVK/MoltenVK.xcframework ios_xcode/
361366
rm -rf ios_xcode/MoltenVK.xcframework/{macos,tvos}*
362367
cd ios_xcode
363-
zip -q -9 -r "${templatesdir}/ios.zip" *
368+
godot-zip -r "${templatesdir}/ios.zip" *
364369
cd ..
365370
rm -rf ios_xcode
366371

367372
## Templates TPZ (Classical) ##
368373

369374
echo "${templates_version}" > ${templatesdir}/version.txt
370375
pushd ${templatesdir}/..
371-
zip -q -9 -r -D "${reldir}/${godot_basename}_export_templates.tpz" templates/*
376+
godot-zip -r "${reldir}/${godot_basename}_export_templates.tpz" templates/*
372377
popd
373378

374379
## SHA-512 sums (Classical) ##
@@ -393,15 +398,15 @@ if [ "${build_mono}" == "1" ]; then
393398
cp out/linux/x86_64/tools-mono/godot.linuxbsd.editor.x86_64.mono ${binbasename}_x86_64/${binbasename}.x86_64
394399
strip ${binbasename}_x86_64/${binbasename}.x86_64
395400
cp -rp out/linux/x86_64/tools-mono/GodotSharp ${binbasename}_x86_64/
396-
zip -r -q -9 "${reldir_mono}/${binbasename}_x86_64.zip" ${binbasename}_x86_64
401+
godot-zip "${reldir_mono}/${binbasename}_x86_64.zip" ${binbasename}_x86_64
397402
rm -rf ${binbasename}_x86_64
398403

399404
binbasename="${godot_basename}_mono_linux"
400405
mkdir -p ${binbasename}_x86_32
401406
cp out/linux/x86_32/tools-mono/godot.linuxbsd.editor.x86_32.mono ${binbasename}_x86_32/${binbasename}.x86_32
402407
strip ${binbasename}_x86_32/${binbasename}.x86_32
403408
cp -rp out/linux/x86_32/tools-mono/GodotSharp/ ${binbasename}_x86_32/
404-
zip -r -q -9 "${reldir_mono}/${binbasename}_x86_32.zip" ${binbasename}_x86_32
409+
godot-zip "${reldir_mono}/${binbasename}_x86_32.zip" ${binbasename}_x86_32
405410
rm -rf ${binbasename}_x86_32
406411

407412
# Templates
@@ -424,7 +429,7 @@ if [ "${build_mono}" == "1" ]; then
424429
cp out/windows/x86_64/tools-mono/godot.windows.editor.x86_64.mono.console.exe ${binname}/${wrpname}.exe
425430
strip ${binname}/${wrpname}.exe
426431
sign_windows ${binname}/${wrpname}.exe
427-
zip -r -q -9 "${reldir_mono}/${binname}.zip" ${binname}
432+
godot-zip "${reldir_mono}/${binname}.zip" ${binname}
428433
rm -rf ${binname}
429434

430435
binname="${godot_basename}_mono_win32"
@@ -437,7 +442,7 @@ if [ "${build_mono}" == "1" ]; then
437442
cp out/windows/x86_32/tools-mono/godot.windows.editor.x86_32.mono.console.exe ${binname}/${wrpname}.exe
438443
strip ${binname}/${wrpname}.exe
439444
sign_windows ${binname}/${wrpname}.exe
440-
zip -r -q -9 "${reldir_mono}/${binname}.zip" ${binname}
445+
godot-zip "${reldir_mono}/${binname}.zip" ${binname}
441446
rm -rf ${binname}
442447

443448
# Templates
@@ -461,7 +466,7 @@ if [ "${build_mono}" == "1" ]; then
461466
cp out/macos/tools-mono/godot.macos.editor.universal.mono Godot_mono.app/Contents/MacOS/Godot
462467
cp -rp out/macos/tools-mono/GodotSharp Godot_mono.app/Contents/Resources/GodotSharp
463468
chmod +x Godot_mono.app/Contents/MacOS/Godot
464-
zip -q -9 -r "${reldir_mono}/${binname}.zip" Godot_mono.app
469+
godot-zip -r "${reldir_mono}/${binname}.zip" Godot_mono.app
465470
rm -rf Godot_mono.app
466471
sign_macos ${reldir_mono} ${binname} 1
467472

@@ -472,7 +477,7 @@ if [ "${build_mono}" == "1" ]; then
472477
cp out/macos/templates-mono/godot.macos.template_debug.universal.mono macos_template.app/Contents/MacOS/godot_macos_debug.universal
473478
cp out/macos/templates-mono/godot.macos.template_release.universal.mono macos_template.app/Contents/MacOS/godot_macos_release.universal
474479
chmod +x macos_template.app/Contents/MacOS/godot_macos*
475-
zip -q -9 -r "${templatesdir_mono}/macos.zip" macos_template.app
480+
godot-zip -r "${templatesdir_mono}/macos.zip" macos_template.app
476481
rm -rf macos_template.app
477482
sign_macos_template ${templatesdir_mono} 1
478483

@@ -496,7 +501,7 @@ if [ "${build_mono}" == "1" ]; then
496501
cp -r deps/vulkansdk-macos/MoltenVK/MoltenVK.xcframework ios_xcode/
497502
rm -rf ios_xcode/MoltenVK.xcframework/{macos,tvos}*
498503
cd ios_xcode
499-
zip -q -9 -r "${templatesdir_mono}/ios.zip" *
504+
godot-zip -r "${templatesdir_mono}/ios.zip" *
500505
cd ..
501506
rm -rf ios_xcode
502507

@@ -516,7 +521,7 @@ if [ "${build_mono}" == "1" ]; then
516521

517522
echo "${templates_version}.mono" > ${templatesdir_mono}/version.txt
518523
pushd ${templatesdir_mono}/..
519-
zip -q -9 -r -D "${reldir_mono}/${godot_basename}_mono_export_templates.tpz" templates/*
524+
godot-zip -r "${reldir_mono}/${godot_basename}_mono_export_templates.tpz" templates/*
520525
popd
521526

522527
## SHA-512 sums (Mono) ##

‎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)