From db97672d306fa1cc83d953760e8b681bf42c1e72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Fri, 31 Oct 2025 22:44:34 +0100 Subject: [PATCH] [WIP] Enable dotnet module Currently hacked on top of classical build, should be split into a separate config as initially we'll still ship separate builds with the .NET module for testing. --- build-android/build.sh | 18 +++--- build-dotnet/build.sh | 17 ++++++ build-ios/build.sh | 2 +- build-linux/build.sh | 2 +- build-macos/build.sh | 8 +-- build-release.sh | 126 ++++++++++++++++++---------------------- build-visionos/build.sh | 2 +- build-web/build.sh | 8 +-- build-windows/build.sh | 2 +- build.sh | 3 + 10 files changed, 98 insertions(+), 90 deletions(-) create mode 100755 build-dotnet/build.sh diff --git a/build-android/build.sh b/build-android/build.sh index 7abf261..5e4dc13 100755 --- a/build-android/build.sh +++ b/build-android/build.sh @@ -81,15 +81,15 @@ if [ "${CLASSICAL}" == "1" ]; then prepare_source - $SCONS platform=android arch=arm32 $OPTIONS target=template_release - $SCONS platform=android arch=arm64 $OPTIONS target=template_release - $SCONS platform=android arch=x86_32 $OPTIONS target=template_release - $SCONS platform=android arch=x86_64 $OPTIONS target=template_release separate_debug_symbols=yes # Generate native debug symbols only for the release templates. - - $SCONS platform=android arch=arm32 $OPTIONS target=template_debug - $SCONS platform=android arch=arm64 $OPTIONS target=template_debug - $SCONS platform=android arch=x86_32 $OPTIONS target=template_debug - $SCONS platform=android arch=x86_64 $OPTIONS target=template_debug + $SCONS platform=android arch=arm32 $OPTIONS module_dotnet_enabled=yes target=template_release + $SCONS platform=android arch=arm64 $OPTIONS module_dotnet_enabled=yes target=template_release + $SCONS platform=android arch=x86_32 $OPTIONS module_dotnet_enabled=yes target=template_release + $SCONS platform=android arch=x86_64 $OPTIONS module_dotnet_enabled=yes target=template_release separate_debug_symbols=yes # Generate native debug symbols only for the release templates. + + $SCONS platform=android arch=arm32 $OPTIONS module_dotnet_enabled=yes target=template_debug + $SCONS platform=android arch=arm64 $OPTIONS module_dotnet_enabled=yes target=template_debug + $SCONS platform=android arch=x86_32 $OPTIONS module_dotnet_enabled=yes target=template_debug + $SCONS platform=android arch=x86_64 $OPTIONS module_dotnet_enabled=yes target=template_debug pushd platform/android/java ./gradlew generateGodotTemplates diff --git a/build-dotnet/build.sh b/build-dotnet/build.sh new file mode 100755 index 0000000..1eca945 --- /dev/null +++ b/build-dotnet/build.sh @@ -0,0 +1,17 @@ +#!/bin/bash + +set -e + +# Config + +dnf install -y clang python-unversioned-command + +git clone https://github.com/raulsntos/godot-dotnet +cd godot-dotnet +git checkout upgrade-assistant-plus-source-code-plugin-wip + +./build.sh --productBuild --warnAsError false /p:GenerateGodotBindings=true + +cp -r artifacts/packages/Release/Shipping/* /root/out/ + +echo ".NET bindings generated successfully" diff --git a/build-ios/build.sh b/build-ios/build.sh index c3a8b77..0777913 100755 --- a/build-ios/build.sh +++ b/build-ios/build.sh @@ -7,7 +7,7 @@ set -e export SCONS="scons -j${NUM_CORES} verbose=yes warnings=no progress=no redirect_build_objects=no" # Keep LTO disabled for iOS - it works but it makes linking apps on deploy very slow, # which is seen as a regression in the current workflow. -export OPTIONS="production=yes use_lto=no SWIFT_FRONTEND=/root/.local/share/swiftly/toolchains/6.2.0/usr/bin/swift-frontend" +export OPTIONS="production=yes use_lto=no SWIFT_FRONTEND=/root/.local/share/swiftly/toolchains/6.2.0/usr/bin/swift-frontend module_dotnet_enabled=yes" export OPTIONS_MONO="module_mono_enabled=yes" export TERM=xterm diff --git a/build-linux/build.sh b/build-linux/build.sh index bb6b352..a14b648 100755 --- a/build-linux/build.sh +++ b/build-linux/build.sh @@ -5,7 +5,7 @@ set -e # Config export SCONS="scons -j${NUM_CORES} verbose=yes warnings=no progress=no redirect_build_objects=no" -export OPTIONS="production=yes accesskit_sdk_path=/root/accesskit/accesskit-c" +export OPTIONS="production=yes accesskit_sdk_path=/root/accesskit/accesskit-c module_dotnet_enabled=yes" export OPTIONS_MONO="module_mono_enabled=yes" export TERM=xterm diff --git a/build-macos/build.sh b/build-macos/build.sh index aef12fb..c43686a 100755 --- a/build-macos/build.sh +++ b/build-macos/build.sh @@ -5,7 +5,7 @@ set -e # Config export SCONS="scons -j${NUM_CORES} verbose=yes warnings=no progress=no redirect_build_objects=no" -export OPTIONS="osxcross_sdk=darwin25 production=yes use_volk=no vulkan_sdk_path=/root/moltenvk angle_libs=/root/angle accesskit_sdk_path=/root/accesskit/accesskit-c SWIFT_FRONTEND=/root/.local/share/swiftly/toolchains/6.2.0/usr/bin/swift-frontend" +export OPTIONS="osxcross_sdk=darwin25 production=yes use_volk=no vulkan_sdk_path=/root/moltenvk angle_libs=/root/angle accesskit_sdk_path=/root/accesskit/accesskit-c SWIFT_FRONTEND=/root/.local/share/swiftly/toolchains/6.2.0/usr/bin/swift-frontend module_dotnet_enabled=yes" export OPTIONS_MONO="module_mono_enabled=yes" export TERM=xterm @@ -21,7 +21,7 @@ if [ "${CLASSICAL}" == "1" ]; then $SCONS platform=macos $OPTIONS arch=x86_64 target=editor $SCONS platform=macos $OPTIONS arch=arm64 target=editor - lipo -create bin/godot.macos.editor.x86_64 bin/godot.macos.editor.arm64 -output bin/godot.macos.editor.universal + lipo -create bin/godot.macos.editor.x86_64.dotnet bin/godot.macos.editor.arm64.dotnet -output bin/godot.macos.editor.universal.dotnet mkdir -p /root/out/tools cp -rvp bin/* /root/out/tools @@ -29,10 +29,10 @@ if [ "${CLASSICAL}" == "1" ]; then $SCONS platform=macos $OPTIONS arch=x86_64 target=template_debug $SCONS platform=macos $OPTIONS arch=arm64 target=template_debug - lipo -create bin/godot.macos.template_debug.x86_64 bin/godot.macos.template_debug.arm64 -output bin/godot.macos.template_debug.universal + lipo -create bin/godot.macos.template_debug.x86_64.dotnet bin/godot.macos.template_debug.arm64.dotnet -output bin/godot.macos.template_debug.universal.dotnet $SCONS platform=macos $OPTIONS arch=x86_64 target=template_release $SCONS platform=macos $OPTIONS arch=arm64 target=template_release - lipo -create bin/godot.macos.template_release.x86_64 bin/godot.macos.template_release.arm64 -output bin/godot.macos.template_release.universal + lipo -create bin/godot.macos.template_release.x86_64.dotnet bin/godot.macos.template_release.arm64.dotnet -output bin/godot.macos.template_release.universal.dotnet mkdir -p /root/out/templates cp -rvp bin/* /root/out/templates diff --git a/build-release.sh b/build-release.sh index 5c7ae32..d0fc190 100755 --- a/build-release.sh +++ b/build-release.sh @@ -13,7 +13,7 @@ source ./config.sh can_sign_windows=0 if [ ! -z "${WINDOWS_SIGN_NAME}" ] && [ ! -z "${WINDOWS_SIGN_URL}" ] && [[ $(type -P "osslsigncode") ]]; then - can_sign_windows=1 + can_sign_windows=0 else echo "Disabling Windows binary signing as config.sh does not define the required data (WINDOWS_SIGN_NAME, WINDOWS_SIGN_URL), or osslsigncode can't be found in PATH." fi @@ -149,9 +149,6 @@ done if [ -z "${godot_version}" -o -z "${templates_version}" ]; then echo "Mandatory argument -v or -t missing." exit 1 -elif [[ "{$templates_version}" == *"-"* ]]; then - echo "Templates version (-t) shouldn't contain '-'. It should use a dot to separate version from status." - exit 1 fi export reldir="${basedir}/releases/${godot_version}" @@ -202,23 +199,23 @@ if [ "${build_classical}" == "1" ]; then ## Linux (Classical) ## # Editor - binname="${godot_basename}_linux.x86_64" - cp out/linux/x86_64/tools/godot.linuxbsd.editor.x86_64 ${binname} + binname="${godot_basename}_dotnet_linux.x86_64" + cp out/linux/x86_64/tools/godot.linuxbsd.editor.x86_64.dotnet ${binname} zip -q -9 "${reldir}/${binname}.zip" ${binname} rm ${binname} - binname="${godot_basename}_linux.x86_32" - cp out/linux/x86_32/tools/godot.linuxbsd.editor.x86_32 ${binname} + binname="${godot_basename}_dotnet_linux.x86_32" + cp out/linux/x86_32/tools/godot.linuxbsd.editor.x86_32.dotnet ${binname} zip -q -9 "${reldir}/${binname}.zip" ${binname} rm ${binname} - binname="${godot_basename}_linux.arm64" - cp out/linux/arm64/tools/godot.linuxbsd.editor.arm64 ${binname} + binname="${godot_basename}_dotnet_linux.arm64" + cp out/linux/arm64/tools/godot.linuxbsd.editor.arm64.dotnet ${binname} zip -q -9 "${reldir}/${binname}.zip" ${binname} rm ${binname} - binname="${godot_basename}_linux.arm32" - cp out/linux/arm32/tools/godot.linuxbsd.editor.arm32 ${binname} + binname="${godot_basename}_dotnet_linux.arm32" + cp out/linux/arm32/tools/godot.linuxbsd.editor.arm32.dotnet ${binname} zip -q -9 "${reldir}/${binname}.zip" ${binname} rm ${binname} @@ -230,67 +227,67 @@ if [ "${build_classical}" == "1" ]; then fi # Templates - cp out/linux/x86_64/templates/godot.linuxbsd.template_release.x86_64 ${templatesdir}/linux_release.x86_64 - cp out/linux/x86_64/templates/godot.linuxbsd.template_debug.x86_64 ${templatesdir}/linux_debug.x86_64 - cp out/linux/x86_32/templates/godot.linuxbsd.template_release.x86_32 ${templatesdir}/linux_release.x86_32 - cp out/linux/x86_32/templates/godot.linuxbsd.template_debug.x86_32 ${templatesdir}/linux_debug.x86_32 - cp out/linux/arm64/templates/godot.linuxbsd.template_release.arm64 ${templatesdir}/linux_release.arm64 - cp out/linux/arm64/templates/godot.linuxbsd.template_debug.arm64 ${templatesdir}/linux_debug.arm64 - cp out/linux/arm32/templates/godot.linuxbsd.template_release.arm32 ${templatesdir}/linux_release.arm32 - cp out/linux/arm32/templates/godot.linuxbsd.template_debug.arm32 ${templatesdir}/linux_debug.arm32 + cp out/linux/x86_64/templates/godot.linuxbsd.template_release.x86_64.dotnet ${templatesdir}/linux_release.x86_64 + cp out/linux/x86_64/templates/godot.linuxbsd.template_debug.x86_64.dotnet ${templatesdir}/linux_debug.x86_64 + cp out/linux/x86_32/templates/godot.linuxbsd.template_release.x86_32.dotnet ${templatesdir}/linux_release.x86_32 + cp out/linux/x86_32/templates/godot.linuxbsd.template_debug.x86_32.dotnet ${templatesdir}/linux_debug.x86_32 + cp out/linux/arm64/templates/godot.linuxbsd.template_release.arm64.dotnet ${templatesdir}/linux_release.arm64 + cp out/linux/arm64/templates/godot.linuxbsd.template_debug.arm64.dotnet ${templatesdir}/linux_debug.arm64 + cp out/linux/arm32/templates/godot.linuxbsd.template_release.arm32.dotnet ${templatesdir}/linux_release.arm32 + cp out/linux/arm32/templates/godot.linuxbsd.template_debug.arm32.dotnet ${templatesdir}/linux_debug.arm32 ## Windows (Classical) ## # Editor - binname="${godot_basename}_win64.exe" - wrpname="${godot_basename}_win64_console.exe" - cp out/windows/x86_64/tools/godot.windows.editor.x86_64.exe ${binname} + binname="${godot_basename}_dotnet_win64.exe" + wrpname="${godot_basename}_dotnet_win64_console.exe" + cp out/windows/x86_64/tools/godot.windows.editor.x86_64.dotnet.exe ${binname} sign_windows ${binname} - cp out/windows/x86_64/tools/godot.windows.editor.x86_64.console.exe ${wrpname} + cp out/windows/x86_64/tools/godot.windows.editor.x86_64.dotnet.console.exe ${wrpname} sign_windows ${wrpname} zip -q -9 "${reldir}/${binname}.zip" ${binname} ${wrpname} rm ${binname} ${wrpname} - binname="${godot_basename}_win32.exe" - wrpname="${godot_basename}_win32_console.exe" - cp out/windows/x86_32/tools/godot.windows.editor.x86_32.exe ${binname} + binname="${godot_basename}_dotnet_win32.exe" + wrpname="${godot_basename}_dotnet_win32_console.exe" + cp out/windows/x86_32/tools/godot.windows.editor.x86_32.dotnet.exe ${binname} sign_windows ${binname} - cp out/windows/x86_32/tools/godot.windows.editor.x86_32.console.exe ${wrpname} + cp out/windows/x86_32/tools/godot.windows.editor.x86_32.dotnet.console.exe ${wrpname} sign_windows ${wrpname} zip -q -9 "${reldir}/${binname}.zip" ${binname} ${wrpname} rm ${binname} ${wrpname} - binname="${godot_basename}_windows_arm64.exe" - wrpname="${godot_basename}_windows_arm64_console.exe" - cp out/windows/arm64/tools/godot.windows.editor.arm64.llvm.exe ${binname} + binname="${godot_basename}_dotnet_windows_arm64.exe" + wrpname="${godot_basename}_dotnet_windows_arm64_console.exe" + cp out/windows/arm64/tools/godot.windows.editor.arm64.llvm.dotnet.exe ${binname} sign_windows ${binname} - cp out/windows/arm64/tools/godot.windows.editor.arm64.llvm.console.exe ${wrpname} + cp out/windows/arm64/tools/godot.windows.editor.arm64.llvm.dotnet.console.exe ${wrpname} sign_windows ${wrpname} zip -q -9 "${reldir}/${binname}.zip" ${binname} ${wrpname} rm ${binname} ${wrpname} # Templates - cp out/windows/x86_64/templates/godot.windows.template_release.x86_64.exe ${templatesdir}/windows_release_x86_64.exe - cp out/windows/x86_64/templates/godot.windows.template_debug.x86_64.exe ${templatesdir}/windows_debug_x86_64.exe - cp out/windows/x86_32/templates/godot.windows.template_release.x86_32.exe ${templatesdir}/windows_release_x86_32.exe - cp out/windows/x86_32/templates/godot.windows.template_debug.x86_32.exe ${templatesdir}/windows_debug_x86_32.exe - cp out/windows/arm64/templates/godot.windows.template_release.arm64.llvm.exe ${templatesdir}/windows_release_arm64.exe - cp out/windows/arm64/templates/godot.windows.template_debug.arm64.llvm.exe ${templatesdir}/windows_debug_arm64.exe - cp out/windows/x86_64/templates/godot.windows.template_release.x86_64.console.exe ${templatesdir}/windows_release_x86_64_console.exe - cp out/windows/x86_64/templates/godot.windows.template_debug.x86_64.console.exe ${templatesdir}/windows_debug_x86_64_console.exe - cp out/windows/x86_32/templates/godot.windows.template_release.x86_32.console.exe ${templatesdir}/windows_release_x86_32_console.exe - cp out/windows/x86_32/templates/godot.windows.template_debug.x86_32.console.exe ${templatesdir}/windows_debug_x86_32_console.exe - cp out/windows/arm64/templates/godot.windows.template_release.arm64.llvm.console.exe ${templatesdir}/windows_release_arm64_console.exe - cp out/windows/arm64/templates/godot.windows.template_debug.arm64.llvm.console.exe ${templatesdir}/windows_debug_arm64_console.exe + cp out/windows/x86_64/templates/godot.windows.template_release.x86_64.dotnet.exe ${templatesdir}/windows_release_x86_64.exe + cp out/windows/x86_64/templates/godot.windows.template_debug.x86_64.dotnet.exe ${templatesdir}/windows_debug_x86_64.exe + cp out/windows/x86_32/templates/godot.windows.template_release.x86_32.dotnet.exe ${templatesdir}/windows_release_x86_32.exe + cp out/windows/x86_32/templates/godot.windows.template_debug.x86_32.dotnet.exe ${templatesdir}/windows_debug_x86_32.exe + cp out/windows/arm64/templates/godot.windows.template_release.arm64.llvm.dotnet.exe ${templatesdir}/windows_release_arm64.exe + cp out/windows/arm64/templates/godot.windows.template_debug.arm64.llvm.dotnet.exe ${templatesdir}/windows_debug_arm64.exe + cp out/windows/x86_64/templates/godot.windows.template_release.x86_64.dotnet.console.exe ${templatesdir}/windows_release_x86_64_console.exe + cp out/windows/x86_64/templates/godot.windows.template_debug.x86_64.dotnet.console.exe ${templatesdir}/windows_debug_x86_64_console.exe + cp out/windows/x86_32/templates/godot.windows.template_release.x86_32.dotnet.console.exe ${templatesdir}/windows_release_x86_32_console.exe + cp out/windows/x86_32/templates/godot.windows.template_debug.x86_32.dotnet.console.exe ${templatesdir}/windows_debug_x86_32_console.exe + cp out/windows/arm64/templates/godot.windows.template_release.arm64.llvm.dotnet.console.exe ${templatesdir}/windows_release_arm64_console.exe + cp out/windows/arm64/templates/godot.windows.template_debug.arm64.llvm.dotnet.console.exe ${templatesdir}/windows_debug_arm64_console.exe ## macOS (Classical) ## # Editor - binname="${godot_basename}_macos.universal" + binname="${godot_basename}_dotnet_macos.universal" rm -rf Godot.app cp -r git/misc/dist/macos_tools.app Godot.app mkdir -p Godot.app/Contents/MacOS - cp out/macos/tools/godot.macos.editor.universal Godot.app/Contents/MacOS/Godot + cp out/macos/tools/godot.macos.editor.universal.dotnet Godot.app/Contents/MacOS/Godot chmod +x Godot.app/Contents/MacOS/Godot zip -q -9 -r "${reldir}/${binname}.zip" Godot.app rm -rf Godot.app @@ -301,8 +298,8 @@ if [ "${build_classical}" == "1" ]; then cp -r git/misc/dist/macos_template.app . mkdir -p macos_template.app/Contents/MacOS - cp out/macos/templates/godot.macos.template_release.universal macos_template.app/Contents/MacOS/godot_macos_release.universal - cp out/macos/templates/godot.macos.template_debug.universal macos_template.app/Contents/MacOS/godot_macos_debug.universal + cp out/macos/templates/godot.macos.template_release.universal.dotnet macos_template.app/Contents/MacOS/godot_macos_release.universal + cp out/macos/templates/godot.macos.template_debug.universal.dotnet macos_template.app/Contents/MacOS/godot_macos_debug.universal chmod +x macos_template.app/Contents/MacOS/godot_macos* zip -q -9 -r "${templatesdir}/macos.zip" macos_template.app rm -rf macos_template.app @@ -324,12 +321,6 @@ if [ "${build_classical}" == "1" ]; then ## Web (Classical) ## - # Editor - unzip out/web/tools/godot.web.editor.wasm32.zip -d ${webdir}/ - brotli --keep --force --quality=11 ${webdir}/* - binname="${godot_basename}_web_editor.zip" - cp out/web/tools/godot.web.editor.wasm32.zip ${reldir}/${binname} - # Templates cp out/web/templates/godot.web.template_release.wasm32.zip ${templatesdir}/web_release.zip cp out/web/templates/godot.web.template_debug.wasm32.zip ${templatesdir}/web_debug.zip @@ -337,34 +328,23 @@ if [ "${build_classical}" == "1" ]; then cp out/web/templates/godot.web.template_release.wasm32.nothreads.zip ${templatesdir}/web_nothreads_release.zip cp out/web/templates/godot.web.template_debug.wasm32.nothreads.zip ${templatesdir}/web_nothreads_debug.zip - cp out/web/templates/godot.web.template_release.wasm32.dlink.zip ${templatesdir}/web_dlink_release.zip - cp out/web/templates/godot.web.template_debug.wasm32.dlink.zip ${templatesdir}/web_dlink_debug.zip + cp out/web/templates/godot.web.template_release.wasm32.dlink.dotnet.zip ${templatesdir}/web_dlink_release.zip + cp out/web/templates/godot.web.template_debug.wasm32.dlink.dotnet.zip ${templatesdir}/web_dlink_debug.zip - cp out/web/templates/godot.web.template_release.wasm32.nothreads.dlink.zip ${templatesdir}/web_dlink_nothreads_release.zip - cp out/web/templates/godot.web.template_debug.wasm32.nothreads.dlink.zip ${templatesdir}/web_dlink_nothreads_debug.zip + cp out/web/templates/godot.web.template_release.wasm32.nothreads.dlink.dotnet.zip ${templatesdir}/web_dlink_nothreads_release.zip + cp out/web/templates/godot.web.template_debug.wasm32.nothreads.dlink.dotnet.zip ${templatesdir}/web_dlink_nothreads_debug.zip ## Android (Classical) ## # Lib for direct download cp out/android/templates/godot-lib.template_release.aar ${reldir}/godot-lib.${templates_version}.template_release.aar - # Editor - binname="${godot_basename}_android_editor.apk" - cp out/android/tools/android_editor.apk ${reldir}/${binname} - binname="${godot_basename}_android_editor_horizonos.apk" - cp out/android/tools/android_editor_horizonos.apk ${reldir}/${binname} - binname="${godot_basename}_android_editor_picoos.apk" - cp out/android/tools/android_editor_picoos.apk ${reldir}/${binname} - binname="${godot_basename}_android_editor.aab" - cp out/android/tools/android_editor.aab ${reldir}/${binname} - # Templates cp out/android/templates/*.apk ${templatesdir}/ cp out/android/templates/android_source.zip ${templatesdir}/ # Native debug symbols cp out/android/templates/android_release_template_native_debug_symbols.zip ${reldir}/Godot_native_debug_symbols.${templates_version}.template_release.android.zip - cp out/android/tools/android_editor_native_debug_symbols.zip ${reldir}/Godot_native_debug_symbols.${templates_version}.editor.android.zip ## iOS (Classical) ## @@ -392,6 +372,14 @@ if [ "${build_classical}" == "1" ]; then #cd .. #rm -rf visionos_xcode + ## .NET bindings ## + + dotnetname="godot-dotnet-${templates_version}" + mkdir ${dotnetname} + cp out/dotnet/* ${dotnetname}/ + zip -q -9 -r "${reldir}/${dotnetname}.zip" ${dotnetname} + rm -rf ${dotnetname} + ## Templates TPZ (Classical) ## echo "${templates_version}" > ${templatesdir}/version.txt diff --git a/build-visionos/build.sh b/build-visionos/build.sh index 725bb59..8cf0bf2 100755 --- a/build-visionos/build.sh +++ b/build-visionos/build.sh @@ -8,7 +8,7 @@ export SCONS="scons -j${NUM_CORES} verbose=yes warnings=no progress=no redirect_ # Keep LTO disabled for visionOS - it works but it makes linking apps on deploy very slow, # which is seen as a regression in the current workflow. # Disable Vulkan and MoltenVK for visionOS - visionOS doesn't support MoltenVK. -export OPTIONS="production=yes use_lto=no vulkan=no SWIFT_FRONTEND=/root/.local/share/swiftly/toolchains/6.2.0/usr/bin/swift-frontend" +export OPTIONS="production=yes use_lto=no vulkan=no SWIFT_FRONTEND=/root/.local/share/swiftly/toolchains/6.2.0/usr/bin/swift-frontend module_dotnet_enabled=yes" export OPTIONS_MONO="module_mono_enabled=yes" export TERM=xterm diff --git a/build-web/build.sh b/build-web/build.sh index 531fc7e..ebd3579 100755 --- a/build-web/build.sh +++ b/build-web/build.sh @@ -10,14 +10,14 @@ export NUM_JOBS=5 declare -a JOBS=( "target=template_debug" "target=template_release" - "target=template_debug dlink_enabled=yes" - "target=template_release dlink_enabled=yes" + "target=template_debug dlink_enabled=yes module_dotnet_enabled=yes" + "target=template_release dlink_enabled=yes module_dotnet_enabled=yes" ) declare -a JOBS_NOTHREADS=( "target=template_debug threads=no" "target=template_release threads=no" - "target=template_debug dlink_enabled=yes threads=no" - "target=template_release dlink_enabled=yes threads=no" + "target=template_debug dlink_enabled=yes threads=no module_dotnet_enabled=yes" + "target=template_release dlink_enabled=yes threads=no module_dotnet_enabled=yes" ) export SCONS="scons -j$(expr ${NUM_CORES} / ${NUM_JOBS}) verbose=yes warnings=no progress=no redirect_build_objects=no" diff --git a/build-windows/build.sh b/build-windows/build.sh index c0ccaaa..10af991 100755 --- a/build-windows/build.sh +++ b/build-windows/build.sh @@ -5,7 +5,7 @@ set -e # Config export SCONS="scons -j${NUM_CORES} verbose=yes warnings=no progress=no redirect_build_objects=no" -export OPTIONS="production=yes use_mingw=yes angle_libs=/root/angle mesa_libs=/root/mesa d3d12=yes accesskit_sdk_path=/root/accesskit/accesskit-c" +export OPTIONS="production=yes use_mingw=yes angle_libs=/root/angle mesa_libs=/root/mesa d3d12=yes accesskit_sdk_path=/root/accesskit/accesskit-c module_dotnet_enabled=yes" export OPTIONS_MONO="module_mono_enabled=yes" export OPTIONS_LLVM="use_llvm=yes mingw_prefix=/root/llvm-mingw" export TERM=xterm diff --git a/build.sh b/build.sh index cebe58c..bd7a9e2 100755 --- a/build.sh +++ b/build.sh @@ -253,6 +253,9 @@ export img_version=$IMAGE_VERSION mkdir -p ${basedir}/mono-glue ${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 +mkdir -p ${basedir}/out/dotnet +${podman_run} -v ${basedir}/build-dotnet:/root/build -v ${basedir}/out/dotnet:/root/out localhost/godot-linux:${img_version} bash build/build.sh 2>&1 | tee ${basedir}/out/logs/dotnet + mkdir -p ${basedir}/out/windows ${podman_run} -v ${basedir}/build-windows:/root/build -v ${basedir}/out/windows:/root/out -v ${basedir}/deps/angle:/root/angle -v ${basedir}/deps/mesa:/root/mesa -v ${basedir}/deps/accesskit:/root/accesskit --env STEAM=${build_steam} localhost/godot-windows:${img_version} bash build/build.sh 2>&1 | tee ${basedir}/out/logs/windows