From dc723a64d0149b25757332e0cf38338a5a9813ec Mon Sep 17 00:00:00 2001
From: Alexander Herzog <alexander.herzog@gmx.de>
Date: Tue, 19 Nov 2024 08:16:14 +0100
Subject: [PATCH] Use ico file in installer

---
 Simulator/build/Setup.nsi     | 5 ++++-
 Simulator/build/ant-build.xml | 2 ++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/Simulator/build/Setup.nsi b/Simulator/build/Setup.nsi
index e88c6847..b9c07237 100644
--- a/Simulator/build/Setup.nsi
+++ b/Simulator/build/Setup.nsi
@@ -192,6 +192,7 @@ Section "Install" Inst
   File "..\..\Release\Simulator.sh"
   File "..\..\Release\Simulator.bat"
   File "..\..\Release\SimulatorCLI.bat"
+  File "..\..\Release\Simulator.ico"
   File "..\..\Release\JDBC.cfg"
   File "..\tools\JDDE\JavaDDEx64.dll"
   File "..\tools\JDDE\JavaDDE.dll"
@@ -229,7 +230,7 @@ Section "Install" Inst
   SetOutPath "$INSTDIR" ; Otherwise the shortcut will have the dictionaries as working directory
   
   ; CreateShortCut "$SMPROGRAMS\${PrgName}.lnk" "$INSTDIR\${PROGEXE}"
-  CreateShortCut "$SMPROGRAMS\${PrgName}.lnk" "$INSTDIR\${PROGBAT}" "" "$INSTDIR\${PROGEXE}" 0 SW_SHOWMINIMIZED
+  CreateShortCut "$SMPROGRAMS\${PrgName}.lnk" "$INSTDIR\${PROGBAT}" "" "$INSTDIR\Simulator.ico" 0 SW_SHOWMINIMIZED
   
   !insertmacro MULTIUSER_RegistryAddInstallInfo
   !insertmacro MULTIUSER_RegistryAddInstallSizeInfo
@@ -240,6 +241,7 @@ Section "Install" Inst
   
   ; Remove files from old installations
   Delete "$INSTDIR\Simulator_Reset.exe"
+  Delete "$INSTDIR\Simulator.exe"
   
   ; Remove failed update setup files
   Delete "$APPDATA\Temp\${SetupFileName}.part"
@@ -270,6 +272,7 @@ Section "un.Uninstall" uninst
   Delete "$INSTDIR\Simulator.exe"
   Delete "$INSTDIR\Simulator.old"
   Delete "$INSTDIR\Simulator.new"
+  Delete "$INSTDIR\Simulator.ico"
   Delete "$INSTDIR\Simulator.jar"
   Delete "$INSTDIR\Simulator_Reset.exe" ; Not installed anymore - but kept in uninstaller when uninstalling old releases
   Delete "$INSTDIR\Simulator.cfg"
diff --git a/Simulator/build/ant-build.xml b/Simulator/build/ant-build.xml
index c411071f..3b81fb29 100644
--- a/Simulator/build/ant-build.xml
+++ b/Simulator/build/ant-build.xml
@@ -311,6 +311,7 @@
 			</fileset>
 		</copy>
 		<copy file="${Simulator.location}/JDBC.cfg" todir="${Release.location}"/>
+		<copy file="${Simulator.location}/src/main/java/ui/res/Symbol.ico" tofile="${Release.location}/Simulator.ico"/>
 		
 		<echo message="Copy help files" />		
 		<copy todir="${Release.location}/docs">
@@ -453,6 +454,7 @@
 
 		<echo message="Clean up" />
 		<delete file="${Release.location}/Simulator.exe" />
+		<delete file="${Release.location}/Simulator.ico" />
 		<delete file="${Release.location}/Simulator.sh" />
 		<delete file="${Release.location}/Simulator.bat" />
 		<delete file="${Release.location}/Splashscreen.png" />