From 8a2f9be68aa51db30a26c9ed3b15a732d327126d Mon Sep 17 00:00:00 2001 From: Relintai Date: Wed, 23 Mar 2022 21:30:28 +0100 Subject: [PATCH] Updated the engine. I mass replaced godot to pandemonium in it. --- HEADS | 2 +- SConstruct | 10 +-- build_ios.sh | 6 +- build_ios_release.sh | 6 +- build_osx.sh | 2 +- build_pi.sh | 12 +-- editor.bat | 8 +- editor.sh | 4 +- export_all.sh | 40 ++++----- game/{project.godot => project.pandemonium} | 0 ged.sh | 4 +- make_release.sh | 10 +-- module_config.py | 2 +- play.sh | 4 +- podman_build_all.sh | 86 +++++++++---------- tools/build-containers/Dockerfile.android | 2 +- tools/build-containers/Dockerfile.ios | 2 +- tools/build-containers/Dockerfile.javascript | 2 +- tools/build-containers/Dockerfile.linux | 2 +- tools/build-containers/Dockerfile.msvc | 4 +- tools/build-containers/Dockerfile.osx | 2 +- tools/build-containers/Dockerfile.windows | 2 +- tools/build-containers/Dockerfile.xcode | 2 +- tools/build-containers/build_containers.sh | 20 ++--- tools/build-containers/upload.sh | 22 ++--- tools/osx/create_editor_app.sh | 2 +- tools/osx/create_export_templates.sh | 6 +- tools/osx/lipo.sh | 6 +- .../pre_release_check_files_present.sh | 22 ++--- 29 files changed, 146 insertions(+), 146 deletions(-) rename game/{project.godot => project.pandemonium} (100%) diff --git a/HEADS b/HEADS index 40bc5b1c..e50cfca5 100644 --- a/HEADS +++ b/HEADS @@ -1 +1 @@ -{"engine": {"3.2": "94a0fc47f7b4e90f8973f9adbfd3312579ed2825", "master": "8c73e813134001e575b6f59e3b0100471c007410", "3.x": "c4864a0e5f73a375259503ea1485794a6aad6df7"}, "world_generator": {"master": "260c430f11b0b591eaf4714516419aa327d2842c"}, "entity_spell_system": {"master": "3536f01bacf5f54cefb32b768cd020a1f94d0ade"}, "ui_extensions": {"master": "80a3b96fc56991a0f88a1d441ed1e3cebaf3307a"}, "voxelman": {"master": "65485930a20f65844d496b4ba47dec5b6ed70b91"}, "texture_packer": {"master": "ae4d222fbaade063ed6f0bc9f3aaa53df68a7fed"}, "fastnoise": {"master": "46bb1f610bfb7171613b5c708d312bcf94e89356"}, "mesh_data_resource": {"master": "a062d871d49d954c5466b9de54b4075cb61cbef4"}, "procedural_animations": {"master": "f8aae42bf06b3936cc6bd24cb18e1c3ec9f78f4f"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}, "props": {"master": "983090d21a08ebed30a5ce06681269819ab12e48"}, "mesh_utils": {"master": "b52a261c31f04fad624e5cfbcdcc4a45d61136da"}, "broken_seals_module": {"master": "52c5a81350db1c29d375c63d95010260911ec034"}, "thread_pool": {"master": "0917511d04bb1aa308385b63ec88d3c182990628"}, "terraman": {"master": "c72d8fc03295588fc18c5168ce351bd0c321ec5f"}, "pandemonium_engine": {"master": "d1587aaa6bd635fb4ce5db166ec365b8d57b9b6c"}} \ No newline at end of file +{"engine": {"3.2": "94a0fc47f7b4e90f8973f9adbfd3312579ed2825", "master": "8c73e813134001e575b6f59e3b0100471c007410", "3.x": "c4864a0e5f73a375259503ea1485794a6aad6df7"}, "world_generator": {"master": "260c430f11b0b591eaf4714516419aa327d2842c"}, "entity_spell_system": {"master": "3536f01bacf5f54cefb32b768cd020a1f94d0ade"}, "ui_extensions": {"master": "80a3b96fc56991a0f88a1d441ed1e3cebaf3307a"}, "voxelman": {"master": "65485930a20f65844d496b4ba47dec5b6ed70b91"}, "texture_packer": {"master": "ae4d222fbaade063ed6f0bc9f3aaa53df68a7fed"}, "fastnoise": {"master": "46bb1f610bfb7171613b5c708d312bcf94e89356"}, "mesh_data_resource": {"master": "a062d871d49d954c5466b9de54b4075cb61cbef4"}, "procedural_animations": {"master": "f8aae42bf06b3936cc6bd24cb18e1c3ec9f78f4f"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}, "props": {"master": "983090d21a08ebed30a5ce06681269819ab12e48"}, "mesh_utils": {"master": "b52a261c31f04fad624e5cfbcdcc4a45d61136da"}, "broken_seals_module": {"master": "52c5a81350db1c29d375c63d95010260911ec034"}, "thread_pool": {"master": "0917511d04bb1aa308385b63ec88d3c182990628"}, "terraman": {"master": "c72d8fc03295588fc18c5168ce351bd0c321ec5f"}, "pandemonium_engine": {"master": "32f148ac0c3ef73e96d40c894de47c0f51626fa7"}} \ No newline at end of file diff --git a/SConstruct b/SConstruct index 082a7421..179a03aa 100644 --- a/SConstruct +++ b/SConstruct @@ -236,8 +236,8 @@ def remove_repository(data, target_folder): shutil.rmtree(folder) def update_engine(): - validate_repository_origin(module_config.engine_repository, './pandemonium_engine/', module_config.godot_branch) - update_repository(module_config.engine_repository, '/', module_config.godot_branch) + validate_repository_origin(module_config.engine_repository, './pandemonium_engine/', module_config.pandemonium_branch) + update_repository(module_config.engine_repository, '/', module_config.pandemonium_branch) def update_modules(): for rep in module_config.module_repositories: @@ -264,8 +264,8 @@ def update_all(): def setup_engine(): - validate_repository_origin(module_config.engine_repository, './pandemonium_engine/', module_config.godot_branch) - setup_repository(module_config.engine_repository, '/', module_config.godot_branch) + validate_repository_origin(module_config.engine_repository, './pandemonium_engine/', module_config.pandemonium_branch) + setup_repository(module_config.engine_repository, '/', module_config.pandemonium_branch) def setup_modules(): for rep in module_config.module_repositories: @@ -614,7 +614,7 @@ if not os.path.isdir('./modules'): os.mkdir('./modules') if 'm' in action: - godot_branch = 'master' + pandemonium_branch = 'master' if 'setup' in action or action[0] == 's': if target == 'all': diff --git a/build_ios.sh b/build_ios.sh index 2404abb2..8b038511 100755 --- a/build_ios.sh +++ b/build_ios.sh @@ -6,9 +6,9 @@ cd ./pandemonium_engine scons -j6 p=iphone tools=no target=release_debug arch=arm module_arkit_enabled=no game_center=no scons -j6 p=iphone tools=no target=release_debug arch=arm64 module_arkit_enabled=no game_center=no -lipo -create bin/libgodot.iphone.opt.debug.arm.a bin/libgodot.iphone.opt.debug.arm64.a -output bin/libgodot.iphone.debug.fat.a -rm bin/ios_xcode/libgodot.iphone.debug.fat.a -cp bin/libgodot.iphone.debug.fat.a bin/ios_xcode/libgodot.iphone.debug.fat.a +lipo -create bin/libpandemonium.iphone.opt.debug.arm.a bin/libpandemonium.iphone.opt.debug.arm64.a -output bin/libpandemonium.iphone.debug.fat.a +rm bin/ios_xcode/libpandemonium.iphone.debug.fat.a +cp bin/libpandemonium.iphone.debug.fat.a bin/ios_xcode/libpandemonium.iphone.debug.fat.a rm bin/iphone.zip cd bin/ios_xcode diff --git a/build_ios_release.sh b/build_ios_release.sh index c59edd4a..afcb7414 100755 --- a/build_ios_release.sh +++ b/build_ios_release.sh @@ -6,9 +6,9 @@ cd ./pandemonium_engine scons -j6 p=iphone tools=no target=release arch=arm module_arkit_enabled=no game_center=no scons -j6 p=iphone tools=no target=release arch=arm64 module_arkit_enabled=no game_center=no -lipo -create bin/libgodot.iphone.opt.arm.a bin/libgodot.iphone.opt.arm64.a -output bin/libgodot.iphone.release.fat.a -rm bin/ios_xcode/libgodot.iphone.release.fat.a -cp bin/libgodot.iphone.release.fat.a bin/ios_xcode/libgodot.iphone.release.fat.a +lipo -create bin/libpandemonium.iphone.opt.arm.a bin/libpandemonium.iphone.opt.arm64.a -output bin/libpandemonium.iphone.release.fat.a +rm bin/ios_xcode/libpandemonium.iphone.release.fat.a +cp bin/libpandemonium.iphone.release.fat.a bin/ios_xcode/libpandemonium.iphone.release.fat.a rm bin/iphone.zip cd bin/ios_xcode diff --git a/build_osx.sh b/build_osx.sh index e834b60c..c5bbfa8d 100755 --- a/build_osx.sh +++ b/build_osx.sh @@ -9,7 +9,7 @@ scons -j6 platform=osx target=release_debug rm -Rf bin/Godot.app cp -r misc/dist/osx_tools.app ./bin/Godot.app mkdir -p ./bin/Godot.app/Contents/MacOS -cp bin/godot.osx.opt.tools.64 bin/Godot.app/Contents/MacOS/Godot +cp bin/pandemonium.osx.opt.tools.64 bin/Godot.app/Contents/MacOS/Godot chmod +x bin/Godot.app/Contents/MacOS/Godot cd .. diff --git a/build_pi.sh b/build_pi.sh index a69b5e6e..cf083225 100755 --- a/build_pi.sh +++ b/build_pi.sh @@ -3,10 +3,10 @@ scons bel_latomic_strip_slim -j4 scons bl_latomic_strip_slim -j4 scons blr_latomic_strip_slim -j4 -rm -f ./pandemonium_engine/bin/godot.x11.pi4.opt.32 -rm -f ./pandemonium_engine/bin/godot.x11.pi4.opt.debug.32 -rm -f ./pandemonium_engine/bin/godot.x11.pi4.opt.tools.32 +rm -f ./pandemonium_engine/bin/pandemonium.x11.pi4.opt.32 +rm -f ./pandemonium_engine/bin/pandemonium.x11.pi4.opt.debug.32 +rm -f ./pandemonium_engine/bin/pandemonium.x11.pi4.opt.tools.32 -mv ./pandemonium_engine/bin/godot.x11.opt.32 ./pandemonium_engine/bin/godot.x11.pi4.opt.32 -mv ./pandemonium_engine/bin/godot.x11.opt.debug.32 ./pandemonium_engine/bin/godot.x11.pi4.opt.debug.32 -mv ./pandemonium_engine/bin/godot.x11.opt.tools.32 ./pandemonium_engine/bin/godot.x11.pi4.opt.tools.32 +mv ./pandemonium_engine/bin/pandemonium.x11.opt.32 ./pandemonium_engine/bin/pandemonium.x11.pi4.opt.32 +mv ./pandemonium_engine/bin/pandemonium.x11.opt.debug.32 ./pandemonium_engine/bin/pandemonium.x11.pi4.opt.debug.32 +mv ./pandemonium_engine/bin/pandemonium.x11.opt.tools.32 ./pandemonium_engine/bin/pandemonium.x11.pi4.opt.tools.32 diff --git a/editor.bat b/editor.bat index cbb1fb9f..6259159b 100644 --- a/editor.bat +++ b/editor.bat @@ -1,6 +1,6 @@ -copy "pandemonium_engine\bin\godot.windows.opt.tools.64.exe" "pandemonium_engine\bin\run_godot.windows.opt.tools.64.exe" /y -copy "pandemonium_engine\bin\godot.windows.opt.tools.64.pdb" "pandemonium_engine\bin\run_godot.windows.opt.tools.64.pdb" /y -copy "pandemonium_engine\bin\godot.windows.opt.tools.64.exp" "pandemonium_engine\bin\run_godot.windows.opt.tools.64.exp" /y +copy "pandemonium_engine\bin\pandemonium.windows.opt.tools.64.exe" "pandemonium_engine\bin\run_pandemonium.windows.opt.tools.64.exe" /y +copy "pandemonium_engine\bin\pandemonium.windows.opt.tools.64.pdb" "pandemonium_engine\bin\run_pandemonium.windows.opt.tools.64.pdb" /y +copy "pandemonium_engine\bin\pandemonium.windows.opt.tools.64.exp" "pandemonium_engine\bin\run_pandemonium.windows.opt.tools.64.exp" /y -cmd /c pandemonium_engine\bin\run_godot.windows.opt.tools.64.exe \ No newline at end of file +cmd /c pandemonium_engine\bin\run_pandemonium.windows.opt.tools.64.exe \ No newline at end of file diff --git a/editor.sh b/editor.sh index 5d23fd06..1aec7245 100755 --- a/editor.sh +++ b/editor.sh @@ -1,6 +1,6 @@ #!/bin/bash -cp -u ./pandemonium_engine/bin/godot.x11.opt.tools.64 ./pandemonium_engine/bin/run.godot.x11.opt.tools.64 +cp -u ./pandemonium_engine/bin/pandemonium.x11.opt.tools.64 ./pandemonium_engine/bin/run.pandemonium.x11.opt.tools.64 export LD_LIBRARY_PATH=`pwd`/pandemonium_engine/bin/ -./pandemonium_engine/bin/run.godot.x11.opt.tools.64 -v +./pandemonium_engine/bin/run.pandemonium.x11.opt.tools.64 -v diff --git a/export_all.sh b/export_all.sh index 4cfa5dc6..a044b158 100755 --- a/export_all.sh +++ b/export_all.sh @@ -25,28 +25,28 @@ mkdir export/broken_seals${version_snake_cased}_pi4 mkdir export/broken_seals${version_snake_cased}_osx mkdir export/export_templates_bs${version_snake_cased} -./pandemonium_engine/bin/godot.x11.opt.tools.64 --path ./game/ --export-debug Android-Release ${project_root}/export/broken_seals${version_snake_cased}_android_release/broken_seals${version_snake_cased}.apk -./pandemonium_engine/bin/godot.x11.opt.tools.64 --path ./game/ --export-debug Android ${project_root}/export/broken_seals${version_snake_cased}_android_debug/broken_seals_debug${version_snake_cased}.apk -./pandemonium_engine/bin/godot.x11.opt.tools.64 --path ./game/ --export Linux/X11 ${project_root}/export/broken_seals${version_snake_cased}_linux/broken_seals${version_snake_cased}_x11 -./pandemonium_engine/bin/godot.x11.opt.tools.64 --path ./game/ --export "Windows Desktop" ${project_root}/export/broken_seals${version_snake_cased}_windows/broken_seals${version_snake_cased}.exe -./pandemonium_engine/bin/godot.x11.opt.tools.64 --path ./game/ --export HTML5 ${project_root}/export/broken_seals${version_snake_cased}_javascript/broken_seals.html -./pandemonium_engine/bin/godot.x11.opt.tools.64 --path ./game/ --export PI4/X11 ${project_root}/export/broken_seals${version_snake_cased}_pi4/broken_seals${version_snake_cased}_pi4 -./pandemonium_engine/bin/godot.x11.opt.tools.64 --path ./game/ --export "Mac OSX" ${project_root}/export/broken_seals${version_snake_cased}_osx/broken_seals${version_snake_cased}.app +./pandemonium_engine/bin/pandemonium.x11.opt.tools.64 --path ./game/ --export-debug Android-Release ${project_root}/export/broken_seals${version_snake_cased}_android_release/broken_seals${version_snake_cased}.apk +./pandemonium_engine/bin/pandemonium.x11.opt.tools.64 --path ./game/ --export-debug Android ${project_root}/export/broken_seals${version_snake_cased}_android_debug/broken_seals_debug${version_snake_cased}.apk +./pandemonium_engine/bin/pandemonium.x11.opt.tools.64 --path ./game/ --export Linux/X11 ${project_root}/export/broken_seals${version_snake_cased}_linux/broken_seals${version_snake_cased}_x11 +./pandemonium_engine/bin/pandemonium.x11.opt.tools.64 --path ./game/ --export "Windows Desktop" ${project_root}/export/broken_seals${version_snake_cased}_windows/broken_seals${version_snake_cased}.exe +./pandemonium_engine/bin/pandemonium.x11.opt.tools.64 --path ./game/ --export HTML5 ${project_root}/export/broken_seals${version_snake_cased}_javascript/broken_seals.html +./pandemonium_engine/bin/pandemonium.x11.opt.tools.64 --path ./game/ --export PI4/X11 ${project_root}/export/broken_seals${version_snake_cased}_pi4/broken_seals${version_snake_cased}_pi4 +./pandemonium_engine/bin/pandemonium.x11.opt.tools.64 --path ./game/ --export "Mac OSX" ${project_root}/export/broken_seals${version_snake_cased}_osx/broken_seals${version_snake_cased}.app -cp ./pandemonium_engine/bin/godot.windows.opt.tools.64.exe ${project_root}/export/godot.bs${version}.windows.opt.tools.64.exe -cp ./pandemonium_engine/bin/godot.x11.opt.tools.64 ${project_root}/export/godot.bs${version}.x11.opt.tools.64 -cp ./pandemonium_engine/bin/godot.x11.pi4.opt.tools.32 ${project_root}/export/godot.bs${version}.x11.pi4.opt.tools.32 -cp ./pandemonium_engine/bin/godot.javascript.opt.tools.threads.zip ${project_root}/export/godot.bs${version}.javascript.opt.tools.zip -cp ./pandemonium_engine/bin/Godot.app.zip ${project_root}/export/godot.bs${version}.osx.opt.tools.zip +cp ./pandemonium_engine/bin/pandemonium.windows.opt.tools.64.exe ${project_root}/export/pandemonium.bs${version}.windows.opt.tools.64.exe +cp ./pandemonium_engine/bin/pandemonium.x11.opt.tools.64 ${project_root}/export/pandemonium.bs${version}.x11.opt.tools.64 +cp ./pandemonium_engine/bin/pandemonium.x11.pi4.opt.tools.32 ${project_root}/export/pandemonium.bs${version}.x11.pi4.opt.tools.32 +cp ./pandemonium_engine/bin/pandemonium.javascript.opt.tools.threads.zip ${project_root}/export/pandemonium.bs${version}.javascript.opt.tools.zip +cp ./pandemonium_engine/bin/Godot.app.zip ${project_root}/export/pandemonium.bs${version}.osx.opt.tools.zip cp ./pandemonium_engine/bin/android_debug.apk ${project_root}/export/export_templates_bs${version_snake_cased}/android_debug.apk cp ./pandemonium_engine/bin/android_release.apk ${project_root}/export/export_templates_bs${version_snake_cased}/android_release.apk -cp ./pandemonium_engine/bin/godot.javascript.opt.debug.zip ${project_root}/export/export_templates_bs${version_snake_cased}/godot.javascript.opt.debug.zip -cp ./pandemonium_engine/bin/godot.javascript.opt.zip ${project_root}/export/export_templates_bs${version_snake_cased}/godot.javascript.opt.zip -cp ./pandemonium_engine/bin/godot.windows.opt.64.exe ${project_root}/export/export_templates_bs${version_snake_cased}/godot.windows.opt.64.exe -cp ./pandemonium_engine/bin/godot.windows.opt.debug.64.exe ${project_root}/export/export_templates_bs${version_snake_cased}/godot.windows.opt.debug.64.exe -cp ./pandemonium_engine/bin/godot.x11.opt.64 ${project_root}/export/export_templates_bs${version_snake_cased}/godot.x11.opt.64 -cp ./pandemonium_engine/bin/godot.x11.opt.debug.64 ${project_root}/export/export_templates_bs${version_snake_cased}/godot.x11.opt.debug.64 -cp ./pandemonium_engine/bin/godot.x11.pi4.opt.32 ${project_root}/export/export_templates_bs${version_snake_cased}/godot.x11.pi4.opt.32 -cp ./pandemonium_engine/bin/godot.x11.pi4.opt.debug.32 ${project_root}/export/export_templates_bs${version_snake_cased}/godot.x11.pi4.opt.debug.32 +cp ./pandemonium_engine/bin/pandemonium.javascript.opt.debug.zip ${project_root}/export/export_templates_bs${version_snake_cased}/pandemonium.javascript.opt.debug.zip +cp ./pandemonium_engine/bin/pandemonium.javascript.opt.zip ${project_root}/export/export_templates_bs${version_snake_cased}/pandemonium.javascript.opt.zip +cp ./pandemonium_engine/bin/pandemonium.windows.opt.64.exe ${project_root}/export/export_templates_bs${version_snake_cased}/pandemonium.windows.opt.64.exe +cp ./pandemonium_engine/bin/pandemonium.windows.opt.debug.64.exe ${project_root}/export/export_templates_bs${version_snake_cased}/pandemonium.windows.opt.debug.64.exe +cp ./pandemonium_engine/bin/pandemonium.x11.opt.64 ${project_root}/export/export_templates_bs${version_snake_cased}/pandemonium.x11.opt.64 +cp ./pandemonium_engine/bin/pandemonium.x11.opt.debug.64 ${project_root}/export/export_templates_bs${version_snake_cased}/pandemonium.x11.opt.debug.64 +cp ./pandemonium_engine/bin/pandemonium.x11.pi4.opt.32 ${project_root}/export/export_templates_bs${version_snake_cased}/pandemonium.x11.pi4.opt.32 +cp ./pandemonium_engine/bin/pandemonium.x11.pi4.opt.debug.32 ${project_root}/export/export_templates_bs${version_snake_cased}/pandemonium.x11.pi4.opt.debug.32 cp ./pandemonium_engine/bin/osx.zip ${project_root}/export/export_templates_bs${version_snake_cased}/osx.zip diff --git a/game/project.godot b/game/project.pandemonium similarity index 100% rename from game/project.godot rename to game/project.pandemonium diff --git a/ged.sh b/ged.sh index 6a72676e..51ef2eb3 100755 --- a/ged.sh +++ b/ged.sh @@ -1,6 +1,6 @@ #!/bin/bash -cp -u ./pandemonium_engine/bin/godot.x11.opt.tools.64 ./pandemonium_engine/bin/run.godot.x11.opt.tools.64 +cp -u ./pandemonium_engine/bin/pandemonium.x11.opt.tools.64 ./pandemonium_engine/bin/run.pandemonium.x11.opt.tools.64 export LD_LIBRARY_PATH=`pwd`/pandemonium_engine/bin/ -./pandemonium_engine/bin/run.godot.x11.opt.tools.64 -e --path ./game/ +./pandemonium_engine/bin/run.pandemonium.x11.opt.tools.64 -e --path ./game/ diff --git a/make_release.sh b/make_release.sh index fa679eb5..31fd6c45 100755 --- a/make_release.sh +++ b/make_release.sh @@ -38,11 +38,11 @@ zip -q ../release/broken_seals${version_snake_cased}_pi4.zip ./broken_seals${ve zip -r -q ../release/broken_seals${version_snake_cased}_osx.zip ./broken_seals${version_snake_cased}_osx/* # Editor -zip -q ../release/editor_windows_bs${version_snake_cased}.zip ./godot.bs${version}.windows.opt.tools.64.exe -zip -q ../release/editor_linux_bs${version_snake_cased}.zip ./godot.bs${version}.x11.opt.tools.64 -zip -q ../release/editor_pi4_bs${version_snake_cased}.zip ./godot.bs${version}.x11.pi4.opt.tools.32 -cp ./godot.bs${version}.javascript.opt.tools.zip ../release/editor_javascript_bs${version_snake_cased}.zip -zip -q ../release/editor_osx_bs${version_snake_cased}.zip ./godot.bs${version}.osx.opt.tools.zip +zip -q ../release/editor_windows_bs${version_snake_cased}.zip ./pandemonium.bs${version}.windows.opt.tools.64.exe +zip -q ../release/editor_linux_bs${version_snake_cased}.zip ./pandemonium.bs${version}.x11.opt.tools.64 +zip -q ../release/editor_pi4_bs${version_snake_cased}.zip ./pandemonium.bs${version}.x11.pi4.opt.tools.32 +cp ./pandemonium.bs${version}.javascript.opt.tools.zip ../release/editor_javascript_bs${version_snake_cased}.zip +zip -q ../release/editor_osx_bs${version_snake_cased}.zip ./pandemonium.bs${version}.osx.opt.tools.zip zip -q ../release/export_templates_bs${version_snake_cased}.zip ./export_templates_bs${version_snake_cased}/* diff --git a/module_config.py b/module_config.py index 35ed905a..1cc175fa 100644 --- a/module_config.py +++ b/module_config.py @@ -1,5 +1,5 @@ -godot_branch = 'master' +pandemonium_branch = 'master' engine_repository = [ ['https://github.com/Relintai/pandemonium_engine.git', 'git@github.com:Relintai/pandemonium_engine.git'], 'pandemonium_engine', '' ] diff --git a/play.sh b/play.sh index dad8e966..385f12b5 100755 --- a/play.sh +++ b/play.sh @@ -1,6 +1,6 @@ #!/bin/bash -cp -u ./pandemonium_engine/bin/godot.x11.opt.tools.64 ./pandemonium_engine/bin/run.godot.x11.opt.tools.64 +cp -u ./pandemonium_engine/bin/pandemonium.x11.opt.tools.64 ./pandemonium_engine/bin/run.pandemonium.x11.opt.tools.64 export LD_LIBRARY_PATH=`pwd`/pandemonium_engine/bin/ -./pandemonium_engine/bin/run.godot.x11.opt.tools.64 -v --path ./game/ +./pandemonium_engine/bin/run.pandemonium.x11.opt.tools.64 -v --path ./game/ diff --git a/podman_build_all.sh b/podman_build_all.sh index 5f86dc34..98d5eda3 100755 --- a/podman_build_all.sh +++ b/podman_build_all.sh @@ -13,68 +13,68 @@ img_version=bs mkdir -p logs -#sudo podman run -i -t -v $(pwd)/files:/root/files godot-osx:bs /bin/bash -#sudo podman run -i -t -v $(pwd)/:/root/project -w /root/project godot-osx:bs /bin/bash -#sudo podman run -v $(pwd)/:/root/project -w /root/project godot-osx:bs scons bex_strip arch=x86_64 -j4 osxcross_sdk=darwin20.4 -#sudo podman run -i -t -v $(pwd)/:/root/project -w /root/project/tools/osx godot-osx:bs bash -c ./lipo.sh +#sudo podman run -i -t -v $(pwd)/files:/root/files pandemonium-osx:bs /bin/bash +#sudo podman run -i -t -v $(pwd)/:/root/project -w /root/project pandemonium-osx:bs /bin/bash +#sudo podman run -v $(pwd)/:/root/project -w /root/project pandemonium-osx:bs scons bex_strip arch=x86_64 -j4 osxcross_sdk=darwin20.4 +#sudo podman run -i -t -v $(pwd)/:/root/project -w /root/project/tools/osx pandemonium-osx:bs bash -c ./lipo.sh rm -f pandemonium_engine/modules/modules_enabled.gen.h -$podman run -v ${project_root}:/root/project -w /root/project godot-windows:${img_version} scons bew_strip -j4 . 2>&1 | tee logs/bew.log +$podman run -v ${project_root}:/root/project -w /root/project pandemonium-windows:${img_version} scons bew_strip -j4 . 2>&1 | tee logs/bew.log rm -f pandemonium_engine/modules/modules_enabled.gen.h -#$podman run -v ${project_root}:/root/project -w /root/project godot-windows:${img_version} scons bewd_strip -j4 . 2>&1 | tee logs/bewd.log +#$podman run -v ${project_root}:/root/project -w /root/project pandemonium-windows:${img_version} scons bewd_strip -j4 . 2>&1 | tee logs/bewd.log rm -f pandemonium_engine/modules/modules_enabled.gen.h -$podman run -v ${project_root}:/root/project -w /root/project godot-windows:${img_version} scons bw_strip -j4 . 2>&1 | tee logs/bw.log +$podman run -v ${project_root}:/root/project -w /root/project pandemonium-windows:${img_version} scons bw_strip -j4 . 2>&1 | tee logs/bw.log rm -f pandemonium_engine/modules/modules_enabled.gen.h -$podman run -v ${project_root}:/root/project -w /root/project godot-windows:${img_version} scons bwr_strip -j4 . 2>&1 | tee logs/bwr.log +$podman run -v ${project_root}:/root/project -w /root/project pandemonium-windows:${img_version} scons bwr_strip -j4 . 2>&1 | tee logs/bwr.log rm -f pandemonium_engine/modules/modules_enabled.gen.h -$podman run -v ${project_root}:/root/project -w /root/project godot-linux:${img_version} scons bel_strip -j4 . 2>&1 | tee logs/bel.log +$podman run -v ${project_root}:/root/project -w /root/project pandemonium-linux:${img_version} scons bel_strip -j4 . 2>&1 | tee logs/bel.log rm -f pandemonium_engine/modules/modules_enabled.gen.h -#$podman run -v ${project_root}:/root/project -w /root/project godot-linux:${img_version} scons beld_strip -j4 . 2>&1 | tee logs/beld.log +#$podman run -v ${project_root}:/root/project -w /root/project pandemonium-linux:${img_version} scons beld_strip -j4 . 2>&1 | tee logs/beld.log rm -f pandemonium_engine/modules/modules_enabled.gen.h -$podman run -v ${project_root}:/root/project -w /root/project godot-linux:${img_version} scons bl_strip -j4 . 2>&1 | tee logs/bl.log +$podman run -v ${project_root}:/root/project -w /root/project pandemonium-linux:${img_version} scons bl_strip -j4 . 2>&1 | tee logs/bl.log rm -f pandemonium_engine/modules/modules_enabled.gen.h -$podman run -v ${project_root}:/root/project -w /root/project godot-linux:${img_version} scons blr_strip -j4 . 2>&1 | tee logs/blr.log +$podman run -v ${project_root}:/root/project -w /root/project pandemonium-linux:${img_version} scons blr_strip -j4 . 2>&1 | tee logs/blr.log rm -f pandemonium_engine/modules/modules_enabled.gen.h -$podman run -v ${project_root}:/root/project -w /root/project godot-javascript:${img_version} bash -c 'source /root/emsdk_2.0.25/emsdk_env.sh;scons bj_strip -j4' . 2>&1 | tee logs/bj.log +$podman run -v ${project_root}:/root/project -w /root/project pandemonium-javascript:${img_version} bash -c 'source /root/emsdk_2.0.25/emsdk_env.sh;scons bj_strip -j4' . 2>&1 | tee logs/bj.log rm -f pandemonium_engine/modules/modules_enabled.gen.h -$podman run -v ${project_root}:/root/project -w /root/project godot-javascript:${img_version} bash -c 'source /root/emsdk_2.0.25/emsdk_env.sh;scons bjr_strip -j4' . 2>&1 | tee logs/bjr.log +$podman run -v ${project_root}:/root/project -w /root/project pandemonium-javascript:${img_version} bash -c 'source /root/emsdk_2.0.25/emsdk_env.sh;scons bjr_strip -j4' . 2>&1 | tee logs/bjr.log rm -f pandemonium_engine/modules/modules_enabled.gen.h -$podman run -v ${project_root}:/root/project -w /root/project godot-javascript:${img_version} bash -c 'source /root/emsdk_2.0.25/emsdk_env.sh;scons bej_strip_threads -j4' . 2>&1 | tee logs/bej.log +$podman run -v ${project_root}:/root/project -w /root/project pandemonium-javascript:${img_version} bash -c 'source /root/emsdk_2.0.25/emsdk_env.sh;scons bej_strip_threads -j4' . 2>&1 | tee logs/bej.log rm -f pandemonium_engine/modules/modules_enabled.gen.h -$podman run -v ${project_root}:/root/project -w /root/project godot-android:${img_version} scons ba_strip -j4 . 2>&1 | tee logs/ba.log +$podman run -v ${project_root}:/root/project -w /root/project pandemonium-android:${img_version} scons ba_strip -j4 . 2>&1 | tee logs/ba.log rm -f pandemonium_engine/modules/modules_enabled.gen.h -$podman run -v ${project_root}:/root/project -w /root/project godot-android:${img_version} scons bar_strip -j4 . 2>&1 | tee logs/bar.log +$podman run -v ${project_root}:/root/project -w /root/project pandemonium-android:${img_version} scons bar_strip -j4 . 2>&1 | tee logs/bar.log rm -f pandemonium_engine/modules/modules_enabled.gen.h #osx -$podman run -v ${project_root}:/root/project -w /root/project godot-osx:${img_version} scons bex_strip arch=x86_64 -j4 osxcross_sdk=darwin20.4 . 2>&1 | tee logs/bex_x86_64.log +$podman run -v ${project_root}:/root/project -w /root/project pandemonium-osx:${img_version} scons bex_strip arch=x86_64 -j4 osxcross_sdk=darwin20.4 . 2>&1 | tee logs/bex_x86_64.log rm -f pandemonium_engine/modules/modules_enabled.gen.h -$podman run -v ${project_root}:/root/project -w /root/project godot-osx:${img_version} scons bex_strip arch=arm64 -j4 osxcross_sdk=darwin20.4 . 2>&1 | tee logs/bex_arm64.log +$podman run -v ${project_root}:/root/project -w /root/project pandemonium-osx:${img_version} scons bex_strip arch=arm64 -j4 osxcross_sdk=darwin20.4 . 2>&1 | tee logs/bex_arm64.log rm -f pandemonium_engine/modules/modules_enabled.gen.h -$podman run -v ${project_root}:/root/project -w /root/project godot-osx:${img_version} scons bx_strip arch=x86_64 -j4 osxcross_sdk=darwin20.4 . 2>&1 | tee logs/bx_x86_64.log +$podman run -v ${project_root}:/root/project -w /root/project pandemonium-osx:${img_version} scons bx_strip arch=x86_64 -j4 osxcross_sdk=darwin20.4 . 2>&1 | tee logs/bx_x86_64.log rm -f pandemonium_engine/modules/modules_enabled.gen.h -$podman run -v ${project_root}:/root/project -w /root/project godot-osx:${img_version} scons bx_strip arch=arm64 -j4 osxcross_sdk=darwin20.4 . 2>&1 | tee logs/bx_arm64.log +$podman run -v ${project_root}:/root/project -w /root/project pandemonium-osx:${img_version} scons bx_strip arch=arm64 -j4 osxcross_sdk=darwin20.4 . 2>&1 | tee logs/bx_arm64.log rm -f pandemonium_engine/modules/modules_enabled.gen.h -$podman run -v ${project_root}:/root/project -w /root/project godot-osx:${img_version} scons bxr_strip arch=x86_64 -j4 osxcross_sdk=darwin20.4 . 2>&1 | tee logs/bxr_x86_64.log +$podman run -v ${project_root}:/root/project -w /root/project pandemonium-osx:${img_version} scons bxr_strip arch=x86_64 -j4 osxcross_sdk=darwin20.4 . 2>&1 | tee logs/bxr_x86_64.log rm -f pandemonium_engine/modules/modules_enabled.gen.h -$podman run -v ${project_root}:/root/project -w /root/project godot-osx:${img_version} scons bxr_strip arch=arm64 -j4 osxcross_sdk=darwin20.4 . 2>&1 | tee logs/bxr_arm64.log +$podman run -v ${project_root}:/root/project -w /root/project pandemonium-osx:${img_version} scons bxr_strip arch=arm64 -j4 osxcross_sdk=darwin20.4 . 2>&1 | tee logs/bxr_arm64.log rm -f pandemonium_engine/modules/modules_enabled.gen.h #lipo -$podman run -v ${project_root}:/root/project -w /root/project/tools/osx godot-osx:${img_version} bash -c ./lipo.sh +$podman run -v ${project_root}:/root/project -w /root/project/tools/osx pandemonium-osx:${img_version} bash -c ./lipo.sh #ios -#$podman run -v ${project_root}:/root/project -w /root/project godot-ios:${img_version} scons bir_strip -j4 . 2>&1 | tee logs/bir.log +#$podman run -v ${project_root}:/root/project -w /root/project pandemonium-ios:${img_version} scons bir_strip -j4 . 2>&1 | tee logs/bir.log #rm -f pandemonium_engine/modules/modules_enabled.gen.h -# $podman run -v ${project_root}:/root/project -i -w /root/project -t godot-windows:${img_version} scons bew -j4 +# $podman run -v ${project_root}:/root/project -i -w /root/project -t pandemonium-windows:${img_version} scons bew -j4 rm -f pandemonium_engine/modules/modules_enabled.gen.h @@ -84,29 +84,29 @@ cd ./pandemonium_engine/bin/ files=( # Windows - "godot.windows.opt.64.exe" - "godot.windows.opt.debug.64.exe" - "godot.windows.opt.tools.64.exe" + "pandemonium.windows.opt.64.exe" + "pandemonium.windows.opt.debug.64.exe" + "pandemonium.windows.opt.tools.64.exe" # Linux - "godot.x11.opt.64" - "godot.x11.opt.debug.64" - "godot.x11.opt.tools.64" + "pandemonium.x11.opt.64" + "pandemonium.x11.opt.debug.64" + "pandemonium.x11.opt.tools.64" # JS - "godot.javascript.opt.tools.threads.zip" - "godot.javascript.opt.zip" + "pandemonium.javascript.opt.tools.threads.zip" + "pandemonium.javascript.opt.zip" # Android "android_debug.apk" "android_release.apk" # OSX - "godot.osx.opt.arm64" - "godot.osx.opt.debug.arm64" - "godot.osx.opt.debug.universal" - "godot.osx.opt.debug.x86_64" - "godot.osx.opt.tools.arm64" - "godot.osx.opt.tools.universal" - "godot.osx.opt.tools.x86_64" - "godot.osx.opt.universal" - "godot.osx.opt.x86_64" + "pandemonium.osx.opt.arm64" + "pandemonium.osx.opt.debug.arm64" + "pandemonium.osx.opt.debug.universal" + "pandemonium.osx.opt.debug.x86_64" + "pandemonium.osx.opt.tools.arm64" + "pandemonium.osx.opt.tools.universal" + "pandemonium.osx.opt.tools.x86_64" + "pandemonium.osx.opt.universal" + "pandemonium.osx.opt.x86_64" ) error=0 diff --git a/tools/build-containers/Dockerfile.android b/tools/build-containers/Dockerfile.android index 5da394c9..ff8c77a5 100644 --- a/tools/build-containers/Dockerfile.android +++ b/tools/build-containers/Dockerfile.android @@ -1,5 +1,5 @@ ARG img_version -FROM godot-fedora:${img_version} +FROM pandemonium-fedora:${img_version} ENV ANDROID_SDK_ROOT=/root/sdk ENV ANDROID_NDK_VERSION=21.4.7075529 diff --git a/tools/build-containers/Dockerfile.ios b/tools/build-containers/Dockerfile.ios index a3635b1c..ec100b47 100644 --- a/tools/build-containers/Dockerfile.ios +++ b/tools/build-containers/Dockerfile.ios @@ -1,5 +1,5 @@ ARG img_version -FROM godot-osx:${img_version} +FROM pandemonium-osx:${img_version} ENV IOS_SDK=14.5 diff --git a/tools/build-containers/Dockerfile.javascript b/tools/build-containers/Dockerfile.javascript index 6ae1ff46..ceddddce 100644 --- a/tools/build-containers/Dockerfile.javascript +++ b/tools/build-containers/Dockerfile.javascript @@ -1,5 +1,5 @@ ARG img_version -FROM godot-fedora:${img_version} +FROM pandemonium-fedora:${img_version} ENV EMSCRIPTEN_CLASSICAL=2.0.25 diff --git a/tools/build-containers/Dockerfile.linux b/tools/build-containers/Dockerfile.linux index 49880516..9e861894 100644 --- a/tools/build-containers/Dockerfile.linux +++ b/tools/build-containers/Dockerfile.linux @@ -1,5 +1,5 @@ ARG img_version -FROM godot-fedora:${img_version} +FROM pandemonium-fedora:${img_version} RUN dnf -y install --setopt=install_weak_deps=False \ gcc-c++ libxcrypt-compat xorg-x11-server-Xvfb libX11-devel libXcursor-devel libXrandr-devel libXinerama-devel libXi-devel alsa-lib-devel pulseaudio-libs-devel libudev-devel mesa-libGL-devel mesa-libGLU-devel mesa-dri-drivers yasm libstdc++ libstdc++-static diff --git a/tools/build-containers/Dockerfile.msvc b/tools/build-containers/Dockerfile.msvc index 5ca6f092..2f3aa2be 100644 --- a/tools/build-containers/Dockerfile.msvc +++ b/tools/build-containers/Dockerfile.msvc @@ -1,11 +1,11 @@ ARG img_version -FROM godot-fedora:${img_version} +FROM pandemonium-fedora:${img_version} ENV WINEDEBUG=-all RUN dnf -y install --setopt=install_weak_deps=False \ wine winetricks xorg-x11-server-Xvfb p7zip-plugins findutils && \ - curl -LO https://github.com/GodotBuilder/godot-builds/releases/download/_tools/angle.7z && \ + curl -LO https://github.com/GodotBuilder/pandemonium-builds/releases/download/_tools/angle.7z && \ curl -LO https://www.python.org/ftp/python/3.7.2/python-3.7.2-amd64.exe && \ xvfb-run sh -c "winetricks -q vcrun2017; wineserver -w" ;\ xvfb-run sh -c "winetricks -q dotnet461; wineserver -w" ;\ diff --git a/tools/build-containers/Dockerfile.osx b/tools/build-containers/Dockerfile.osx index b3e7cbb8..1031901f 100644 --- a/tools/build-containers/Dockerfile.osx +++ b/tools/build-containers/Dockerfile.osx @@ -1,5 +1,5 @@ ARG img_version -FROM godot-fedora:${img_version} +FROM pandemonium-fedora:${img_version} #cmake diff --git a/tools/build-containers/Dockerfile.windows b/tools/build-containers/Dockerfile.windows index 6012ad2c..a42b3553 100644 --- a/tools/build-containers/Dockerfile.windows +++ b/tools/build-containers/Dockerfile.windows @@ -1,5 +1,5 @@ ARG img_version -FROM godot-fedora:${img_version} +FROM pandemonium-fedora:${img_version} RUN dnf -y install --setopt=install_weak_deps=False \ mingw32-gcc mingw32-gcc-c++ mingw32-winpthreads-static mingw64-gcc mingw64-gcc-c++ mingw64-winpthreads-static diff --git a/tools/build-containers/Dockerfile.xcode b/tools/build-containers/Dockerfile.xcode index d9d774d2..b4fa4cd7 100644 --- a/tools/build-containers/Dockerfile.xcode +++ b/tools/build-containers/Dockerfile.xcode @@ -1,5 +1,5 @@ ARG img_version -FROM godot-fedora:${img_version} +FROM pandemonium-fedora:${img_version} RUN dnf -y install --setopt=install_weak_deps=False \ clang xar xar-devel xz-devel cpio && \ diff --git a/tools/build-containers/build_containers.sh b/tools/build-containers/build_containers.sh index 063af5ab..7caac4c3 100755 --- a/tools/build-containers/build_containers.sh +++ b/tools/build-containers/build_containers.sh @@ -15,11 +15,11 @@ mkdir -p logs export podman_build="$podman build --build-arg img_version=${img_version}" -$podman build -v ${files_root}:/root/files -t godot-fedora:${img_version} -f Dockerfile.base . 2>&1 | tee logs/base.log -$podman_build -t godot-linux:${img_version} -f Dockerfile.linux . 2>&1 | tee logs/linux.log -$podman_build -t godot-windows:${img_version} -f Dockerfile.windows --ulimit nofile=65536 . 2>&1 | tee logs/windows.log -$podman_build -t godot-javascript:${img_version} -f Dockerfile.javascript . 2>&1 | tee logs/javascript.log -$podman_build -t godot-android:${img_version} -f Dockerfile.android . 2>&1 | tee logs/android.log +$podman build -v ${files_root}:/root/files -t pandemonium-fedora:${img_version} -f Dockerfile.base . 2>&1 | tee logs/base.log +$podman_build -t pandemonium-linux:${img_version} -f Dockerfile.linux . 2>&1 | tee logs/linux.log +$podman_build -t pandemonium-windows:${img_version} -f Dockerfile.windows --ulimit nofile=65536 . 2>&1 | tee logs/windows.log +$podman_build -t pandemonium-javascript:${img_version} -f Dockerfile.javascript . 2>&1 | tee logs/javascript.log +$podman_build -t pandemonium-android:${img_version} -f Dockerfile.android . 2>&1 | tee logs/android.log XCODE_SDK=12.5.1 OSX_SDK=11.3 @@ -31,12 +31,12 @@ if [ ! -e files/MacOSX${OSX_SDK}.sdk.tar.xz ] || [ ! -e files/iPhoneOS${IOS_SDK} fi echo "Building OSX and iOS SDK packages. This will take a while" - $podman_build -t godot-xcode-packer:${img_version} -f Dockerfile.xcode -v ${files_root}:/root/files . 2>&1 | tee logs/xcode.log - $podman run -it --rm -v ${files_root}:/root/files godot-xcode-packer:${img_version} 2>&1 | tee logs/xcode_packer.log + $podman_build -t pandemonium-xcode-packer:${img_version} -f Dockerfile.xcode -v ${files_root}:/root/files . 2>&1 | tee logs/xcode.log + $podman run -it --rm -v ${files_root}:/root/files pandemonium-xcode-packer:${img_version} 2>&1 | tee logs/xcode_packer.log fi -$podman_build -t godot-osx:${img_version} -v ${files_root}:/root/files -f Dockerfile.osx . 2>&1 | tee logs/osx.log -$podman_build -t godot-ios:${img_version} -v ${files_root}:/root/files -f Dockerfile.ios . 2>&1 | tee logs/ios.log +$podman_build -t pandemonium-osx:${img_version} -v ${files_root}:/root/files -f Dockerfile.osx . 2>&1 | tee logs/osx.log +$podman_build -t pandemonium-ios:${img_version} -v ${files_root}:/root/files -f Dockerfile.ios . 2>&1 | tee logs/ios.log if [ "${build_msvc}" != "0" ]; then if [ ! -e files/msvc2017.tar ]; then @@ -51,5 +51,5 @@ if [ "${build_msvc}" != "0" ]; then exit 1 fi - $podman_build -t godot-msvc:${img_version} -f Dockerfile.msvc -v ${files_root}:/root/files . 2>&1 | tee logs/msvc.log + $podman_build -t pandemonium-msvc:${img_version} -f Dockerfile.msvc -v ${files_root}:/root/files . 2>&1 | tee logs/msvc.log fi diff --git a/tools/build-containers/upload.sh b/tools/build-containers/upload.sh index 919de5b5..a2275409 100644 --- a/tools/build-containers/upload.sh +++ b/tools/build-containers/upload.sh @@ -13,15 +13,15 @@ if [ -z "${registry}" ]; then registry=registry.prehensile-tales.com fi -$podman push godot-export:latest ${registry}/godot/export -$podman push godot-mono-glue:latest ${registry}/godot/mono-glue -$podman push godot-windows:latest ${registry}/godot/windows -$podman push godot-ubuntu-32:latest ${registry}/godot/ubuntu-32 -$podman push godot-ubuntu-64:latest ${registry}/godot/ubuntu-64 -$podman push godot-javascript:latest ${registry}/godot/javascript -$podman push godot-xcode-packer:latest ${registry}/godot/xcode-packer +$podman push pandemonium-export:latest ${registry}/pandemonium/export +$podman push pandemonium-mono-glue:latest ${registry}/pandemonium/mono-glue +$podman push pandemonium-windows:latest ${registry}/pandemonium/windows +$podman push pandemonium-ubuntu-32:latest ${registry}/pandemonium/ubuntu-32 +$podman push pandemonium-ubuntu-64:latest ${registry}/pandemonium/ubuntu-64 +$podman push pandemonium-javascript:latest ${registry}/pandemonium/javascript +$podman push pandemonium-xcode-packer:latest ${registry}/pandemonium/xcode-packer -$podman push godot-android:latest ${registry}/godot-private/android -$podman push godot-ios:latest ${registry}/godot-private/ios -$podman push godot-osx:latest ${registry}/godot-private/macosx -$podman push godot-msvc:latest ${registry}/godot-private/uwp +$podman push pandemonium-android:latest ${registry}/pandemonium-private/android +$podman push pandemonium-ios:latest ${registry}/pandemonium-private/ios +$podman push pandemonium-osx:latest ${registry}/pandemonium-private/macosx +$podman push pandemonium-msvc:latest ${registry}/pandemonium-private/uwp diff --git a/tools/osx/create_editor_app.sh b/tools/osx/create_editor_app.sh index b72b6d74..d8bd855d 100755 --- a/tools/osx/create_editor_app.sh +++ b/tools/osx/create_editor_app.sh @@ -5,7 +5,7 @@ rm -f Godot.app.zip cp -r ../misc/dist/osx_tools.app Godot.app mkdir -p Godot.app/Contents/MacOS -cp godot.osx.opt.tools.universal Godot.app/Contents/MacOS/Godot +cp pandemonium.osx.opt.tools.universal Godot.app/Contents/MacOS/Godot chmod +x Godot.app/Contents/MacOS/Godot zip -q -r Godot.app.zip Godot.app/* diff --git a/tools/osx/create_export_templates.sh b/tools/osx/create_export_templates.sh index e7a8963e..3603abf3 100755 --- a/tools/osx/create_export_templates.sh +++ b/tools/osx/create_export_templates.sh @@ -4,9 +4,9 @@ cd ../../pandemonium_engine/bin cp -r ../misc/dist/osx_template.app . mkdir -p osx_template.app/Contents/MacOS -cp godot.osx.opt.universal osx_template.app/Contents/MacOS/godot_osx_release.64 -cp godot.osx.opt.debug.universal osx_template.app/Contents/MacOS/godot_osx_debug.64 -chmod +x osx_template.app/Contents/MacOS/godot_osx* +cp pandemonium.osx.opt.universal osx_template.app/Contents/MacOS/pandemonium_osx_release.64 +cp pandemonium.osx.opt.debug.universal osx_template.app/Contents/MacOS/pandemonium_osx_debug.64 +chmod +x osx_template.app/Contents/MacOS/pandemonium_osx* zip -q -9 -r osx.zip osx_template.app cd ../../tools/osx diff --git a/tools/osx/lipo.sh b/tools/osx/lipo.sh index b85d14fa..5a6cbbc9 100755 --- a/tools/osx/lipo.sh +++ b/tools/osx/lipo.sh @@ -1,6 +1,6 @@ # Tools -lipo -create ../../pandemonium_engine/bin/godot.osx.opt.tools.x86_64 ../../pandemonium_engine/bin/godot.osx.opt.tools.arm64 -output ../../pandemonium_engine/bin/godot.osx.opt.tools.universal +lipo -create ../../pandemonium_engine/bin/pandemonium.osx.opt.tools.x86_64 ../../pandemonium_engine/bin/pandemonium.osx.opt.tools.arm64 -output ../../pandemonium_engine/bin/pandemonium.osx.opt.tools.universal # Export Templates -lipo -create ../../pandemonium_engine/bin/godot.osx.opt.x86_64 ../../pandemonium_engine/bin/godot.osx.opt.arm64 -output ../../pandemonium_engine/bin/godot.osx.opt.universal -lipo -create ../../pandemonium_engine/bin/godot.osx.opt.debug.x86_64 ../../pandemonium_engine/bin/godot.osx.opt.debug.arm64 -output ../../pandemonium_engine/bin/godot.osx.opt.debug.universal +lipo -create ../../pandemonium_engine/bin/pandemonium.osx.opt.x86_64 ../../pandemonium_engine/bin/pandemonium.osx.opt.arm64 -output ../../pandemonium_engine/bin/pandemonium.osx.opt.universal +lipo -create ../../pandemonium_engine/bin/pandemonium.osx.opt.debug.x86_64 ../../pandemonium_engine/bin/pandemonium.osx.opt.debug.arm64 -output ../../pandemonium_engine/bin/pandemonium.osx.opt.debug.universal diff --git a/tools/release/pre_release_check_files_present.sh b/tools/release/pre_release_check_files_present.sh index 97e0fd63..d64b2fa3 100755 --- a/tools/release/pre_release_check_files_present.sh +++ b/tools/release/pre_release_check_files_present.sh @@ -2,18 +2,18 @@ cd ../../pandemonium_engine/bin/ files=( # Windows - "godot.windows.opt.64.exe" - "godot.windows.opt.debug.64.exe" - "godot.windows.opt.tools.64.exe" + "pandemonium.windows.opt.64.exe" + "pandemonium.windows.opt.debug.64.exe" + "pandemonium.windows.opt.tools.64.exe" # Linux - "godot.x11.opt.64" - "godot.x11.opt.debug.64" - "godot.x11.opt.tools.64" + "pandemonium.x11.opt.64" + "pandemonium.x11.opt.debug.64" + "pandemonium.x11.opt.tools.64" # JS - "godot.javascript.opt.tools.threads.zip" - "godot.javascript.opt.zip" + "pandemonium.javascript.opt.tools.threads.zip" + "pandemonium.javascript.opt.zip" # Android "android_debug.apk" @@ -26,9 +26,9 @@ files=( "osx.zip" # Pi4 - "godot.x11.pi4.opt.32" - "godot.x11.pi4.opt.debug.32" - "godot.x11.pi4.opt.tools.32" + "pandemonium.x11.pi4.opt.32" + "pandemonium.x11.pi4.opt.debug.32" + "pandemonium.x11.pi4.opt.tools.32" ) error=0