Preserve combined symbols in release builds (tewtal#205)

so that they will get uploaded to GitHub Actions
NobodyNada · Aug 17, 2024 · 5941037 · 5941037
1 parent b68e80d
commit 5941037
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/build.bat b/build.bat
@@ -16,7 +16,7 @@ copy *.sfc ..\build
 ..\tools\asar --no-title-check --symbols=wla --symbols-path=..\build\symbols.sym -DFEATURE_SD2SNES=0 -DFEATURE_PAL=0 -DFEATURE_TINYSTATES=0 ..\src\main.asm ..\build\00.sfc
 if ERRORLEVEL 1 goto end_build_saveless
 ..\tools\asar --no-title-check --symbols=wla --symbols-path=..\build\symbols.sym -DFEATURE_SD2SNES=0 -DFEATURE_PAL=0 -DFEATURE_TINYSTATES=0 ..\src\main.asm ..\build\ff.sfc
-python sort_debug_symbols.py ..\build\symbols.sym x x
+python sort_debug_symbols.py ..\build\symbols.sym x ..\build\smhack20_combined.sym
 python create_ips.py ..\build\00.sfc ..\build\ff.sfc ..\build\smhack20.ips
 :end_build_saveless
 
@@ -26,7 +26,7 @@ copy *.sfc ..\build
 ..\tools\asar --no-title-check --symbols=wla --symbols-path=..\build\symbols.sym -DFEATURE_SD2SNES=1 -DFEATURE_PAL=0 -DFEATURE_TINYSTATES=0 ..\src\main.asm ..\build\00.sfc
 if ERRORLEVEL 1 goto end_build_sd2snes
 ..\tools\asar --no-title-check --symbols=wla --symbols-path=..\build\symbols.sym -DFEATURE_SD2SNES=1 -DFEATURE_PAL=0 -DFEATURE_TINYSTATES=0 ..\src\main.asm ..\build\ff.sfc
-python sort_debug_symbols.py ..\build\symbols.sym x x
+python sort_debug_symbols.py ..\build\symbols.sym x ..\build\smhack20_sd2snes.sym
 python create_ips.py ..\build\00.sfc ..\build\ff.sfc ..\build\smhack20_sd2snes.ips
 :end_build_sd2snes
 
@@ -36,7 +36,7 @@ copy *.sfc ..\build
 ..\tools\asar --no-title-check --symbols=wla --symbols-path=..\build\symbols.sym -DFEATURE_SD2SNES=0 -DFEATURE_PAL=0 -DFEATURE_TINYSTATES=1 ..\src\main.asm ..\build\00.sfc
 if ERRORLEVEL 1 goto end_build_tinystates
 ..\tools\asar --no-title-check --symbols=wla --symbols-path=..\build\symbols.sym -DFEATURE_SD2SNES=0 -DFEATURE_PAL=0 -DFEATURE_TINYSTATES=1 ..\src\main.asm ..\build\ff.sfc
-python sort_debug_symbols.py ..\build\symbols.sym x x
+python sort_debug_symbols.py ..\build\symbols.sym x ..\build\smhack20_tinystates.sym
 python create_ips.py ..\build\00.sfc ..\build\ff.sfc ..\build\smhack20_tinystates.ips
 :end_build_tinystates
 

diff --git a/build.sh b/build.sh
@@ -19,23 +19,23 @@ rm -f ../build/smhack20.ips
 cp *.sfc ../build
 ../tools/asar --no-title-check --symbols=wla --symbols-path=../build/symbols.sym -DFEATURE_SD2SNES=0 -DFEATURE_PAL=0 -DFEATURE_TINYSTATES=0 "$@" ../src/main.asm ../build/00.sfc
 ../tools/asar --no-title-check --symbols=wla --symbols-path=../build/symbols.sym -DFEATURE_SD2SNES=0 -DFEATURE_PAL=0 -DFEATURE_TINYSTATES=0 "$@" ../src/main.asm ../build/ff.sfc
-python3 sort_debug_symbols.py ../build/symbols.sym x x
+python3 sort_debug_symbols.py ../build/symbols.sym x ../build/smhack20.sym
 python3 create_ips.py ../build/00.sfc ../build/ff.sfc ../build/smhack20.ips
 
 echo "Building SD2SNES version"
 rm -f ../build/smhack20_sd2snes.ips
 cp *.sfc ../build
 ../tools/asar --no-title-check --symbols=wla --symbols-path=../build/symbols.sym -DFEATURE_SD2SNES=1 -DFEATURE_PAL=0 -DFEATURE_TINYSTATES=0 "$@" ../src/main.asm ../build/00.sfc
 ../tools/asar --no-title-check --symbols=wla --symbols-path=../build/symbols.sym -DFEATURE_SD2SNES=1 -DFEATURE_PAL=0 -DFEATURE_TINYSTATES=0 "$@" ../src/main.asm ../build/ff.sfc
-python3 sort_debug_symbols.py ../build/symbols.sym x x
+python3 sort_debug_symbols.py ../build/symbols.sym x ../build/smhack20_sd2snes.sym
 python3 create_ips.py ../build/00.sfc ../build/ff.sfc ../build/smhack20_sd2snes.ips
 
 echo "Building TinyStates version"
 rm -f ../build/smhack20_tinystates.ips
 cp *.sfc ../build
 ../tools/asar --no-title-check --symbols=wla --symbols-path=../build/symbols.sym -DFEATURE_SD2SNES=0 -DFEATURE_PAL=0 -DFEATURE_TINYSTATES=1 "$@" ../src/main.asm ../build/00.sfc
 ../tools/asar --no-title-check --symbols=wla --symbols-path=../build/symbols.sym -DFEATURE_SD2SNES=0 -DFEATURE_PAL=0 -DFEATURE_TINYSTATES=1 "$@" ../src/main.asm ../build/ff.sfc
-python3 sort_debug_symbols.py ../build/symbols.sym x x
+python3 sort_debug_symbols.py ../build/symbols.sym x ../build/smhack20_tinystates.sym
 python3 create_ips.py ../build/00.sfc ../build/ff.sfc ../build/smhack20_tinystates.ips
 
 rm 00.sfc ff.sfc ../build/00.sfc ../build/ff.sfc ../build/symbols.sym

diff --git a/build_PAL.bat b/build_PAL.bat
@@ -16,7 +16,7 @@ copy *.sfc ..\build
 ..\tools\asar --no-title-check --symbols=wla --symbols-path=..\build\symbols.sym -DFEATURE_SD2SNES=0 -DFEATURE_PAL=1 -DFEATURE_TINYSTATES=0 ..\src\main.asm ..\build\00.sfc
 if ERRORLEVEL 1 goto end_build_saveless
 ..\tools\asar --no-title-check --symbols=wla --symbols-path=..\build\symbols.sym -DFEATURE_SD2SNES=0 -DFEATURE_PAL=1 -DFEATURE_TINYSTATES=0 ..\src\main.asm ..\build\ff.sfc
-python sort_debug_symbols.py ..\build\symbols.sym x x
+python sort_debug_symbols.py ..\build\symbols.sym x ..\build\smpalhack20.sym
 python create_ips.py ..\build\00.sfc ..\build\ff.sfc ..\build\smpalhack20.ips
 :end_build_saveless
 
@@ -26,7 +26,7 @@ copy *.sfc ..\build
 ..\tools\asar --no-title-check --symbols=wla --symbols-path=..\build\symbols.sym -DFEATURE_SD2SNES=1 -DFEATURE_PAL=1 -DFEATURE_TINYSTATES=0 ..\src\main.asm ..\build\00.sfc
 if ERRORLEVEL 1 goto end_build_sd2snes
 ..\tools\asar --no-title-check --symbols=wla --symbols-path=..\build\symbols.sym -DFEATURE_SD2SNES=1 -DFEATURE_PAL=1 -DFEATURE_TINYSTATES=0 ..\src\main.asm ..\build\ff.sfc
-python sort_debug_symbols.py ..\build\symbols.sym x x
+python sort_debug_symbols.py ..\build\symbols.sym x ..\build\smpalhack20_sd2snes.sym
 python create_ips.py ..\build\00.sfc ..\build\ff.sfc ..\build\smpalhack20_sd2snes.ips
 :end_build_sd2snes
 
@@ -36,7 +36,7 @@ copy *.sfc ..\build
 ..\tools\asar --no-title-check --symbols=wla --symbols-path=..\build\symbols.sym -DFEATURE_SD2SNES=0 -DFEATURE_PAL=1 -DFEATURE_TINYSTATES=1 ..\src\main.asm ..\build\00.sfc
 if ERRORLEVEL 1 goto end_build_tinystates
 ..\tools\asar --no-title-check --symbols=wla --symbols-path=..\build\symbols.sym -DFEATURE_SD2SNES=0 -DFEATURE_PAL=1 -DFEATURE_TINYSTATES=1 ..\src\main.asm ..\build\ff.sfc
-python sort_debug_symbols.py ..\build\symbols.sym x x
+python sort_debug_symbols.py ..\build\symbols.sym x ..\build\smpalhack20_tinystates.sym
 python create_ips.py ..\build\00.sfc ..\build\ff.sfc ..\build\smpalhack20_tinystates.ips
 :end_build_tinystates
 

diff --git a/build_PAL.sh b/build_PAL.sh
@@ -19,23 +19,23 @@ rm -f ../build/smpalhack20.ips
 cp *.sfc ../build
 ../tools/asar --no-title-check --symbols=wla --symbols-path=../build/symbols.sym -DFEATURE_SD2SNES=0 -DFEATURE_PAL=1 -DFEATURE_TINYSTATES=0 "$@" ../src/main.asm ../build/00.sfc
 ../tools/asar --no-title-check --symbols=wla --symbols-path=../build/symbols.sym -DFEATURE_SD2SNES=0 -DFEATURE_PAL=1 -DFEATURE_TINYSTATES=0 "$@" ../src/main.asm ../build/ff.sfc
-python3 sort_debug_symbols.py ../build/symbols.sym x x
+python3 sort_debug_symbols.py ../build/symbols.sym x ../build/smpalhack20.sym
 python3 create_ips.py ../build/00.sfc ../build/ff.sfc ../build/smpalhack20.ips
 
 echo "Building SD2SNES version"
 rm -f ../build/smpalhack20_sd2snes.ips
 cp *.sfc ../build
 ../tools/asar --no-title-check --symbols=wla --symbols-path=../build/symbols.sym -DFEATURE_SD2SNES=1 -DFEATURE_PAL=1 -DFEATURE_TINYSTATES=0 "$@" ../src/main.asm ../build/00.sfc
 ../tools/asar --no-title-check --symbols=wla --symbols-path=../build/symbols.sym -DFEATURE_SD2SNES=1 -DFEATURE_PAL=1 -DFEATURE_TINYSTATES=0 "$@" ../src/main.asm ../build/ff.sfc
-python3 sort_debug_symbols.py ../build/symbols.sym x x
+python3 sort_debug_symbols.py ../build/symbols.sym x ../build/smpalhack20_sd2snes.sym
 python3 create_ips.py ../build/00.sfc ../build/ff.sfc ../build/smpalhack20_sd2snes.ips
 
 echo "Building TinyStates version"
 rm -f ../build/smpalhack20_tinystates.ips
 cp *.sfc ../build
 ../tools/asar --no-title-check --symbols=wla --symbols-path=../build/symbols.sym -DFEATURE_SD2SNES=0 -DFEATURE_PAL=1 -DFEATURE_TINYSTATES=1 "$@" ../src/main.asm ../build/00.sfc
 ../tools/asar --no-title-check --symbols=wla --symbols-path=../build/symbols.sym -DFEATURE_SD2SNES=0 -DFEATURE_PAL=1 -DFEATURE_TINYSTATES=1 "$@" ../src/main.asm ../build/ff.sfc
-python3 sort_debug_symbols.py ../build/symbols.sym x x
+python3 sort_debug_symbols.py ../build/symbols.sym x ../build/smpalhack20_tinystates.sym
 python3 create_ips.py ../build/00.sfc ../build/ff.sfc ../build/smpalhack20_tinystates.ips
 
 rm 00.sfc ff.sfc ../build/00.sfc ../build/ff.sfc ../build/symbols.sym