From 45557aa5db7c48d1f7db2bde2356cefb04c98ddb Mon Sep 17 00:00:00 2001 From: Relintai Date: Sun, 21 Apr 2024 23:18:57 +0200 Subject: [PATCH] Update the make release script. --- misc/scripts/make_release.sh | 163 +++++++++++++----- .../pre_release_check_files_present.sh | 4 +- 2 files changed, 122 insertions(+), 45 deletions(-) diff --git a/misc/scripts/make_release.sh b/misc/scripts/make_release.sh index f88dc7f23..a7a3d6c47 100755 --- a/misc/scripts/make_release.sh +++ b/misc/scripts/make_release.sh @@ -27,77 +27,132 @@ mkdir release mkdir release/temp mkdir release/temp/templates +mkdir release/temp/templates_server +mkdir release/temp/templates_sbc +# ==== Copy Normal Templates ==== -# ==== Copy Templates ==== +# Windows -# Windows (64 bit) +cp bin/pandemonium.windows.opt.32.exe release/temp/templates/windows_32_release.exe cp bin/pandemonium.windows.opt.64.exe release/temp/templates/windows_64_release.exe + +cp bin/pandemonium.windows.opt.debug.32.exe release/temp/templates/windows_32_debug.exe cp bin/pandemonium.windows.opt.debug.64.exe release/temp/templates/windows_64_debug.exe -# Windows (32 bit) -cp bin/pandemonium.windows.opt.32.exe release/temp/templates/windows_32_release.exe -cp bin/pandemonium.windows.opt.debug.32.exe release/temp/templates/windows_32_debug.exe - -# Linux (64 bit) +# Linux + +cp bin/pandemonium.x11.opt.32 release/temp/templates/linux_x11_32_release cp bin/pandemonium.x11.opt.64 release/temp/templates/linux_x11_64_release +cp bin/pandemonium.x11.opt.arm release/temp/templates/linux_x11_arm32_release +cp bin/pandemonium.x11.opt.arm64 release/temp/templates/linux_x11_arm64_release + +cp bin/pandemonium.x11.opt.debug.32 release/temp/templates/linux_x11_32_debug cp bin/pandemonium.x11.opt.debug.64 release/temp/templates/linux_x11_64_debug +cp bin/pandemonium.x11.opt.debug.arm release/temp/templates/linux_x11_arm32_debug +cp bin/pandemonium.x11.opt.debug.arm64 release/temp/templates/linux_x11_arm64_debug -# Linux (32 bit) -cp bin/pandemonium.x11.opt.64 release/temp/templates/linux_x11_32_release -cp bin/pandemonium.x11.opt.debug.64 release/temp/templates/linux_x11_32_debug +# Server (Linux) -# Pi4 -cp bin/pandemonium.x11.opt.pi4 release/temp/templates/linux_x11_pi4_release -cp bin/pandemonium.x11.opt.debug.pi4 release/temp/templates/linux_x11_pi4_debug +cp bin/pandemonium_server.x11.opt.32 release/temp/templates_server/linux_server_32_release +cp bin/pandemonium_server.x11.opt.64 release/temp/templates_server/linux_server_64_release +cp bin/pandemonium_server.x11.opt.arm release/temp/templates_server/linux_server_arm32_release +cp bin/pandemonium_server.x11.opt.arm64 release/temp/templates_server/linux_server_arm64_release -# Server - Linux (64 bit) -cp bin/pandemonium_server.x11.opt.64 release/temp/templates/linux_server_x11_64_release -cp bin/pandemonium_server.x11.opt.debug.64 release/temp/templates/linux_server_x11_64_debug +cp bin/pandemonium_server.x11.opt.debug.32 release/temp/templates_server/linux_server_32_debug +cp bin/pandemonium_server.x11.opt.debug.64 release/temp/templates_server/linux_server_64_debug +cp bin/pandemonium_server.x11.opt.debug.arm release/temp/templates_server/linux_server_arm32_debug +cp bin/pandemonium_server.x11.opt.debug.arm64 release/temp/templates_server/linux_server_arm64_debug + +# HTTP Server (Linux) + +cp bin/pandemonium_http_server.x11.opt.32 release/temp/templates_server/linux_http_server_32_release +cp bin/pandemonium_http_server.x11.opt.64 release/temp/templates_server/linux_http_server_64_release +cp bin/pandemonium_http_server.x11.opt.arm release/temp/templates_server/linux_http_server_arm32_release +cp bin/pandemonium_http_server.x11.opt.arm64 release/temp/templates_server/linux_http_server_arm64_release + +cp bin/pandemonium_http_server.x11.opt.debug.32 release/temp/templates_server/linux_http_server_32_debug +cp bin/pandemonium_http_server.x11.opt.debug.64 release/temp/templates_server/linux_http_server_64_debug +cp bin/pandemonium_http_server.x11.opt.debug.arm release/temp/templates_server/linux_http_server_arm32_debug +cp bin/pandemonium_http_server.x11.opt.debug.arm64 release/temp/templates_server/linux_http_server_arm64_debug # JS -cp bin/pandemonium.javascript.opt.zip release/temp/templates/webassembly_release.zip -cp bin/pandemonium.javascript.opt.debug.zip release/temp/templates/webassembly_debug.zip +cp bin/pandemonium.javascript.opt.zip release/temp/templates/webassembly_release.zip cp bin/pandemonium.javascript.opt.threads.zip release/temp/templates/webassembly_threads_release.zip +cp bin/pandemonium.javascript.opt.gdnative.zip release/temp/templates/webassembly_gdnative_release.zip + +cp bin/pandemonium.javascript.opt.debug.zip release/temp/templates/webassembly_debug.zip cp bin/pandemonium.javascript.opt.debug.threads.zip release/temp/templates/webassembly_threads_debug.zip +cp bin/pandemonium.javascript.opt.debug.gdnative.zip release/temp/templates/webassembly_gdnative_debug.zip # Android cp bin/android_source.zip release/temp/templates/android_source.zip -cp bin/android_debug.apk release/temp/templates/android_debug.apk + cp bin/android_release.apk release/temp/templates/android_release.apk +cp bin/android_debug.apk release/temp/templates/android_debug.apk + cp bin/pandemonium-lib.release.aar release/temp/templates/android_pandemonium-lib.release.aar +cp bin/pandemonium-lib.debug.aar release/temp/templates/android_pandemonium-lib.debug.aar # OSX - export templates + cp bin/osx.zip release/temp/templates/osx.zip +# IOS +cp bin/iphone.zip release/temp/templates/iphone.zip + +# FRT + +cp bin/pandemonium.frt.opt.arm32v6 release/temp/templates_sbc/linux_frt_arm32v6_release +cp bin/pandemonium.frt.opt.arm32v7 release/temp/templates_sbc/linux_frt_arm32v7_release +cp bin/pandemonium.frt.opt.arm64v8 release/temp/templates_sbc/linux_frt_arm64v8_release + +cp bin/pandemonium.frt.opt.debug.arm32v6 release/temp/templates_sbc/linux_frt_arm32v6_debug +cp bin/pandemonium.frt.opt.debug.arm32v7 release/temp/templates_sbc/linux_frt_arm32v7_debug +cp bin/pandemonium.frt.opt.debug.arm64v8 release/temp/templates_sbc/linux_frt_arm64v8_debug + +# FRT SDL + +cp bin/pandemonium.frt_sdl.opt.arm32v6 release/temp/templates_sbc/linux_frt_sdl_arm32v6_release +cp bin/pandemonium.frt_sdl.opt.arm32v7 release/temp/templates_sbc/linux_frt_sdl_arm32v7_release +cp bin/pandemonium.frt_sdl.opt.arm64v8 release/temp/templates_sbc/linux_frt_sdl_arm64v8_release + +cp bin/pandemonium.frt_sdl.opt.debug.arm32v6 release/temp/templates_sbc/linux_frt_sdl_arm32v6_debug +cp bin/pandemonium.frt_sdl.opt.debug.arm32v7 release/temp/templates_sbc/linux_frt_sdl_arm32v7_debug +cp bin/pandemonium.frt_sdl.opt.debug.arm64v8 release/temp/templates_sbc/linux_frt_sdl_arm64v8_debug + # ==== Copy Enditors ==== -# Windows (64 bit) +# Windows + +cp bin/pandemonium.windows.opt.tools.32.exe release/temp/pandemonium_v${version_snake_cased}_stable_win32.exe cp bin/pandemonium.windows.opt.tools.64.exe release/temp/pandemonium_v${version_snake_cased}_stable_win64.exe -# Windows (32 bit) -cp bin/pandemonium.windows.opt.tools.32.exe release/temp/pandemonium_v${version_snake_cased}_stable_win32.exe - -# Linux (64 bit) -cp bin/pandemonium.x11.opt.tools.64 release/temp/pandemonium_v${version_snake_cased}_stable_linux64 +# Linux -# Linux (32 bit) -cp bin/pandemonium.x11.opt.tools.64 release/temp/pandemonium_v${version_snake_cased}_stable_linux32 +cp bin/pandemonium.x11.opt.tools.32 release/temp/pandemonium_v${version_snake_cased}_stable_linux_32 +cp bin/pandemonium.x11.opt.tools.64 release/temp/pandemonium_v${version_snake_cased}_stable_linux_64 +cp bin/pandemonium.x11.opt.tools.arm release/temp/pandemonium_v${version_snake_cased}_stable_linux_arm32 +cp bin/pandemonium.x11.opt.tools.arm64 release/temp/pandemonium_v${version_snake_cased}_stable_linux_arm64 -# Pi4 -cp bin/pandemonium.x11.opt.tools.pi4 release/temp/pandemonium_v${version_snake_cased}_stable_pi4 +# Server (Linux) -# Server - Linux (64 bit) -cp bin/pandemonium_server.x11.opt.tools.64 release/temp/pandemonium_v${version_snake_cased}_stable_linux_server64 +cp bin/pandemonium_server.x11.opt.tools.32 release/temp/pandemonium_v${version_snake_cased}_stable_linux_server_32 +cp bin/pandemonium_server.x11.opt.tools.64 release/temp/pandemonium_v${version_snake_cased}_stable_linux_server_64 +cp bin/pandemonium_server.x11.opt.tools.arm release/temp/pandemonium_v${version_snake_cased}_stable_linux_server_arm32 +cp bin/pandemonium_server.x11.opt.tools.arm64 release/temp/pandemonium_v${version_snake_cased}_stable_linux_server_arm64 # JS + cp bin/pandemonium.javascript.opt.tools.threads.zip release/temp/pandemonium_v${version_snake_cased}_stable_javascript.zip # Android + cp bin/android_editor.apk release/temp/pandemonium_v${version_snake_cased}_stable_android.apk # OSX - Editor + cp -r bin/Pandemonium.app release/temp/pandemonium_v${version_snake_cased}_stable_osx.app # ==== Copy sources ==== @@ -110,6 +165,8 @@ python ./misc/scripts_app/copy_repos.py . ./release/temp/pandemonium_v${version_ # ==== Create version.txt for the export templates ==== ./bin/pandemonium.x11.opt.tools.64 --version-full-config > release/temp/templates/version.txt +./bin/pandemonium.x11.opt.tools.64 --version-full-config > release/temp/templates_server/version.txt +./bin/pandemonium.x11.opt.tools.64 --version-full-config > release/temp/templates_sbc/version.txt # ==== Zip everything ==== @@ -118,33 +175,53 @@ cd release/temp # Export templates zip -q -r ../pandemonium_v${version_snake_cased}_stable_export_templates.zip ./templates/* +zip -q -r ../pandemonium_v${version_snake_cased}_stable_export_templates_server.zip ./templates_server/* +zip -q -r ../pandemonium_v${version_snake_cased}_stable_export_templates_sbc.zip ./templates_sbc/* + +# == Editors == + +# Windows -# Editors -# Windows (64 bit) -zip -q ../pandemonium_v${version_snake_cased}_stable_win64.zip ./pandemonium_v${version_snake_cased}_stable_win64.exe -# Windows (32 bit) zip -q ../pandemonium_v${version_snake_cased}_stable_win32.zip ./pandemonium_v${version_snake_cased}_stable_win32.exe -# Linux (64 bit) -zip -q ../pandemonium_v${version_snake_cased}_stable_linux64.zip ./pandemonium_v${version_snake_cased}_stable_linux64 -# Linux (32 bit) -zip -q ../pandemonium_v${version_snake_cased}_stable_linux32.zip ./pandemonium_v${version_snake_cased}_stable_linux32 -# Pi4 -zip -q ../pandemonium_v${version_snake_cased}_stable_pi4.zip ./pandemonium_v${version_snake_cased}_stable_pi4 -# Server - Linux (64 bit) -zip -q ../pandemonium_v${version_snake_cased}_stable_linux_server64.zip ./pandemonium_v${version_snake_cased}_stable_linux_server64 +zip -q ../pandemonium_v${version_snake_cased}_stable_win64.zip ./pandemonium_v${version_snake_cased}_stable_win64.exe + +# Linux + +zip -q ../pandemonium_v${version_snake_cased}_stable_linux_32.zip ./pandemonium_v${version_snake_cased}_stable_linux_32 +zip -q ../pandemonium_v${version_snake_cased}_stable_linux_64.zip ./pandemonium_v${version_snake_cased}_stable_linux_64 +zip -q ../pandemonium_v${version_snake_cased}_stable_linux_arm32.zip ./pandemonium_v${version_snake_cased}_stable_linux_arm32 +zip -q ../pandemonium_v${version_snake_cased}_stable_linux_arm64.zip ./pandemonium_v${version_snake_cased}_stable_linux_arm64 + +# Server (Linux) + +zip -q ../pandemonium_v${version_snake_cased}_stable_linux_server_32.zip ./pandemonium_v${version_snake_cased}_stable_linux_server_32 +zip -q ../pandemonium_v${version_snake_cased}_stable_linux_server_64.zip ./pandemonium_v${version_snake_cased}_stable_linux_server_64 +zip -q ../pandemonium_v${version_snake_cased}_stable_linux_server_arm32.zip ./pandemonium_v${version_snake_cased}_stable_linux_server_arm32 +zip -q ../pandemonium_v${version_snake_cased}_stable_linux_server_arm64.zip ./pandemonium_v${version_snake_cased}_stable_linux_server_arm64 + + # Android + zip -q ../pandemonium_v${version_snake_cased}_stable_android.zip ./pandemonium_v${version_snake_cased}_stable_android.apk + # OSX - Editor + zip -r -q ../pandemonium_v${version_snake_cased}_stable_osx.app.zip ./pandemonium_v${version_snake_cased}_stable_osx.app + # Sources + zip -r -q ../pandemonium_v${version_snake_cased}_source.zip ./pandemonium_v${version_snake_cased}_source cd .. # JS + cp ./temp/pandemonium_v${version_snake_cased}_stable_javascript.zip pandemonium_v${version_snake_cased}_stable_javascript.zip # ==== Rename export temlpates to tpz ==== # It's still a normal zip though # Maybe it should be just kept as a normal zip? + mv pandemonium_v${version_snake_cased}_stable_export_templates.zip pandemonium_v${version_snake_cased}_stable_export_templates.tpz +mv pandemonium_v${version_snake_cased}_stable_export_templates_server.zip pandemonium_v${version_snake_cased}_stable_export_templates_server.tpz +mv pandemonium_v${version_snake_cased}_stable_export_templates_sbc.zip pandemonium_v${version_snake_cased}_stable_export_templates_sbc.tpz diff --git a/misc/scripts/pre_release_check_files_present.sh b/misc/scripts/pre_release_check_files_present.sh index e5bcd8eb4..6b42e2ed1 100755 --- a/misc/scripts/pre_release_check_files_present.sh +++ b/misc/scripts/pre_release_check_files_present.sh @@ -61,11 +61,11 @@ files=( "pandemonium.javascript.opt.threads.zip" "pandemonium.javascript.opt.debug.threads.zip" - "pandemonium.javascript.opt.tools.threads.zip" - "pandemonium.javascript.opt.gdnative.zip" "pandemonium.javascript.opt.debug.gdnative.zip" + "pandemonium.javascript.opt.tools.threads.zip" + # Android "android_source.zip" "android_debug.apk"