From 26650c2743b0eb0936802407ca2ee9adf6d2094f Mon Sep 17 00:00:00 2001 From: Spartan322 Date: Fri, 1 Nov 2024 17:17:49 -0400 Subject: [PATCH] Rebrand godot references to redot --- .gitignore | 2 +- README.md | 14 +-- build-android/build.sh | 14 +-- build-android/upload-mavencentral.sh | 8 +- build-ios/build.sh | 8 +- build-linux/build.sh | 8 +- build-macos/build.sh | 20 +-- build-mono-glue/build.sh | 10 +- build-release.sh | 178 +++++++++++++-------------- build-web/build.sh | 24 ++-- build-windows/build.sh | 8 +- build.sh | 16 +-- clean.sh | 2 +- 13 files changed, 156 insertions(+), 156 deletions(-) diff --git a/.gitignore b/.gitignore index b97e1be..1e66026 100644 --- a/.gitignore +++ b/.gitignore @@ -9,7 +9,7 @@ angle/ deps/ git/ mono-glue/ -godot*.tar.gz +redot*.tar.gz angle.7z # Output diff --git a/README.md b/README.md index d0be374..e0f932c 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ -# Godot in-container build scripts +# Redot in-container build scripts -Build scripts used for official Godot Engine releases using containers -built from https://github.com/godotengine/build-containers +Build scripts used for official Redot Engine releases using containers +built from https://github.com/Redot-Engine/build-containers ## Disclaimer @@ -14,7 +14,7 @@ this in a simple and user-friendly interface. ## Usage -- Build containers using https://github.com/godotengine/build-containers +- Build containers using https://github.com/Redot-Engine/build-containers - Copy `config.sh.in` as `config.sh` and configure it as you want. - Edit `build.sh` to properly reference those containers if local, or use `config.sh` to point to your own registry if you uploaded @@ -22,10 +22,10 @@ this in a simple and user-friendly interface. - Build with `build.sh` (check `--help` for usage). - Package binaries with `build-release.sh` (check `--help` for usage). -Example that builds Godot 3.2-stable Classical (not Mono): +Example that builds Redot 4.3-stable Classical (not Mono): ``` -./build.sh -v 3.2-stable -g 3.2-stable -b classical -./build-release.sh -v 3.2-stable -t 3.2.stable -b classical +./build.sh -v 4.3-stable -g 4.3-stable -b classical +./build-release.sh -v 4.3-stable -t 4.3.stable -b classical ``` Again, this is intended for release managers and usability is not the diff --git a/build-android/build.sh b/build-android/build.sh index 6710706..295dc4d 100755 --- a/build-android/build.sh +++ b/build-android/build.sh @@ -9,10 +9,10 @@ export OPTIONS="production=yes" export OPTIONS_MONO="module_mono_enabled=yes" export TERM=xterm -rm -rf godot -mkdir godot -cd godot -tar xf /root/godot.tar.gz --strip-components=1 +rm -rf redot +mkdir redot +cd redot +tar xf /root/redot.tar.gz --strip-components=1 # Environment variables and keystore needed for signing store editor build, # as well as signing and publishing to MavenCentral. @@ -57,8 +57,8 @@ if [ "${CLASSICAL}" == "1" ]; then # Restart from a clean tarball, as we'll copy all the contents # outside the container for the MavenCentral upload. - rm -rf /root/godot/* - tar xf /root/godot.tar.gz --strip-components=1 + rm -rf /root/redot/* + tar xf /root/redot.tar.gz --strip-components=1 $SCONS platform=android arch=arm32 $OPTIONS target=template_debug $SCONS platform=android arch=arm32 $OPTIONS target=template_release @@ -78,7 +78,7 @@ if [ "${CLASSICAL}" == "1" ]; then if [ "$store_release" == "yes" ]; then # Copy source folder with compiled libs so we can optionally use it # in a separate script to upload the templates to MavenCentral. - cp -r /root/godot /root/out/source/ + cp -r /root/redot /root/out/source/ # Backup ~/.gradle too so we can reuse all the downloaded stuff. cp -r /root/.gradle /root/out/source/.gradle fi diff --git a/build-android/upload-mavencentral.sh b/build-android/upload-mavencentral.sh index 9b43e6a..610aabc 100755 --- a/build-android/upload-mavencentral.sh +++ b/build-android/upload-mavencentral.sh @@ -10,9 +10,9 @@ source ${basedir}/deps/keystore/config.sh # Release the Godot Android library to MavenCentral ${PODMAN} run -it --rm \ - -v ${basedir}/out/android/source:/root/godot -v ${basedir}/deps/keystore:/root/keystore \ - localhost/godot-android:${IMAGE_VERSION} bash -c \ + -v ${basedir}/out/android/source:/root/redot -v ${basedir}/deps/keystore:/root/keystore \ + localhost/redot-android:${IMAGE_VERSION} bash -c \ "source /root/keystore/config.sh && \ - cp -r /root/godot/.gradle /root && \ - cd /root/godot/platform/android/java && \ + cp -r /root/redot/.gradle /root && \ + cd /root/redot/platform/android/java && \ ./gradlew publishTemplateReleasePublicationToSonatypeRepository --max-workers 1 closeAndReleaseSonatypeStagingRepository" diff --git a/build-ios/build.sh b/build-ios/build.sh index 09129d6..cb1b418 100755 --- a/build-ios/build.sh +++ b/build-ios/build.sh @@ -14,10 +14,10 @@ export TERM=xterm export IOS_SDK="17.5" export IOS_LIPO="/root/ioscross/arm64/bin/arm-apple-darwin11-lipo" -rm -rf godot -mkdir godot -cd godot -tar xf /root/godot.tar.gz --strip-components=1 +rm -rf redot +mkdir redot +cd redot +tar xf /root/redot.tar.gz --strip-components=1 # Classical diff --git a/build-linux/build.sh b/build-linux/build.sh index 6f436d8..8fcdbff 100755 --- a/build-linux/build.sh +++ b/build-linux/build.sh @@ -9,10 +9,10 @@ export OPTIONS="production=yes" export OPTIONS_MONO="module_mono_enabled=yes" export TERM=xterm -rm -rf godot -mkdir godot -cd godot -tar xf /root/godot.tar.gz --strip-components=1 +rm -rf redot +mkdir redot +cd redot +tar xf /root/redot.tar.gz --strip-components=1 # Classical diff --git a/build-macos/build.sh b/build-macos/build.sh index 4d4659e..aae14f7 100755 --- a/build-macos/build.sh +++ b/build-macos/build.sh @@ -9,10 +9,10 @@ export OPTIONS="osxcross_sdk=darwin23.6 production=yes use_volk=no vulkan_sdk_pa export OPTIONS_MONO="module_mono_enabled=yes" export TERM=xterm -rm -rf godot -mkdir godot -cd godot -tar xf /root/godot.tar.gz --strip-components=1 +rm -rf redot +mkdir redot +cd redot +tar xf /root/redot.tar.gz --strip-components=1 # Classical @@ -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/redot.macos.editor.x86_64 bin/redot.macos.editor.arm64 -output bin/redot.macos.editor.universal 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/redot.macos.template_debug.x86_64 bin/redot.macos.template_debug.arm64 -output bin/redot.macos.template_debug.universal $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/redot.macos.template_release.x86_64 bin/redot.macos.template_release.arm64 -output bin/redot.macos.template_release.universal mkdir -p /root/out/templates cp -rvp bin/* /root/out/templates @@ -49,7 +49,7 @@ if [ "${MONO}" == "1" ]; then $SCONS platform=macos $OPTIONS $OPTIONS_MONO arch=x86_64 target=editor $SCONS platform=macos $OPTIONS $OPTIONS_MONO arch=arm64 target=editor - lipo -create bin/godot.macos.editor.x86_64.mono bin/godot.macos.editor.arm64.mono -output bin/godot.macos.editor.universal.mono + lipo -create bin/redot.macos.editor.x86_64.mono bin/redot.macos.editor.arm64.mono -output bin/redot.macos.editor.universal.mono ./modules/mono/build_scripts/build_assemblies.py --godot-output-dir=./bin --godot-platform=macos mkdir -p /root/out/tools-mono @@ -58,10 +58,10 @@ if [ "${MONO}" == "1" ]; then $SCONS platform=macos $OPTIONS $OPTIONS_MONO arch=x86_64 target=template_debug $SCONS platform=macos $OPTIONS $OPTIONS_MONO arch=arm64 target=template_debug - lipo -create bin/godot.macos.template_debug.x86_64.mono bin/godot.macos.template_debug.arm64.mono -output bin/godot.macos.template_debug.universal.mono + lipo -create bin/redot.macos.template_debug.x86_64.mono bin/redot.macos.template_debug.arm64.mono -output bin/redot.macos.template_debug.universal.mono $SCONS platform=macos $OPTIONS $OPTIONS_MONO arch=x86_64 target=template_release $SCONS platform=macos $OPTIONS $OPTIONS_MONO arch=arm64 target=template_release - lipo -create bin/godot.macos.template_release.x86_64.mono bin/godot.macos.template_release.arm64.mono -output bin/godot.macos.template_release.universal.mono + lipo -create bin/redot.macos.template_release.x86_64.mono bin/redot.macos.template_release.arm64.mono -output bin/redot.macos.template_release.universal.mono mkdir -p /root/out/templates-mono cp -rvp bin/* /root/out/templates-mono diff --git a/build-mono-glue/build.sh b/build-mono-glue/build.sh index 9c983ad..c741361 100755 --- a/build-mono-glue/build.sh +++ b/build-mono-glue/build.sh @@ -10,10 +10,10 @@ export TERM=xterm export DISPLAY=:0 export PATH="${GODOT_SDK_LINUX_X86_64}/bin:${BASE_PATH}" -rm -rf godot -mkdir godot -cd godot -tar xf ../godot.tar.gz --strip-components=1 +rm -rf redot +mkdir redot +cd redot +tar xf ../redot.tar.gz --strip-components=1 # Mono @@ -25,7 +25,7 @@ if [ "${MONO}" == "1" ]; then ${SCONS} platform=linuxbsd ${OPTIONS} target=editor module_mono_enabled=yes rm -rf /root/mono-glue/* - bin/godot.linuxbsd.editor.x86_64.mono --headless --generate-mono-glue /root/mono-glue + bin/redot.linuxbsd.editor.x86_64.mono --headless --generate-mono-glue /root/mono-glue fi echo "Mono glue generated successfully" diff --git a/build-release.sh b/build-release.sh index bb61150..5f0c277 100755 --- a/build-release.sh +++ b/build-release.sh @@ -33,10 +33,10 @@ sign_macos() { _is_mono="$3" if [[ "${_is_mono}" == "1" ]]; then - _appname="Godot_mono.app" + _appname="Redot_mono.app" _sharpdir="${_appname}/Contents/Resources/GodotSharp" else - _appname="Godot.app" + _appname="Redot.app" fi scp "${_reldir}/${_binname}.zip" "${OSX_HOST}:${_macos_tmpdir}" @@ -202,7 +202,7 @@ export tmpdir="${basedir}/tmp" export templatesdir="${tmpdir}/templates" export templatesdir_mono="${tmpdir}/mono/templates" -export godot_basename="Godot_v${godot_version}" +export godot_basename="Redot_v${godot_version}" # Cleanup and setup @@ -224,9 +224,9 @@ fi if [ "${make_tarball}" == "1" ]; then - zcat godot-${godot_version}.tar.gz | xz -c > ${reldir}/godot-${godot_version}.tar.xz + zcat redot-${godot_version}.tar.gz | xz -c > ${reldir}/redot-${godot_version}.tar.xz pushd ${reldir} - sha256sum godot-${godot_version}.tar.xz > godot-${godot_version}.tar.xz.sha256 + sha256sum redot-${godot_version}.tar.xz > redot-${godot_version}.tar.xz.sha256 popd fi @@ -239,90 +239,90 @@ if [ "${build_classical}" == "1" ]; then # Editor binname="${godot_basename}_linux.x86_64" - cp out/linux/x86_64/tools/godot.linuxbsd.editor.x86_64 ${binname} + cp out/linux/x86_64/tools/redot.linuxbsd.editor.x86_64 ${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} + cp out/linux/x86_32/tools/redot.linuxbsd.editor.x86_32 ${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} + cp out/linux/arm64/tools/redot.linuxbsd.editor.arm64 ${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} + cp out/linux/arm32/tools/redot.linuxbsd.editor.arm32 ${binname} zip -q -9 "${reldir}/${binname}.zip" ${binname} rm ${binname} # 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/redot.linuxbsd.template_release.x86_64 ${templatesdir}/linux_release.x86_64 + cp out/linux/x86_64/templates/redot.linuxbsd.template_debug.x86_64 ${templatesdir}/linux_debug.x86_64 + cp out/linux/x86_32/templates/redot.linuxbsd.template_release.x86_32 ${templatesdir}/linux_release.x86_32 + cp out/linux/x86_32/templates/redot.linuxbsd.template_debug.x86_32 ${templatesdir}/linux_debug.x86_32 + cp out/linux/arm64/templates/redot.linuxbsd.template_release.arm64 ${templatesdir}/linux_release.arm64 + cp out/linux/arm64/templates/redot.linuxbsd.template_debug.arm64 ${templatesdir}/linux_debug.arm64 + cp out/linux/arm32/templates/redot.linuxbsd.template_release.arm32 ${templatesdir}/linux_release.arm32 + cp out/linux/arm32/templates/redot.linuxbsd.template_debug.arm32 ${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} + cp out/windows/x86_64/tools/redot.windows.editor.x86_64.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/redot.windows.editor.x86_64.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} + cp out/windows/x86_32/tools/redot.windows.editor.x86_32.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/redot.windows.editor.x86_32.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} + cp out/windows/arm64/tools/redot.windows.editor.arm64.llvm.exe ${binname} sign_windows ${binname} - cp out/windows/arm64/tools/godot.windows.editor.arm64.llvm.console.exe ${wrpname} + cp out/windows/arm64/tools/redot.windows.editor.arm64.llvm.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/redot.windows.template_release.x86_64.exe ${templatesdir}/windows_release_x86_64.exe + cp out/windows/x86_64/templates/redot.windows.template_debug.x86_64.exe ${templatesdir}/windows_debug_x86_64.exe + cp out/windows/x86_32/templates/redot.windows.template_release.x86_32.exe ${templatesdir}/windows_release_x86_32.exe + cp out/windows/x86_32/templates/redot.windows.template_debug.x86_32.exe ${templatesdir}/windows_debug_x86_32.exe + cp out/windows/arm64/templates/redot.windows.template_release.arm64.llvm.exe ${templatesdir}/windows_release_arm64.exe + cp out/windows/arm64/templates/redot.windows.template_debug.arm64.llvm.exe ${templatesdir}/windows_debug_arm64.exe + cp out/windows/x86_64/templates/redot.windows.template_release.x86_64.console.exe ${templatesdir}/windows_release_x86_64_console.exe + cp out/windows/x86_64/templates/redot.windows.template_debug.x86_64.console.exe ${templatesdir}/windows_debug_x86_64_console.exe + cp out/windows/x86_32/templates/redot.windows.template_release.x86_32.console.exe ${templatesdir}/windows_release_x86_32_console.exe + cp out/windows/x86_32/templates/redot.windows.template_debug.x86_32.console.exe ${templatesdir}/windows_debug_x86_32_console.exe + cp out/windows/arm64/templates/redot.windows.template_release.arm64.llvm.console.exe ${templatesdir}/windows_release_arm64_console.exe + cp out/windows/arm64/templates/redot.windows.template_debug.arm64.llvm.console.exe ${templatesdir}/windows_debug_arm64_console.exe ## macOS (Classical) ## # Editor binname="${godot_basename}_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 - chmod +x Godot.app/Contents/MacOS/Godot - zip -q -9 -r "${reldir}/${binname}.zip" Godot.app - rm -rf Godot.app + rm -rf Redot.app + cp -r git/misc/dist/macos_tools.app Redot.app + mkdir -p Redot.app/Contents/MacOS + cp out/macos/tools/redot.macos.editor.universal Redot.app/Contents/MacOS/Godot + chmod +x Redot.app/Contents/MacOS/Godot + zip -q -9 -r "${reldir}/${binname}.zip" Redot.app + rm -rf Redot.app sign_macos ${reldir} ${binname} 0 # Templates @@ -330,8 +330,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/redot.macos.template_release.universal macos_template.app/Contents/MacOS/godot_macos_release.universal + cp out/macos/templates/redot.macos.template_debug.universal 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 @@ -340,23 +340,23 @@ if [ "${build_classical}" == "1" ]; then ## Web (Classical) ## # Editor - unzip out/web/tools/godot.web.editor.wasm32.zip -d ${webdir}/ + unzip out/web/tools/redot.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} + cp out/web/tools/redot.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 + cp out/web/templates/redot.web.template_release.wasm32.zip ${templatesdir}/web_release.zip + cp out/web/templates/redot.web.template_debug.wasm32.zip ${templatesdir}/web_debug.zip - 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/redot.web.template_release.wasm32.nothreads.zip ${templatesdir}/web_nothreads_release.zip + cp out/web/templates/redot.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/redot.web.template_release.wasm32.dlink.zip ${templatesdir}/web_dlink_release.zip + cp out/web/templates/redot.web.template_debug.wasm32.dlink.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/redot.web.template_release.wasm32.nothreads.dlink.zip ${templatesdir}/web_dlink_nothreads_release.zip + cp out/web/templates/redot.web.template_debug.wasm32.nothreads.dlink.zip ${templatesdir}/web_dlink_nothreads_debug.zip ## Android (Classical) ## @@ -416,41 +416,41 @@ if [ "${build_mono}" == "1" ]; then # Editor binbasename="${godot_basename}_mono_linux" mkdir -p ${binbasename}_x86_64 - cp out/linux/x86_64/tools-mono/godot.linuxbsd.editor.x86_64.mono ${binbasename}_x86_64/${binbasename}.x86_64 + cp out/linux/x86_64/tools-mono/redot.linuxbsd.editor.x86_64.mono ${binbasename}_x86_64/${binbasename}.x86_64 cp -rp out/linux/x86_64/tools-mono/GodotSharp ${binbasename}_x86_64/ zip -r -q -9 "${reldir_mono}/${binbasename}_x86_64.zip" ${binbasename}_x86_64 rm -rf ${binbasename}_x86_64 binbasename="${godot_basename}_mono_linux" mkdir -p ${binbasename}_x86_32 - cp out/linux/x86_32/tools-mono/godot.linuxbsd.editor.x86_32.mono ${binbasename}_x86_32/${binbasename}.x86_32 + cp out/linux/x86_32/tools-mono/redot.linuxbsd.editor.x86_32.mono ${binbasename}_x86_32/${binbasename}.x86_32 cp -rp out/linux/x86_32/tools-mono/GodotSharp/ ${binbasename}_x86_32/ zip -r -q -9 "${reldir_mono}/${binbasename}_x86_32.zip" ${binbasename}_x86_32 rm -rf ${binbasename}_x86_32 binbasename="${godot_basename}_mono_linux" mkdir -p ${binbasename}_arm64 - cp out/linux/arm64/tools-mono/godot.linuxbsd.editor.arm64.mono ${binbasename}_arm64/${binbasename}.arm64 + cp out/linux/arm64/tools-mono/redot.linuxbsd.editor.arm64.mono ${binbasename}_arm64/${binbasename}.arm64 cp -rp out/linux/arm64/tools-mono/GodotSharp/ ${binbasename}_arm64/ zip -r -q -9 "${reldir_mono}/${binbasename}_arm64.zip" ${binbasename}_arm64 rm -rf ${binbasename}_arm64 binbasename="${godot_basename}_mono_linux" mkdir -p ${binbasename}_arm32 - cp out/linux/arm32/tools-mono/godot.linuxbsd.editor.arm32.mono ${binbasename}_arm32/${binbasename}.arm32 + cp out/linux/arm32/tools-mono/redot.linuxbsd.editor.arm32.mono ${binbasename}_arm32/${binbasename}.arm32 cp -rp out/linux/arm32/tools-mono/GodotSharp/ ${binbasename}_arm32/ zip -r -q -9 "${reldir_mono}/${binbasename}_arm32.zip" ${binbasename}_arm32 rm -rf ${binbasename}_arm32 # Templates - cp out/linux/x86_64/templates-mono/godot.linuxbsd.template_debug.x86_64.mono ${templatesdir_mono}/linux_debug.x86_64 - cp out/linux/x86_64/templates-mono/godot.linuxbsd.template_release.x86_64.mono ${templatesdir_mono}/linux_release.x86_64 - cp out/linux/x86_32/templates-mono/godot.linuxbsd.template_debug.x86_32.mono ${templatesdir_mono}/linux_debug.x86_32 - cp out/linux/x86_32/templates-mono/godot.linuxbsd.template_release.x86_32.mono ${templatesdir_mono}/linux_release.x86_32 - cp out/linux/arm64/templates-mono/godot.linuxbsd.template_debug.arm64.mono ${templatesdir_mono}/linux_debug.arm64 - cp out/linux/arm64/templates-mono/godot.linuxbsd.template_release.arm64.mono ${templatesdir_mono}/linux_release.arm64 - cp out/linux/arm32/templates-mono/godot.linuxbsd.template_debug.arm32.mono ${templatesdir_mono}/linux_debug.arm32 - cp out/linux/arm32/templates-mono/godot.linuxbsd.template_release.arm32.mono ${templatesdir_mono}/linux_release.arm32 + cp out/linux/x86_64/templates-mono/redot.linuxbsd.template_debug.x86_64.mono ${templatesdir_mono}/linux_debug.x86_64 + cp out/linux/x86_64/templates-mono/redot.linuxbsd.template_release.x86_64.mono ${templatesdir_mono}/linux_release.x86_64 + cp out/linux/x86_32/templates-mono/redot.linuxbsd.template_debug.x86_32.mono ${templatesdir_mono}/linux_debug.x86_32 + cp out/linux/x86_32/templates-mono/redot.linuxbsd.template_release.x86_32.mono ${templatesdir_mono}/linux_release.x86_32 + cp out/linux/arm64/templates-mono/redot.linuxbsd.template_debug.arm64.mono ${templatesdir_mono}/linux_debug.arm64 + cp out/linux/arm64/templates-mono/redot.linuxbsd.template_release.arm64.mono ${templatesdir_mono}/linux_release.arm64 + cp out/linux/arm32/templates-mono/redot.linuxbsd.template_debug.arm32.mono ${templatesdir_mono}/linux_debug.arm32 + cp out/linux/arm32/templates-mono/redot.linuxbsd.template_release.arm32.mono ${templatesdir_mono}/linux_release.arm32 ## Windows (Mono) ## @@ -458,10 +458,10 @@ if [ "${build_mono}" == "1" ]; then binname="${godot_basename}_mono_win64" wrpname="${godot_basename}_mono_win64_console" mkdir -p ${binname} - cp out/windows/x86_64/tools-mono/godot.windows.editor.x86_64.mono.exe ${binname}/${binname}.exe + cp out/windows/x86_64/tools-mono/redot.windows.editor.x86_64.mono.exe ${binname}/${binname}.exe sign_windows ${binname}/${binname}.exe cp -rp out/windows/x86_64/tools-mono/GodotSharp ${binname}/ - cp out/windows/x86_64/tools-mono/godot.windows.editor.x86_64.mono.console.exe ${binname}/${wrpname}.exe + cp out/windows/x86_64/tools-mono/redot.windows.editor.x86_64.mono.console.exe ${binname}/${wrpname}.exe sign_windows ${binname}/${wrpname}.exe zip -r -q -9 "${reldir_mono}/${binname}.zip" ${binname} rm -rf ${binname} @@ -469,10 +469,10 @@ if [ "${build_mono}" == "1" ]; then binname="${godot_basename}_mono_win32" wrpname="${godot_basename}_mono_win32_console" mkdir -p ${binname} - cp out/windows/x86_32/tools-mono/godot.windows.editor.x86_32.mono.exe ${binname}/${binname}.exe + cp out/windows/x86_32/tools-mono/redot.windows.editor.x86_32.mono.exe ${binname}/${binname}.exe sign_windows ${binname}/${binname}.exe cp -rp out/windows/x86_32/tools-mono/GodotSharp ${binname}/ - cp out/windows/x86_32/tools-mono/godot.windows.editor.x86_32.mono.console.exe ${binname}/${wrpname}.exe + cp out/windows/x86_32/tools-mono/redot.windows.editor.x86_32.mono.console.exe ${binname}/${wrpname}.exe sign_windows ${binname}/${wrpname}.exe zip -r -q -9 "${reldir_mono}/${binname}.zip" ${binname} rm -rf ${binname} @@ -480,27 +480,27 @@ if [ "${build_mono}" == "1" ]; then binname="${godot_basename}_mono_windows_arm64" wrpname="${godot_basename}_mono_windows_arm64_console" mkdir -p ${binname} - cp out/windows/arm64/tools-mono/godot.windows.editor.arm64.llvm.mono.exe ${binname}/${binname}.exe + cp out/windows/arm64/tools-mono/redot.windows.editor.arm64.llvm.mono.exe ${binname}/${binname}.exe sign_windows ${binname}/${binname}.exe cp -rp out/windows/arm64/tools-mono/GodotSharp ${binname}/ - cp out/windows/arm64/tools-mono/godot.windows.editor.arm64.llvm.mono.console.exe ${binname}/${wrpname}.exe + cp out/windows/arm64/tools-mono/redot.windows.editor.arm64.llvm.mono.console.exe ${binname}/${wrpname}.exe sign_windows ${binname}/${wrpname}.exe zip -r -q -9 "${reldir_mono}/${binname}.zip" ${binname} rm -rf ${binname} # Templates - cp out/windows/x86_64/templates-mono/godot.windows.template_debug.x86_64.mono.exe ${templatesdir_mono}/windows_debug_x86_64.exe - cp out/windows/x86_64/templates-mono/godot.windows.template_release.x86_64.mono.exe ${templatesdir_mono}/windows_release_x86_64.exe - cp out/windows/x86_32/templates-mono/godot.windows.template_debug.x86_32.mono.exe ${templatesdir_mono}/windows_debug_x86_32.exe - cp out/windows/x86_32/templates-mono/godot.windows.template_release.x86_32.mono.exe ${templatesdir_mono}/windows_release_x86_32.exe - cp out/windows/arm64/templates-mono/godot.windows.template_debug.arm64.llvm.mono.exe ${templatesdir_mono}/windows_debug_arm64.exe - cp out/windows/arm64/templates-mono/godot.windows.template_release.arm64.llvm.mono.exe ${templatesdir_mono}/windows_release_arm64.exe - cp out/windows/x86_64/templates-mono/godot.windows.template_debug.x86_64.mono.console.exe ${templatesdir_mono}/windows_debug_x86_64_console.exe - cp out/windows/x86_64/templates-mono/godot.windows.template_release.x86_64.mono.console.exe ${templatesdir_mono}/windows_release_x86_64_console.exe - cp out/windows/x86_32/templates-mono/godot.windows.template_debug.x86_32.mono.console.exe ${templatesdir_mono}/windows_debug_x86_32_console.exe - cp out/windows/x86_32/templates-mono/godot.windows.template_release.x86_32.mono.console.exe ${templatesdir_mono}/windows_release_x86_32_console.exe - cp out/windows/arm64/templates-mono/godot.windows.template_debug.arm64.llvm.mono.console.exe ${templatesdir_mono}/windows_debug_arm64_console.exe - cp out/windows/arm64/templates-mono/godot.windows.template_release.arm64.llvm.mono.console.exe ${templatesdir_mono}/windows_release_arm64_console.exe + cp out/windows/x86_64/templates-mono/redot.windows.template_debug.x86_64.mono.exe ${templatesdir_mono}/windows_debug_x86_64.exe + cp out/windows/x86_64/templates-mono/redot.windows.template_release.x86_64.mono.exe ${templatesdir_mono}/windows_release_x86_64.exe + cp out/windows/x86_32/templates-mono/redot.windows.template_debug.x86_32.mono.exe ${templatesdir_mono}/windows_debug_x86_32.exe + cp out/windows/x86_32/templates-mono/redot.windows.template_release.x86_32.mono.exe ${templatesdir_mono}/windows_release_x86_32.exe + cp out/windows/arm64/templates-mono/redot.windows.template_debug.arm64.llvm.mono.exe ${templatesdir_mono}/windows_debug_arm64.exe + cp out/windows/arm64/templates-mono/redot.windows.template_release.arm64.llvm.mono.exe ${templatesdir_mono}/windows_release_arm64.exe + cp out/windows/x86_64/templates-mono/redot.windows.template_debug.x86_64.mono.console.exe ${templatesdir_mono}/windows_debug_x86_64_console.exe + cp out/windows/x86_64/templates-mono/redot.windows.template_release.x86_64.mono.console.exe ${templatesdir_mono}/windows_release_x86_64_console.exe + cp out/windows/x86_32/templates-mono/redot.windows.template_debug.x86_32.mono.console.exe ${templatesdir_mono}/windows_debug_x86_32_console.exe + cp out/windows/x86_32/templates-mono/redot.windows.template_release.x86_32.mono.console.exe ${templatesdir_mono}/windows_release_x86_32_console.exe + cp out/windows/arm64/templates-mono/redot.windows.template_debug.arm64.llvm.mono.console.exe ${templatesdir_mono}/windows_debug_arm64_console.exe + cp out/windows/arm64/templates-mono/redot.windows.template_release.arm64.llvm.mono.console.exe ${templatesdir_mono}/windows_release_arm64_console.exe ## macOS (Mono) ## @@ -509,7 +509,7 @@ if [ "${build_mono}" == "1" ]; then rm -rf Godot_mono.app cp -r git/misc/dist/macos_tools.app Godot_mono.app mkdir -p Godot_mono.app/Contents/{MacOS,Resources} - cp out/macos/tools-mono/godot.macos.editor.universal.mono Godot_mono.app/Contents/MacOS/Godot + cp out/macos/tools-mono/redot.macos.editor.universal.mono Godot_mono.app/Contents/MacOS/Godot cp -rp out/macos/tools-mono/GodotSharp Godot_mono.app/Contents/Resources/GodotSharp chmod +x Godot_mono.app/Contents/MacOS/Godot zip -q -9 -r "${reldir_mono}/${binname}.zip" Godot_mono.app @@ -520,8 +520,8 @@ if [ "${build_mono}" == "1" ]; then rm -rf macos_template.app cp -r git/misc/dist/macos_template.app . mkdir -p macos_template.app/Contents/{MacOS,Resources} - cp out/macos/templates-mono/godot.macos.template_debug.universal.mono macos_template.app/Contents/MacOS/godot_macos_debug.universal - cp out/macos/templates-mono/godot.macos.template_release.universal.mono macos_template.app/Contents/MacOS/godot_macos_release.universal + cp out/macos/templates-mono/redot.macos.template_debug.universal.mono macos_template.app/Contents/MacOS/godot_macos_debug.universal + cp out/macos/templates-mono/redot.macos.template_release.universal.mono macos_template.app/Contents/MacOS/godot_macos_release.universal chmod +x macos_template.app/Contents/MacOS/godot_macos* zip -q -9 -r "${templatesdir_mono}/macos.zip" macos_template.app rm -rf macos_template.app @@ -558,8 +558,8 @@ if [ "${build_mono}" == "1" ]; then ## Web (Mono) ## # Templates - cp out/web/templates-mono/godot.web.template_debug.wasm32.mono.zip ${templatesdir_mono}/web_debug.zip - cp out/web/templates-mono/godot.web.template_release.wasm32.mono.zip ${templatesdir_mono}/web_release.zip + cp out/web/templates-mono/redot.web.template_debug.wasm32.mono.zip ${templatesdir_mono}/web_debug.zip + cp out/web/templates-mono/redot.web.template_release.wasm32.mono.zip ${templatesdir_mono}/web_release.zip fi diff --git a/build-web/build.sh b/build-web/build.sh index 0d85602..bc179e3 100755 --- a/build-web/build.sh +++ b/build-web/build.sh @@ -27,10 +27,10 @@ export TERM=xterm source /root/emsdk/emsdk_env.sh -rm -rf godot -mkdir godot -cd godot -tar xf /root/godot.tar.gz --strip-components=1 +rm -rf redot +mkdir redot +cd redot +tar xf /root/redot.tar.gz --strip-components=1 # Classical @@ -38,14 +38,14 @@ if [ "${CLASSICAL}" == "1" ]; then echo "Starting classical build for Web..." for i in {0..3}; do - cp -r /root/godot /root/godot$i - cd /root/godot$i + cp -r /root/redot /root/redot$i + cd /root/redot$i echo "$SCONS platform=web ${OPTIONS} ${JOBS[$i]}" $SCONS platform=web ${OPTIONS} ${JOBS[$i]} & pids[$i]=$! done - cd /root/godot + cd /root/redot echo "$SCONS platform=web ${OPTIONS} target=editor use_closure_compiler=yes" $SCONS platform=web ${OPTIONS} target=editor use_closure_compiler=yes & pid_editor=$! @@ -56,8 +56,8 @@ if [ "${CLASSICAL}" == "1" ]; then wait $pid_editor for i in {0..3}; do - cp -r /root/godot /root/godot-nothreads$i - cd /root/godot-nothreads$i + cp -r /root/redot /root/redot-nothreads$i + cd /root/redot-nothreads$i echo "$SCONS platform=web ${OPTIONS} ${JOBS_NOTHREADS[$i]}" $SCONS platform=web ${OPTIONS} ${JOBS_NOTHREADS[$i]} & pids_nothreads[$i]=$! @@ -68,12 +68,12 @@ if [ "${CLASSICAL}" == "1" ]; then done mkdir -p /root/out/tools - cp -rvp /root/godot/bin/*.editor*.zip /root/out/tools + cp -rvp /root/redot/bin/*.editor*.zip /root/out/tools mkdir -p /root/out/templates for i in {0..3}; do - cp -rvp /root/godot$i/bin/*.zip /root/out/templates - cp -rvp /root/godot-nothreads$i/bin/*.zip /root/out/templates + cp -rvp /root/redot$i/bin/*.zip /root/out/templates + cp -rvp /root/redot-nothreads$i/bin/*.zip /root/out/templates done fi diff --git a/build-windows/build.sh b/build-windows/build.sh index 1d12dc3..8bafe36 100755 --- a/build-windows/build.sh +++ b/build-windows/build.sh @@ -10,10 +10,10 @@ export OPTIONS_MONO="module_mono_enabled=yes" export OPTIONS_LLVM="use_llvm=yes mingw_prefix=/root/llvm-mingw" export TERM=xterm -rm -rf godot -mkdir godot -cd godot -tar xf /root/godot.tar.gz --strip-components=1 +rm -rf redot +mkdir redot +cd redot +tar xf /root/redot.tar.gz --strip-components=1 # Classical diff --git a/build.sh b/build.sh index ef0e1f3..b813198 100755 --- a/build.sh +++ b/build.sh @@ -92,7 +92,7 @@ if [ -z "${godot_version}" ]; then fi IFS=- read version status <<< "$godot_version" -echo "Building Godot ${version} ${status} from commit or branch ${git_treeish}." +echo "Building Redot ${version} ${status} from commit or branch ${git_treeish}." read -p "Is this correct (y/n)? " choice case "$choice" in y|Y ) echo "yes";; @@ -153,7 +153,7 @@ if [ ! -d "deps/angle" ]; then echo "Missing ANGLE libraries, downloading them." mkdir -p deps/angle pushd deps/angle - base_url=https://github.com/godotengine/godot-angle-static/releases/download/chromium%2F6601.2/godot-angle-static + base_url=https://github.com/Redot-Engine/redot-angle-static/releases/download/chromium%2F6601.2/godot-angle-static curl -L -o windows_arm64.zip $base_url-arm64-llvm-release.zip curl -L -o windows_x86_64.zip $base_url-x86_64-gcc-release.zip curl -L -o windows_x86_32.zip $base_url-x86_32-gcc-release.zip @@ -171,9 +171,9 @@ if [ ! -d "deps/mesa" ]; then echo "Missing Mesa/NIR libraries, downloading them." mkdir -p deps/mesa pushd deps/mesa - curl -L -o mesa_arm64.zip https://github.com/godotengine/godot-nir-static/releases/download/23.1.9-1/godot-nir-static-arm64-llvm-release.zip - curl -L -o mesa_x86_64.zip https://github.com/godotengine/godot-nir-static/releases/download/23.1.9-1/godot-nir-static-x86_64-gcc-release.zip - curl -L -o mesa_x86_32.zip https://github.com/godotengine/godot-nir-static/releases/download/23.1.9-1/godot-nir-static-x86_32-gcc-release.zip + curl -L -o mesa_arm64.zip https://github.com/Redot-Engine/redot-nir-static/releases/download/23.1.9-1/godot-nir-static-arm64-llvm-release.zip + curl -L -o mesa_x86_64.zip https://github.com/Redot-Engine/redot-nir-static/releases/download/23.1.9-1/godot-nir-static-x86_64-gcc-release.zip + curl -L -o mesa_x86_32.zip https://github.com/Redot-Engine/redot-nir-static/releases/download/23.1.9-1/godot-nir-static-x86_32-gcc-release.zip unzip -o mesa_arm64.zip && rm -f mesa_arm64.zip unzip -o mesa_x86_64.zip && rm -f mesa_x86_64.zip unzip -o mesa_x86_32.zip && rm -f mesa_x86_32.zip @@ -193,7 +193,7 @@ if [ ! -d "deps/keystore" ]; then fi if [ "${skip_git_checkout}" == 0 ]; then - git clone https://github.com/godotengine/godot git || /bin/true + git clone https://github.com/Redot-Engine/redot-engine git || /bin/true pushd git git checkout -b ${git_treeish} origin/${git_treeish} || git checkout ${git_treeish} git reset --hard @@ -224,7 +224,7 @@ mkdir -p ${basedir}/out mkdir -p ${basedir}/out/logs mkdir -p ${basedir}/mono-glue -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/" +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}/redot-${godot_version}.tar.gz:/root/redot.tar.gz -v ${basedir}/mono-glue:/root/mono-glue -w /root/" export img_version=$IMAGE_VERSION mkdir -p ${basedir}/mono-glue @@ -249,5 +249,5 @@ mkdir -p ${basedir}/out/ios ${podman_run} -v ${basedir}/build-ios:/root/build -v ${basedir}/out/ios:/root/out localhost/godot-ios:${img_version} bash build/build.sh 2>&1 | tee ${basedir}/out/logs/ios if [ ! -z "$SUDO_UID" ]; then - chown -R "${SUDO_UID}":"${SUDO_GID}" ${basedir}/git ${basedir}/out ${basedir}/mono-glue ${basedir}/godot*.tar.gz + chown -R "${SUDO_UID}":"${SUDO_GID}" ${basedir}/git ${basedir}/out ${basedir}/mono-glue ${basedir}/redot*.tar.gz fi diff --git a/clean.sh b/clean.sh index 131673d..ebe7ad1 100755 --- a/clean.sh +++ b/clean.sh @@ -1,4 +1,4 @@ #!/bin/bash -rm -rf godot*.tar.gz mono-glue out releases tmp web +rm -rf redot*.tar.gz mono-glue out releases tmp web git status