Просмотр исходного кода

[godot] Fix web builds for Godot <= 4.2

Mario Zechner 11 месяцев назад
Родитель
Сommit
623e2b9786
1 измененных файлов с 28 добавлено и 4 удалено
  1. 28 4
      spine-godot/build/build-templates-v4.sh

+ 28 - 4
spine-godot/build/build-templates-v4.sh

@@ -1,5 +1,6 @@
 #!/bin/bash
 #!/bin/bash
 set -e
 set -e
+set -x
 
 
 dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
 dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
 pushd "$dir" > /dev/null
 pushd "$dir" > /dev/null
@@ -132,18 +133,41 @@ elif [ "$platform" = "web" ]; then
 	scons platform=web tools=no target=template_debug custom_modules="../spine_godot" --jobs=$cpus
 	scons platform=web tools=no target=template_debug custom_modules="../spine_godot" --jobs=$cpus
 	mv bin/godot.web.template_release.wasm32.zip bin/web_release.zip
 	mv bin/godot.web.template_release.wasm32.zip bin/web_release.zip
 	mv bin/godot.web.template_debug.wasm32.zip bin/web_debug.zip
 	mv bin/godot.web.template_debug.wasm32.zip bin/web_debug.zip
+
 	scons platform=web tools=no threads=no target=template_release custom_modules="../spine_godot" --jobs=$cpus
 	scons platform=web tools=no threads=no target=template_release custom_modules="../spine_godot" --jobs=$cpus
 	scons platform=web tools=no threads=no target=template_debug custom_modules="../spine_godot" --jobs=$cpus
 	scons platform=web tools=no threads=no target=template_debug custom_modules="../spine_godot" --jobs=$cpus
-	mv bin/godot.web.template_release.wasm32.nothreads.zip bin/web_nothreads_release.zip
-	mv bin/godot.web.template_debug.wasm32.nothreads.zip bin/web_nothreads_debug.zip
+
+	if [ -f bin/godot.web.template_release.wasm32.nothreads.zip ]; then
+		mv bin/godot.web.template_release.wasm32.nothreads.zip bin/web_nothreads_release.zip
+	else
+		mv bin/godot.web.template_release.wasm32.zip bin/web_nothreads_release.zip
+	fi
+
+	if [ -f bin/godot.web.template_debug.wasm32.nothreads.zip ]; then
+		mv bin/godot.web.template_debug.wasm32.nothreads.zip bin/web_nothreads_debug.zip
+	else
+		mv bin/godot.web.template_debug.wasm32.zip bin/web_nothreads_debug.zip
+	fi
+
 	scons platform=web tools=no dlink_enabled=yes target=template_release custom_modules="../spine_godot" --jobs=$cpus
 	scons platform=web tools=no dlink_enabled=yes target=template_release custom_modules="../spine_godot" --jobs=$cpus
 	scons platform=web tools=no dlink_enabled=yes target=template_debug custom_modules="../spine_godot" --jobs=$cpus
 	scons platform=web tools=no dlink_enabled=yes target=template_debug custom_modules="../spine_godot" --jobs=$cpus
 	mv bin/godot.web.template_release.wasm32.dlink.zip bin/web_dlink_release.zip
 	mv bin/godot.web.template_release.wasm32.dlink.zip bin/web_dlink_release.zip
 	mv bin/godot.web.template_debug.wasm32.dlink.zip bin/web_dlink_debug.zip
 	mv bin/godot.web.template_debug.wasm32.dlink.zip bin/web_dlink_debug.zip
+
 	scons platform=web tools=no threads=no dlink_enabled=yes target=template_release custom_modules="../spine_godot" --jobs=$cpus
 	scons platform=web tools=no threads=no dlink_enabled=yes target=template_release custom_modules="../spine_godot" --jobs=$cpus
 	scons platform=web tools=no threads=no dlink_enabled=yes target=template_debug custom_modules="../spine_godot" --jobs=$cpus
 	scons platform=web tools=no threads=no dlink_enabled=yes target=template_debug custom_modules="../spine_godot" --jobs=$cpus
-	mv bin/godot.web.template_release.wasm32.nothreads.dlink.zip bin/web_dlink_nothreads_release.zip
-	mv bin/godot.web.template_debug.wasm32.nothreads.dlink.zip bin/web_dlink_nothreads_debug.zip
+
+	if [ -f bin/godot.web.template_release.wasm32.nothreads.dlink.zip ]; then
+		mv bin/godot.web.template_release.wasm32.nothreads.dlink.zip bin/web_dlink_nothreads_release.zip
+	else
+		mv bin/godot.web.template_release.wasm32.dlink.zip bin/web_dlink_nothreads_release.zip
+	fi
+
+	if [ -f bin/godot.web.template_debug.wasm32.nothreads.dlink.zip ]; then
+		mv bin/godot.web.template_debug.wasm32.nothreads.dlink.zip bin/web_dlink_nothreads_debug.zip
+	else
+		mv bin/godot.web.template_debug.wasm32.dlink.zip bin/web_dlink_nothreads_debug.zip
+	fi
 elif [ "$platform" = "android" ]; then
 elif [ "$platform" = "android" ]; then
 	# --- ANROID ---
 	# --- ANROID ---
 	# generates android_release.apk, android_debug.apk, android_source.zip
 	# generates android_release.apk, android_debug.apk, android_source.zip