Tools update (#5454)

* Bump ZAPDTR & OTRExporter.
Changes to use o2r by default
Changes to the new player animation format

# Conflicts:
#	OTRExporter
#	ZAPDTR
#	soh/soh/OTRGlobals.cpp
#	soh/src/code/z_skelanime.c

* Fix actions

* Format

* Cherry pick ZAPDTR

* Update exporter

* Move configs to port

* Remove copy

* Remove more XML copies

* Remove extractor directory from actions builds.

* Fix OTRExporter for linux

* FIx ZAPD volatile

* Format

* Fix extractor?

* Fix linux

* Fix

* Remove appimage stuff

* Screnity now

* Remove ZAPD from install paths

* Remove soh.sh.in

* Fix linux

* Cleanups and use a thread for message box

2 files changed, 1 insertions, 339 deletions

diff --git a/scripts/linux/appimage/soh.desktop b/scripts/linux/appimage/soh.desktop
index 93e4bbdce..5e517c597 100644
--- a/scripts/linux/appimage/soh.desktop
+++ b/scripts/linux/appimage/soh.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Version=1.0
 Name=SOH
-Exec=soh.sh
+Exec=soh.elf
 Terminal=false
 Icon=sohIcon
 Type=Application
diff --git a/scripts/linux/appimage/soh.sh.in b/scripts/linux/appimage/soh.sh.in
deleted file mode 100644
index e02b44fc7..000000000
--- a/scripts/linux/appimage/soh.sh.in
+++ /dev/null
@@ -1,338 +0,0 @@
-#!/bin/bash
-HERE="$(dirname "$(readlink -f "${0}")")"/../..
-
-export PATH="$HERE"/bin:"$HERE"/usr/bin:"$PATH"
-export LD_LIBRARY_PATH="$HERE"/usr/lib:"$LD_LIBRARY_PATH"
-export ZENITY=$(command -v zenity)
-
-if [ -z ${SHIP_HOME+x} ]; then
-export SHIP_HOME=$PWD
-fi
-
-if [ -z ${SHIP_BIN_DIR+x} ]; then
-export SHIP_BIN_DIR="$HERE/usr/bin"
-fi
-
-if [[ ! -e "$SHIP_HOME"/mods ]]; then
-    mkdir -p "$SHIP_HOME"/mods
-    touch "$SHIP_HOME"/mods/custom_otr_files_go_here.txt
-fi
-
-while [[ (! -e "$SHIP_HOME"/oot.otr) || (! -e "$SHIP_HOME"/oot-mq.otr) ]]; do
-        for romfile in "$SHIP_HOME"/*.*64
-        do
-            if [[ -e "$romfile" ]] || [[ -L "$romfile" ]]; then
-                export ASSETDIR="$(mktemp -d /tmp/assets-XXXXX)"
-                ln -s "$SHIP_BIN_DIR"/{assets,soh.elf,ZAPD} "$ASSETDIR"
-                export OLDPWD="$PWD"
-                mkdir -p "$ASSETDIR"/tmp
-                if [[ -e "$romfile" ]]; then
-                    ln -s "$romfile" "$ASSETDIR"/tmp/rom.z64
-                else
-                    ORIG_ROM_PATH=$(readlink "$romfile")
-                    ln -s "$ORIG_ROM_PATH" "$ASSETDIR"/tmp/rom.z64
-                fi
-                cd "$ASSETDIR"
-                ROMHASH=$(sha1sum -b "$ASSETDIR"/tmp/rom.z64 | awk '{ print $1 }')
-
-                # Remap v64 and n64 hashes to their z64 hash equivalent
-                # ZAPD will handle converting the data into z64 format
-                case "$ROMHASH" in
-                a9059b56e761c9034fbe02fe4c24985aaa835dac) # v64
-                    ROMHASH=cee6bc3c2a634b41728f2af8da54d9bf8cc14099
-                    ;;
-                24708102dc504d3f375a37f4ae4e149c167dc515) # n64
-                    ROMHASH=cee6bc3c2a634b41728f2af8da54d9bf8cc14099
-                    ;;
-                580dd0bd1b6d2c51cc20a764eece84dba558964c) # v64
-                    ROMHASH=0227d7c0074f2d0ac935631990da8ec5914597b4
-                    ;;
-                d6342c59007e57c1194661ec6880b2f078403f4e) # n64
-                    ROMHASH=0227d7c0074f2d0ac935631990da8ec5914597b4
-                    ;;
-                d0bdc2eb320668b4ba6893b9aefe4040a73123ff) # v64
-                    ROMHASH=328a1f1beba30ce5e178f031662019eb32c5f3b5
-                    ;;
-                4946ab250f6ac9b32d76b21f309ebb8ebc8103d2) # n64
-                    ROMHASH=328a1f1beba30ce5e178f031662019eb32c5f3b5
-                    ;;
-                663c34f1b2c05a09e5beffe4d0dcd440f7d49dc7) # v64
-                    ROMHASH=cfbb98d392e4a9d39da8285d10cbef3974c2f012
-                    ;;
-                24c73d378b0620a380ce5ef9f2b186c6c157a68b) # n64
-                    ROMHASH=cfbb98d392e4a9d39da8285d10cbef3974c2f012
-                    ;;
-                8ebf2e29313f44f2d49e5b4191971d09919e8e48) # v64
-                    ROMHASH=f46239439f59a2a594ef83cf68ef65043b1bffe2
-                    ;;
-                4264bf7b875737b8fae77d52322a5099d051fc11) # n64
-                    ROMHASH=f46239439f59a2a594ef83cf68ef65043b1bffe2
-                    ;;
-                973bc6fe56010a8d646166a1182a81b4f13b8cf9) # v64
-                    ROMHASH=50bebedad9e0f10746a52b07239e47fa6c284d03
-                    ;;
-                d327752c46edc70ff3668b9514083dbbee08927c) # v64
-                    ROMHASH=50bebedad9e0f10746a52b07239e47fa6c284d03
-                    ;;
-                ecdeb1747560834e079c22243febea7f6f26ba3b) # v64
-                    ROMHASH=079b855b943d6ad8bd1eb026c0ed169ecbdac7da
-                    ;;
-                f19f8662ec7abee29484a272a6fda53e39efe0f1) # n64
-                    ROMHASH=079b855b943d6ad8bd1eb026c0ed169ecbdac7da
-                    ;;
-                ab519ce04a33818ce2c39b3c514a751d807a494a) # v64
-                    ROMHASH=cfecfdc58d650e71a200c81f033de4e6d617a9f6
-                    ;;
-                c19a34f7646305e1755249fca2071e178bd7cd00) # n64
-                    ROMHASH=cfecfdc58d650e71a200c81f033de4e6d617a9f6
-                    ;;
-                25e8ae79ea0839ca5c984473f7460d8040c36f9c) # v64
-                    ROMHASH=517bd9714c73cb96c21e7c2ef640d7b55186102f
-                    ;;
-                166c02770d67fcc3954c443eb400a6a3573d3fc0) # n64
-                    ROMHASH=517bd9714c73cb96c21e7c2ef640d7b55186102f
-                    ;;
-                79a4f053d34018e59279e6d4b83c7daccd985c87) # v64
-                    ROMHASH=ad69c91157f6705e8ab06c79fe08aad47bb57ba7
-                    ;;
-                82fafee9c6ac7946739282958364ce606077ac65) # n64
-                    ROMHASH=ad69c91157f6705e8ab06c79fe08aad47bb57ba7
-                    ;;
-                18cd0eb65914a21d8fa08dfe71c29d865e9d728a) # v64
-                    ROMHASH=d3ecb253776cd847a5aa63d859d8c89a2f37b364
-                    ;;
-                07940d5609e04b7caac63570731e01189129212e) # n64
-                    ROMHASH=d3ecb253776cd847a5aa63d859d8c89a2f37b364
-                    ;;
-                3ac86253e0c0d55486d212e647350c1527b9c92d) # v64
-                    ROMHASH=41b3bdc48d98c48529219919015a1af22f5057c2
-                    ;;
-                70bf30a9980026e615a1ae8d2735a773cf9fcc94) # n64
-                    ROMHASH=41b3bdc48d98c48529219919015a1af22f5057c2
-                    ;;
-                f9e2b6840b9103e9707ea390089a7b6943592a98)  # v64
-                    ROMHASH=c892bbda3993e66bd0d56a10ecd30b1ee612210f
-                    ;;
-                2fae1601aa7ae8d3e03ba3f4dcdfca3a36002ac5)  # n64
-                    ROMHASH=c892bbda3993e66bd0d56a10ecd30b1ee612210f
-                    ;;
-                1181034d5f9533f53ebe8e1c781badbee115f5aa)  # v64
-                    ROMHASH=dbfc81f655187dc6fefd93fa6798face770d579d
-                    ;;
-                07477067943abe8d0c50285eb4a6cb9ece99e79b)  # n64
-                    ROMHASH=dbfc81f655187dc6fefd93fa6798face770d579d
-                    ;;
-                2d8fb7140a9c5d11ce614561e5a36ffef0c17540)  # v64
-                    ROMHASH=fa5f5942b27480d60243c2d52c0e93e26b9e6b86
-                    ;;
-                d90bbe422ac728ac54ac6a2c9fec942f7ff04df9)  # n64
-                    ROMHASH=fa5f5942b27480d60243c2d52c0e93e26b9e6b86
-                    ;;
-                44c75962911e13bdfdc31b35e0b8e3be6a6a49ab)  # v64
-                    b82710ba2bd3b4c6ee8aa1a7e9acf787dfc72e9b
-                    ;;
-                5d47025581060af5ba19e6719c25fea7398e87cf)  # n64
-                    b82710ba2bd3b4c6ee8aa1a7e9acf787dfc72e9b
-                    ;;
-                e1d070ad7b017de9f992b362164dcd9d7f820f7e)  # v64
-                    8b5d13aac69bfbf989861cfdc50b1d840945fc1d
-                    ;;
-                a8c04cd5aa94a6a32198f36ff2069d43342d18a8)  # n64
-                    8b5d13aac69bfbf989861cfdc50b1d840945fc1d
-                    ;;
-                245410280d152f28d5b1c0c0fc37f384db0020cd)  # v64
-                    0769c84615422d60f16925cd859593cdfa597f84
-                    ;;
-                fbdc9e444807f9b881e3432cedf66f38746b81d8)  # n64
-                    0769c84615422d60f16925cd859593cdfa597f84
-                    ;;
-                b6d33d6bf5d6700c64b6a873ab8b06ff039619bc)  # v64
-                    2ce2d1a9f0534c9cd9fa04ea5317b80da21e5e73
-                    ;;
-                2c7113d20044f93c82ec888c19aa09ea7797396d)  # n64
-                    2ce2d1a9f0534c9cd9fa04ea5317b80da21e5e73
-                    ;;
-                06c3c098f0e14ed61811dfaf0e8e4519d7d7a826)  # v64
-                    dd14e143c4275861fe93ea79d0c02e36ae8c6c2f
-                    ;;
-                bb3f85bfaad9ae7a20afbf618fc9fe126c8c1b4f)  # n64
-                    dd14e143c4275861fe93ea79d0c02e36ae8c6c2f
-                    ;;
-                esac
-
-                case "$ROMHASH" in
-                cee6bc3c2a634b41728f2af8da54d9bf8cc14099)
-                    if [[ ! -e "$SHIP_HOME"/oot.otr ]]; then
-                        ROM=GC_NMQ_D
-                        OTRNAME="oot.otr"
-                    fi
-                    ;;
-                0227d7c0074f2d0ac935631990da8ec5914597b4)
-                    if [[ ! -e "$SHIP_HOME"/oot.otr ]]; then
-                        ROM=GC_NMQ_PAL_F
-                        OTRNAME="oot.otr"
-                    else
-                        continue
-                    fi
-                    ;;
-                328a1f1beba30ce5e178f031662019eb32c5f3b5)
-                    if [[ ! -e "$SHIP_HOME"/oot.otr ]]; then
-                        ROM=N64_PAL_10
-                        OTRNAME="oot.otr"
-                    else
-                        continue
-                    fi
-                    ;;
-                cfbb98d392e4a9d39da8285d10cbef3974c2f012)
-                    if [[ ! -e "$SHIP_HOME"/oot.otr ]]; then
-                        ROM=N64_PAL_11
-                        OTRNAME="oot.otr"
-                    else
-                        continue
-                    fi
-                    ;;
-                ad69c91157f6705e8ab06c79fe08aad47bb57ba7|c892bbda3993e66bd0d56a10ecd30b1ee612210f)
-                    if [[ ! -e "$SHIP_HOME"/oot.otr ]]; then
-                        ROM=N64_NTSC_10
-                        OTRNAME="oot.otr"
-                    else
-                        continue
-                    fi
-                    ;;
-                d3ecb253776cd847a5aa63d859d8c89a2f37b364|dbfc81f655187dc6fefd93fa6798face770d579d)
-                    if [[ ! -e "$SHIP_HOME"/oot.otr ]]; then
-                        ROM=N64_NTSC_11
-                        OTRNAME="oot.otr"
-                    else
-                        continue
-                    fi
-                    ;;
-                41b3bdc48d98c48529219919015a1af22f5057c2|fa5f5942b27480d60243c2d52c0e93e26b9e6b86)
-                    if [[ ! -e "$SHIP_HOME"/oot.otr ]]; then
-                        ROM=N64_NTSC_12
-                        OTRNAME="oot.otr"
-                    else
-                        continue
-                    fi
-                    ;;
-                f46239439f59a2a594ef83cf68ef65043b1bffe2)
-                    if [[ ! -e "$SHIP_HOME"/oot-mq.otr ]]; then
-                        ROM=GC_MQ_PAL_F
-                        OTRNAME="oot-mq.otr"
-                    else
-                        continue
-                    fi
-                    ;;
-                50bebedad9e0f10746a52b07239e47fa6c284d03)
-                    if [[ ! -e "$SHIP_HOME"/oot-mq.otr ]]; then
-                        ROM=GC_MQ_D
-                        OTRNAME="oot-mq.otr"
-                    else
-                        continue
-                    fi
-                    ;;
-                079b855b943d6ad8bd1eb026c0ed169ecbdac7da)
-                    if [[ ! -e "$SHIP_HOME"/oot-mq.otr ]]; then
-                        ROM=GC_MQ_D
-                        OTRNAME="oot-mq.otr"
-                    else
-                        continue
-                    fi
-                    ;;
-                cfecfdc58d650e71a200c81f033de4e6d617a9f6)
-                    if [[ ! -e "$SHIP_HOME"/oot-mq.otr ]]; then
-                        ROM=GC_MQ_D
-                        OTRNAME="oot-mq.otr"
-                    else
-                        continue
-                    fi
-                    ;;
-                517bd9714c73cb96c21e7c2ef640d7b55186102f)
-                    if [[ ! -e "$SHIP_HOME"/oot-mq.otr ]]; then
-                        ROM=GC_MQ_D
-                        OTRNAME="oot-mq.otr"
-                    else
-                        continue
-                    fi
-                    ;;
-                b82710ba2bd3b4c6ee8aa1a7e9acf787dfc72e9b)
-                    if [[ ! -e "$SHIP_HOME"/oot.otr ]]; then
-                        ROM=GC_NMQ_NTSC_U
-                        OTRNAME="oot.otr"
-                    else
-                        continue
-                    fi
-                    ;;
-                8b5d13aac69bfbf989861cfdc50b1d840945fc1d)
-                    if [[ ! -e "$SHIP_HOME"/oot-mq.otr ]]; then
-                        ROM=GC_MQ_NTSC_U
-                        OTRNAME="oot-mq.otr"
-                    else
-                        continue
-                    fi
-                    ;;
-                0769c84615422d60f16925cd859593cdfa597f84)
-                    if [[ ! -e "$SHIP_HOME"/oot.otr ]]; then
-                        ROM=GC_NMQ_NTSC_J
-                        OTRNAME="oot.otr"
-                    else
-                        continue
-                    fi
-                    ;;
-                2ce2d1a9f0534c9cd9fa04ea5317b80da21e5e73)
-                    if [[ ! -e "$SHIP_HOME"/oot.otr ]]; then
-                        ROM=GC_NMQ_NTSC_J_CE
-                        OTRNAME="oot.otr"
-                    else
-                        continue
-                    fi
-                    ;;
-                dd14e143c4275861fe93ea79d0c02e36ae8c6c2f)
-                    if [[ ! -e "$SHIP_HOME"/oot-mq.otr ]]; then
-                        ROM=GC_MQ_NTSC_J
-                        OTRNAME="oot-mq.otr"
-                    else
-                        continue
-                    fi
-                    ;;
-                *)
-                    echo -e "\n$romfile - $ROMHASH rom hash does not match\n"
-                    continue;;
-                esac
-                if [[ ! -e "$SHIP_HOME"/"$OTRNAME" ]]; then
-                    if [ -n "$ZENITY" ]; then
-                        (echo "# 25%"; echo "25"; sleep 2; echo "# 50%"; echo "50"; sleep 3; echo "# 75%"; echo "75"; sleep 2; echo "# 100%"; echo "100"; sleep 3) |
-                        zenity --progress --title="OTR Generating..." --timeout=10 --percentage=0 --icon-name=soh --window-icon=soh.png --height=80 --width=400 &
-                    else
-                        echo "Processing..."
-                    fi
-                    assets/extractor/ZAPD.out ed -eh -i assets/extractor/xmls/"${ROM}" -b tmp/rom.z64 -fl assets/extractor/filelists -o placeholder -osf placeholder -gsf 1 -rconf assets/extractor/Config_"${ROM}".xml -se OTR --otrfile "${OTRNAME}" --portVer "@CMAKE_PROJECT_VERSION@" > /dev/null 2>&1
-                    cp "$ASSETDIR"/"$OTRNAME" "$SHIP_HOME"
-                fi
-            else
-                if [[ (! -e "$SHIP_HOME"/oot.otr) && (! -e "$SHIP_HOME"/oot-mq.otr) ]]; then
-                    if [ -n "$ZENITY" ]; then
-                        zenity --error --timeout=5 --text="Place ROM in $SHIP_HOME" --title="Missing ROM file" --width=500 --width=200
-                    else
-                        echo -e "\nPlace ROM in this folder\n"
-                    fi	
-                    exit
-                fi
-            fi
-        done
-        if [[ (! -e "$SHIP_HOME"/oot.otr) && (! -e "$SHIP_HOME"/oot-mq.otr) ]]; then
-            if [ -n "$ZENITY" ]; then
-                zenity --error --timeout=10 --text="No valid ROMs were provided, No OTR was generated." --title="Incorrect ROM file" --width=500 --width=200
-            else
-                echo "No valid roms provided, no OTR was generated."
-            fi
-            rm -r "$ASSETDIR"
-            exit
-        else
-            (cd "$SHIP_BIN_DIR"; ./soh.elf)
-            exit
-        fi
-        rm -r "$ASSETDIR"
-done	
-	(cd "$SHIP_BIN_DIR"; ./soh.elf)
-exit