Skip to content

Commit 1262703

Browse files
akien-mgaakien-mga
authored
Merge pull request #64 from godotengine/godot4-dotnet
2 parents 36fc7fc + 2318759 commit 1262703

File tree

7 files changed

+42
-87
lines changed

7 files changed

+42
-87
lines changed

‎build-android/build.sh

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ set -e
66

77
export SCONS="scons -j${NUM_CORES} verbose=yes warnings=no progress=no"
88
export OPTIONS="production=yes"
9-
export OPTIONS_MONO="module_mono_enabled=yes mono_static=no"
9+
export OPTIONS_MONO="module_mono_enabled=yes"
1010
export TERM=xterm
1111

1212
rm -rf godot
@@ -62,17 +62,17 @@ if [ "${MONO}" == "1" ]; then
6262
cp /root/mono-glue/*.cpp modules/mono/glue/
6363
cp -r /root/mono-glue/GodotSharp/GodotSharp/Generated modules/mono/glue/GodotSharp/GodotSharp/
6464

65-
$SCONS platform=android android_arch=armv7 $OPTIONS $OPTIONS_MONO mono_prefix=/root/mono-installs/android-armv7-release tools=no target=release_debug
66-
$SCONS platform=android android_arch=armv7 $OPTIONS $OPTIONS_MONO mono_prefix=/root/mono-installs/android-armv7-release tools=no target=release
65+
$SCONS platform=android android_arch=armv7 $OPTIONS $OPTIONS_MONO tools=no target=release_debug
66+
$SCONS platform=android android_arch=armv7 $OPTIONS $OPTIONS_MONO tools=no target=release
6767

68-
$SCONS platform=android android_arch=arm64v8 $OPTIONS $OPTIONS_MONO mono_prefix=/root/mono-installs/android-arm64v8-release tools=no target=release_debug
69-
$SCONS platform=android android_arch=arm64v8 $OPTIONS $OPTIONS_MONO mono_prefix=/root/mono-installs/android-arm64v8-release tools=no target=release
68+
$SCONS platform=android android_arch=arm64v8 $OPTIONS $OPTIONS_MONO tools=no target=release_debug
69+
$SCONS platform=android android_arch=arm64v8 $OPTIONS $OPTIONS_MONO tools=no target=release
7070

71-
$SCONS platform=android android_arch=x86 $OPTIONS $OPTIONS_MONO mono_prefix=/root/mono-installs/android-x86-release tools=no target=release_debug
72-
$SCONS platform=android android_arch=x86 $OPTIONS $OPTIONS_MONO mono_prefix=/root/mono-installs/android-x86-release tools=no target=release
71+
$SCONS platform=android android_arch=x86 $OPTIONS $OPTIONS_MONO tools=no target=release_debug
72+
$SCONS platform=android android_arch=x86 $OPTIONS $OPTIONS_MONO tools=no target=release
7373

74-
$SCONS platform=android android_arch=x86_64 $OPTIONS $OPTIONS_MONO mono_prefix=/root/mono-installs/android-x86_64-release tools=no target=release_debug
75-
$SCONS platform=android android_arch=x86_64 $OPTIONS $OPTIONS_MONO mono_prefix=/root/mono-installs/android-x86_64-release tools=no target=release
74+
$SCONS platform=android android_arch=x86_64 $OPTIONS $OPTIONS_MONO tools=no target=release_debug
75+
$SCONS platform=android android_arch=x86_64 $OPTIONS $OPTIONS_MONO tools=no target=release
7676

7777
pushd platform/android/java
7878
./gradlew generateGodotTemplates
@@ -83,9 +83,6 @@ if [ "${MONO}" == "1" ]; then
8383
cp bin/android_debug.apk /root/out/templates-mono/
8484
cp bin/android_release.apk /root/out/templates-mono/
8585
cp bin/godot-lib.release.aar /root/out/templates-mono/
86-
87-
mkdir -p /root/out/templates-mono/bcl
88-
cp -r /root/mono-installs/android-bcl/* /root/out/templates-mono/bcl/
8986
fi
9087

9188
echo "Android build successful"

‎build-ios/build.sh

Lines changed: 7 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ export SCONS="scons -j${NUM_CORES} verbose=yes warnings=no progress=no"
88
# Keep LTO disabled for iOS - it works but it makes linking apps on deploy very slow,
99
# which is seen as a regression in the current workflow.
1010
export OPTIONS="production=yes use_lto=no"
11-
export OPTIONS_MONO="module_mono_enabled=yes mono_static=yes"
11+
export OPTIONS_MONO="module_mono_enabled=yes"
1212
export TERM=xterm
1313

1414
export IOS_SDK="15.4"
@@ -60,26 +60,25 @@ if [ "${MONO}" == "1" ]; then
6060

6161
cp /root/mono-glue/*.cpp modules/mono/glue/
6262
cp -r /root/mono-glue/GodotSharp/GodotSharp/Generated modules/mono/glue/GodotSharp/GodotSharp/
63-
cp -r /root/mono-glue/GodotSharp/GodotSharpEditor/Generated modules/mono/glue/GodotSharp/GodotSharpEditor/
6463

6564
# arm64 device
66-
$SCONS platform=ios $OPTIONS $OPTIONS_MONO arch=arm64 ios_simulator=no mono_prefix=/root/mono-installs/ios-arm64-release tools=no target=release_debug \
65+
$SCONS platform=ios $OPTIONS $OPTIONS_MONO arch=arm64 ios_simulator=no tools=no target=release_debug \
6766
IOS_SDK_PATH="/root/ioscross/arm64/SDK/iPhoneOS${IOS_SDK}.sdk" IOS_TOOLCHAIN_PATH="/root/ioscross/arm64/" ios_triple="arm-apple-darwin11-"
68-
$SCONS platform=iios $OPTIONS $OPTIONS_MONO arch=arm64 ios_simulator=no mono_prefix=/root/mono-installs/ios-arm64-release tools=no target=release \
67+
$SCONS platform=ios $OPTIONS $OPTIONS_MONO arch=arm64 ios_simulator=no tools=no target=release \
6968
IOS_SDK_PATH="/root/ioscross/arm64/SDK/iPhoneOS${IOS_SDK}.sdk" IOS_TOOLCHAIN_PATH="/root/ioscross/arm64/" ios_triple="arm-apple-darwin11-"
7069

7170
# arm64 simulator
7271
# Disabled for now as it doesn't work with cctools-port and current LLVM.
7372
# See https://github.com/godotengine/build-containers/pull/85.
74-
#$SCONS platform=ios $OPTIONS $OPTIONS_MONO arch=arm64 ios_simulator=yes mono_prefix=/root/mono-installs/ios-arm64-sim-release tools=no target=release_debug \
73+
#$SCONS platform=ios $OPTIONS $OPTIONS_MONO arch=arm64 ios_simulator=yes tools=no target=release_debug \
7574
# IOS_SDK_PATH="/root/ioscross/arm64_sim/SDK/iPhoneOS${IOS_SDK}.sdk" IOS_TOOLCHAIN_PATH="/root/ioscross/arm64_sim/" ios_triple="arm-apple-darwin11-"
76-
#$SCONS platform=ios $OPTIONS $OPTIONS_MONO arch=arm64 ios_simulator=yes mono_prefix=/root/mono-installs/ios-arm64-sim-release tools=no target=release \
75+
#$SCONS platform=ios $OPTIONS $OPTIONS_MONO arch=arm64 ios_simulator=yes tools=no target=release \
7776
# IOS_SDK_PATH="/root/ioscross/arm64_sim/SDK/iPhoneOS${IOS_SDK}.sdk" IOS_TOOLCHAIN_PATH="/root/ioscross/arm64_sim/" ios_triple="arm-apple-darwin11-"
7877

7978
# x86_64 simulator
80-
$SCONS platform=ios $OPTIONS $OPTIONS_MONO arch=x86_64 ios_simulator=yes mono_prefix=/root/mono-installs/ios-x86_64-release tools=no target=release_debug \
79+
$SCONS platform=ios $OPTIONS $OPTIONS_MONO arch=x86_64 ios_simulator=yes tools=no target=release_debug \
8180
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-"
82-
$SCONS platform=ios $OPTIONS $OPTIONS_MONO arch=x86_64 ios_simulator=yes mono_prefix=/root/mono-installs/ios-x86_64-release tools=no target=release \
81+
$SCONS platform=ios $OPTIONS $OPTIONS_MONO arch=x86_64 ios_simulator=yes tools=no target=release \
8382
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-"
8483

8584
mkdir -p /root/out/templates-mono
@@ -90,27 +89,6 @@ if [ "${MONO}" == "1" ]; then
9089
#$IOS_LIPO -create bin/libgodot.ios.opt.debug.arm64.simulator.a bin/libgodot.ios.opt.debug.x86_64.simulator.a -output /root/out/templates-mono/libgodot.ios.debug.simulator.a
9190
cp bin/libgodot.ios.opt.x86_64.simulator.a /root/out/templates-mono/libgodot.ios.simulator.a
9291
cp bin/libgodot.ios.opt.debug.x86_64.simulator.a /root/out/templates-mono/libgodot.ios.debug.simulator.a
93-
94-
cp -r misc/dist/ios-mono-libs /root/out/templates-mono/ios-mono-libs
95-
96-
cp bin/libmonosgen-2.0.ios.arm64.a /root/out/templates-mono/ios-mono-libs/libmonosgen-2.0.xcframework/ios-arm64/libmonosgen.a
97-
cp bin/libmono-native.ios.arm64.a /root/out/templates-mono/ios-mono-libs/libmono-native.xcframework/ios-arm64/libmono-native.a
98-
cp bin/libmono-profiler-log.ios.arm64.a /root/out/templates-mono/ios-mono-libs/libmono-profiler-log.xcframework/ios-arm64/libmono-profiler-log.a
99-
100-
#$IOS_LIPO -create bin/libmonosgen-2.0.ios.arm64.simulator.a bin/libmonosgen-2.0.ios.x86_64.simulator.a -output /root/out/templates-mono/ios-mono-libs/libmonosgen-2.0.xcframework/ios-arm64_x86_64-simulator/libmonosgen.a
101-
#$IOS_LIPO -create bin/libmono-native.ios.arm64.simulator.a bin/libmono-native.ios.x86_64.simulator.a -output /root/out/templates-mono/ios-mono-libs/libmono-native.xcframework/ios-arm64_x86_64-simulator/libmono-native.a
102-
#$IOS_LIPO -create bin/libmono-profiler-log.ios.arm64.simulator.a bin/libmono-profiler-log.ios.x86_64.simulator.a -output /root/out/templates-mono/ios-mono-libs/libmono-profiler-log.xcframework/ios-arm64_x86_64-simulator/libmono-profiler-log.a
103-
cp bin/libmonosgen-2.0.ios.x86_64.simulator.a /root/out/templates-mono/ios-mono-libs/libmonosgen-2.0.xcframework/ios-arm64_x86_64-simulator/libmonosgen.a
104-
cp bin/libmono-native.ios.x86_64.simulator.a /root/out/templates-mono/ios-mono-libs/libmono-native.xcframework/ios-arm64_x86_64-simulator/libmono-native.a
105-
cp bin/libmono-profiler-log.ios.x86_64.simulator.a /root/out/templates-mono/ios-mono-libs/libmono-profiler-log.xcframework/ios-arm64_x86_64-simulator/libmono-profiler-log.a
106-
107-
# The Mono libraries for the interpreter are not available for simulator builds
108-
cp bin/libmono-ee-interp.ios.arm64.a /root/out/templates-mono/ios-mono-libs/libmono-ee-interp.xcframework/ios-arm64/libmono-ee-interp.a
109-
cp bin/libmono-icall-table.ios.arm64.a /root/out/templates-mono/ios-mono-libs/libmono-icall-table.xcframework/ios-arm64/libmono-icall-table.a
110-
cp bin/libmono-ilgen.ios.arm64.a /root/out/templates-mono/ios-mono-libs/libmono-ilgen.xcframework/ios-arm64/libmono-ilgen.a
111-
112-
mkdir -p /root/out/templates-mono/bcl
113-
cp -r /root/mono-installs/ios-bcl/* /root/out/templates-mono/bcl
11492
fi
11593

11694
echo "iOS build successful"

‎build-linux/build.sh

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@ set -e
66

77
export SCONS="scons -j${NUM_CORES} verbose=yes warnings=no progress=no"
88
export OPTIONS="production=yes"
9-
export OPTIONS_MONO="module_mono_enabled=yes mono_static=yes"
10-
export MONO_PREFIX_X86_64="/root/mono-installs/desktop-linux-x86_64-release"
11-
export MONO_PREFIX_X86="/root/mono-installs/desktop-linux-x86-release"
9+
export OPTIONS_MONO="module_mono_enabled=yes"
1210
export TERM=xterm
1311

1412
rm -rf godot
@@ -56,34 +54,33 @@ fi
5654
if [ "${MONO}" == "1" ]; then
5755
echo "Starting Mono build for Linux..."
5856

59-
cp /root/mono-glue/*.cpp modules/mono/glue/
6057
cp -r /root/mono-glue/GodotSharp/GodotSharp/Generated modules/mono/glue/GodotSharp/GodotSharp/
6158
cp -r /root/mono-glue/GodotSharp/GodotSharpEditor/Generated modules/mono/glue/GodotSharp/GodotSharpEditor/
6259

6360
export PATH="${GODOT_SDK_LINUX_X86_64}/bin:${BASE_PATH}"
64-
export OPTIONS_MONO_PREFIX="${OPTIONS} ${OPTIONS_MONO} mono_prefix=${MONO_PREFIX_X86_64}"
6561

66-
$SCONS platform=linuxbsd arch=x86_64 $OPTIONS $OPTIONS_MONO tools=yes target=release_debug copy_mono_root=yes
62+
$SCONS platform=linuxbsd arch=x86_64 $OPTIONS $OPTIONS_MONO tools=yes target=release_debug
63+
./modules/mono/build_scripts/build_assemblies.py --godot-output-dir=./bin --godot-platform=linuxbsd
6764
mkdir -p /root/out/x86_64/tools-mono
6865
cp -rvp bin/* /root/out/x86_64/tools-mono
6966
rm -rf bin
7067

71-
$SCONS platform=linuxbsd arch=x86_64 $OPTIONS_MONO_PREFIX tools=no target=release_debug
72-
$SCONS platform=linuxbsd arch=x86_64 $OPTIONS_MONO_PREFIX tools=no target=release
68+
$SCONS platform=linuxbsd arch=x86_64 $OPTIONS $OPTIONS_MONO tools=no target=release_debug
69+
$SCONS platform=linuxbsd arch=x86_64 $OPTIONS $OPTIONS_MONO tools=no target=release
7370
mkdir -p /root/out/x86_64/templates-mono
7471
cp -rvp bin/* /root/out/x86_64/templates-mono
7572
rm -rf bin
7673

7774
export PATH="${GODOT_SDK_LINUX_X86}/bin:${BASE_PATH}"
78-
export OPTIONS_MONO_PREFIX="${OPTIONS} ${OPTIONS_MONO} mono_prefix=${MONO_PREFIX_X86}"
7975

80-
$SCONS platform=linuxbsd arch=x86_32 $OPTIONS_MONO_PREFIX tools=yes target=release_debug copy_mono_root=yes
76+
$SCONS platform=linuxbsd arch=x86_32 $OPTIONS $OPTIONS_MONO tools=yes target=release_debug
77+
./modules/mono/build_scripts/build_assemblies.py --godot-output-dir=./bin --godot-platform=linuxbsd
8178
mkdir -p /root/out/x86_32/tools-mono
8279
cp -rvp bin/* /root/out/x86_32/tools-mono
8380
rm -rf bin
8481

85-
$SCONS platform=linuxbsd arch=x86_32 $OPTIONS_MONO_PREFIX tools=no target=release_debug
86-
$SCONS platform=linuxbsd arch=x86_32 $OPTIONS_MONO_PREFIX tools=no target=release
82+
$SCONS platform=linuxbsd arch=x86_32 $OPTIONS $OPTIONS_MONO tools=no target=release_debug
83+
$SCONS platform=linuxbsd arch=x86_32 $OPTIONS $OPTIONS_MONO tools=no target=release
8784
mkdir -p /root/out/x86_32/templates-mono
8885
cp -rvp bin/* /root/out/x86_32/templates-mono
8986
rm -rf bin

‎build-mono-glue/build.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@ tar xf ../godot.tar.gz --strip-components=1
1919
if [ "${MONO}" == "1" ]; then
2020
echo "Building and generating Mono glue..."
2121

22-
mono --version
22+
dotnet --info
2323
export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/usr/lib/pkgconfig/
2424

25-
${SCONS} platform=linuxbsd bits=64 ${OPTIONS} target=release_debug tools=yes module_mono_enabled=yes mono_glue=no
25+
${SCONS} platform=linuxbsd ${OPTIONS} target=release_debug tools=yes module_mono_enabled=yes
2626

2727
rm -rf /root/mono-glue/*
28-
bin/godot.linuxbsd.opt.tools.64.mono --display-driver headless --audio-driver Dummy --generate-mono-glue /root/mono-glue || /bin/true
28+
bin/godot.linuxbsd.opt.tools.x86_64.mono --headless --generate-mono-glue /root/mono-glue
2929
fi
3030

3131
echo "Mono glue generated successfully"

‎build-web/build.sh

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,11 @@ set -e
66

77
export SCONS="scons -j${NUM_CORES} verbose=yes warnings=no progress=no"
88
export OPTIONS="production=yes use_thinlto=yes"
9-
export OPTIONS_MONO="module_mono_enabled=yes mono_static=yes mono_prefix=/root/mono-installs/wasm-runtime-release use_lto=no use_thinlto=no"
9+
export OPTIONS_MONO="module_mono_enabled=yes"
1010
export TERM=xterm
1111

12+
source /root/emsdk/emsdk_env.sh
13+
1214
rm -rf godot
1315
mkdir godot
1416
cd godot
@@ -19,8 +21,6 @@ tar xf /root/godot.tar.gz --strip-components=1
1921
if [ "${CLASSICAL}" == "1" ]; then
2022
echo "Starting classical build for Web..."
2123

22-
source /root/emsdk_${EMSCRIPTEN_CLASSICAL}/emsdk_env.sh
23-
2424
$SCONS platform=web ${OPTIONS} target=release_debug tools=no
2525
$SCONS platform=web ${OPTIONS} target=release tools=no
2626

@@ -36,29 +36,22 @@ if [ "${CLASSICAL}" == "1" ]; then
3636
mkdir -p /root/out/tools
3737
cp -rvp bin/*.zip /root/out/tools
3838
rm -f bin/*.zip
39-
4039
fi
4140

4241
# Mono
4342

4443
if [ "${MONO}" == "1" ]; then
4544
echo "Starting Mono build for Web..."
4645

47-
source /root/emsdk_${EMSCRIPTEN_MONO}/emsdk_env.sh
48-
4946
cp /root/mono-glue/*.cpp modules/mono/glue/
5047
cp -r /root/mono-glue/GodotSharp/GodotSharp/Generated modules/mono/glue/GodotSharp/GodotSharp/
51-
cp -r /root/mono-glue/GodotSharp/GodotSharpEditor/Generated modules/mono/glue/GodotSharp/GodotSharpEditor/
5248

5349
$SCONS platform=web ${OPTIONS} ${OPTIONS_MONO} target=release_debug tools=no
5450
$SCONS platform=web ${OPTIONS} ${OPTIONS_MONO} target=release tools=no
5551

5652
mkdir -p /root/out/templates-mono
5753
cp -rvp bin/*.zip /root/out/templates-mono
5854
rm -f bin/*.zip
59-
60-
mkdir -p /root/out/templates-mono/bcl
61-
cp -r /root/mono-installs/wasm-bcl/wasm /root/out/templates-mono/bcl/
6255
fi
6356

6457
echo "Web build successful"

‎build-windows/build.sh

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@ set -e
66

77
export SCONS="scons -j${NUM_CORES} verbose=yes warnings=no progress=no"
88
export OPTIONS="production=yes"
9-
export OPTIONS_MONO="module_mono_enabled=yes mono_static=yes"
10-
export MONO_PREFIX_X86_64="/root/mono-installs/desktop-windows-x86_64-release"
11-
export MONO_PREFIX_X86="/root/mono-installs/desktop-windows-x86-release"
9+
export OPTIONS_MONO="module_mono_enabled=yes"
1210
export TERM=xterm
1311

1412
rm -rf godot
@@ -49,32 +47,29 @@ fi
4947
if [ "${MONO}" == "1" ]; then
5048
echo "Starting Mono build for Windows..."
5149

52-
cp /root/mono-glue/*.cpp modules/mono/glue/
5350
cp -r /root/mono-glue/GodotSharp/GodotSharp/Generated modules/mono/glue/GodotSharp/GodotSharp/
5451
cp -r /root/mono-glue/GodotSharp/GodotSharpEditor/Generated modules/mono/glue/GodotSharp/GodotSharpEditor/
5552

56-
export OPTIONS_MONO_PREFIX="${OPTIONS} ${OPTIONS_MONO} mono_prefix=${MONO_PREFIX_X86_64}"
57-
58-
$SCONS platform=windows arch=x86_64 $OPTIONS_MONO_PREFIX tools=yes target=release_debug copy_mono_root=yes
53+
$SCONS platform=windows arch=x86_64 $OPTIONS $OPTIONS_MONO tools=yes target=release_debug
54+
./modules/mono/build_scripts/build_assemblies.py --godot-output-dir=./bin --godot-platform=windows
5955
mkdir -p /root/out/x86_64/tools-mono
6056
cp -rvp bin/* /root/out/x86_64/tools-mono
6157
rm -rf bin
6258

63-
$SCONS platform=windows arch=x86_64 $OPTIONS_MONO_PREFIX tools=no target=release_debug
64-
$SCONS platform=windows arch=x86_64 $OPTIONS_MONO_PREFIX tools=no target=release
59+
$SCONS platform=windows arch=x86_64 $OPTIONS $OPTIONS_MONO tools=no target=release_debug
60+
$SCONS platform=windows arch=x86_64 $OPTIONS $OPTIONS_MONO tools=no target=release
6561
mkdir -p /root/out/x86_64/templates-mono
6662
cp -rvp bin/* /root/out/x86_64/templates-mono
6763
rm -rf bin
6864

69-
export OPTIONS_MONO_PREFIX="${OPTIONS} ${OPTIONS_MONO} mono_prefix=${MONO_PREFIX_X86}"
70-
71-
$SCONS platform=windows arch=x86_32 $OPTIONS_MONO_PREFIX tools=yes target=release_debug copy_mono_root=yes
65+
$SCONS platform=windows arch=x86_32 $OPTIONS $OPTIONS_MONO tools=yes target=release_debug
66+
./modules/mono/build_scripts/build_assemblies.py --godot-output-dir=./bin --godot-platform=windows
7267
mkdir -p /root/out/x86_32/tools-mono
7368
cp -rvp bin/* /root/out/x86_32/tools-mono
7469
rm -rf bin
7570

76-
$SCONS platform=windows arch=x86_32 $OPTIONS_MONO_PREFIX tools=no target=release_debug
77-
$SCONS platform=windows arch=x86_32 $OPTIONS_MONO_PREFIX tools=no target=release
71+
$SCONS platform=windows arch=x86_32 $OPTIONS $OPTIONS_MONO tools=no target=release_debug
72+
$SCONS platform=windows arch=x86_32 $OPTIONS $OPTIONS_MONO tools=no target=release
7873
mkdir -p /root/out/x86_32/templates-mono
7974
cp -rvp bin/* /root/out/x86_32/templates-mono
8075
rm -rf bin

‎build.sh

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ fi
122122

123123
if [ $skip_download == 0 ]; then
124124
echo "Fetching images"
125-
for image in mono-glue windows linux web; do
125+
for image in windows linux web; do
126126
if [ ${force_download} == 1 ] || ! ${podman} image exists godot/$image; then
127127
if ! ${podman} pull ${registry}/godot/${image}; then
128128
echo "ERROR: image $image does not exist and can't be downloaded"
@@ -184,13 +184,8 @@ mkdir -p ${basedir}/out/logs
184184
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/"
185185
export img_version=4.x-f36
186186

187-
# Get AOT compilers from their containers.
188-
mkdir -p ${basedir}/out/aot-compilers
189-
${podman} run -it --rm -w /root -v ${basedir}/out/aot-compilers:/root/out localhost/godot-ios:${img_version} bash -c "cp -r /root/aot-compilers/* /root/out"
190-
chmod +x ${basedir}/out/aot-compilers/*/*
191-
192187
mkdir -p ${basedir}/mono-glue
193-
${podman_run} -v ${basedir}/build-mono-glue:/root/build localhost/godot-mono-glue:${img_version} bash build/build.sh 2>&1 | tee ${basedir}/out/logs/mono-glue
188+
${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
194189

195190
mkdir -p ${basedir}/out/windows
196191
${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

0 commit comments

Comments
 (0)