From 525fc22756c2947e6a08cbdcb3786b03c6c26855 Mon Sep 17 00:00:00 2001
From: manongjohn <19245851+manongjohn@users.noreply.github.com>
Date: Fri, 7 Jul 2023 13:58:15 -0400
Subject: [PATCH] Remove unnecessary files from Windows debug_symbols package
 file

---
 ci-scripts/windows/tahoma-buildpkg.bat | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/ci-scripts/windows/tahoma-buildpkg.bat b/ci-scripts/windows/tahoma-buildpkg.bat
index f31551cd..670dfe2e 100644
--- a/ci-scripts/windows/tahoma-buildpkg.bat
+++ b/ci-scripts/windows/tahoma-buildpkg.bat
@@ -10,10 +10,6 @@ echo ">>> Copy and configure Tahoma2D installation"
 
 copy /y RelWithDebInfo\*.* Tahoma2D
 
-REM Remove PDB and ILK files
-del Tahoma2D\*.pdb
-del Tahoma2D\*.ilk
-
 copy /Y ..\..\thirdparty\freeglut\bin\x64\freeglut.dll Tahoma2D
 copy /Y ..\..\thirdparty\glew\glew-1.9.0\bin\64bit\glew32.dll Tahoma2D
 copy /Y ..\..\thirdparty\libmypaint\dist\64\libiconv-2.dll Tahoma2D
@@ -36,6 +32,10 @@ IF EXIST ..\..\thirdparty\libgphoto2\include (
    xcopy /Y /E ..\..\thirdparty\libgphoto2\bin Tahoma2D
 )
 
+REM Remove PDB and ILK files
+del Tahoma2D\*.pdb
+del Tahoma2D\*.ilk
+
 echo ">>> Copying stuff to Tahoma2D\tahomastuff"
 
 mkdir Tahoma2D\tahomastuff
@@ -77,11 +77,13 @@ IF EXIST Tahoma2D-win.zip del Tahoma2D-win.zip
 IF EXIST ..\..\..\tahoma2d_symbols (
    echo ">>> Saving debugging symbols"
    mkdir ..\..\..\tahoma2d_symbols\%date:~10,4%-%date:~4,2%-%date:~7,2%
-   copy /y RelWithDebInfo\*.* ..\..\..\tahoma2d_symbols\%date:~10,4%-%date:~4,2%-%date:~7,2%
+   copy /y RelWithDebInfo\*.pdb ..\..\..\tahoma2d_symbols\%date:~10,4%-%date:~4,2%-%date:~7,2%
 ) else (
    echo ">>> Creating debugging symbols package"
    IF EXIST debug-symbols.zip del debug-symbols.zip
-   7z a debug-symbols.zip RelWithDebInfo\*.*
+   cd RelWithDebInfo
+   7z a ..\debug-symbols.zip *.pdb
+   cd ..
 )
 
 cd ../..