From a2dfa91598a887cacba730741fdfcd1c78cbe143 Mon Sep 17 00:00:00 2001 From: kkolinko Date: Wed, 3 Aug 2011 16:41:47 +0000 Subject: [PATCH] Explicitly configure what icon is used with Tomcat in the list of uninstallable programs on Windows. Before this it somehow used the icon from Tomcat.exe (feather(, but when the service name contains "-" Windows somehow was not able to find the icon and displayed a default one. With this change the Tomcat (cat) icon will be used. git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1153573 13f79535-47bb-0310-9956-ffa450edef68 --- res/tomcat.nsi | 2 ++ webapps/docs/changelog.xml | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/res/tomcat.nsi b/res/tomcat.nsi index 550d0abb8..2c43d6354 100644 --- a/res/tomcat.nsi +++ b/res/tomcat.nsi @@ -348,6 +348,8 @@ Section -post WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Apache Tomcat @VERSION_MAJOR_MINOR@ $TomcatServiceName" \ "DisplayName" "Apache Tomcat @VERSION_MAJOR_MINOR@ $TomcatServiceName (remove only)" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Apache Tomcat @VERSION_MAJOR_MINOR@ $TomcatServiceName" \ + "DisplayIcon" "$\"$INSTDIR\tomcat.ico$\"" + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Apache Tomcat @VERSION_MAJOR_MINOR@ $TomcatServiceName" \ "UninstallString" "$\"$INSTDIR\Uninstall.exe$\" -ServiceName=$\"$TomcatServiceName$\"" SectionEnd diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 3d88920b5..ec3b87d59 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -258,6 +258,10 @@ without a service name from executing since the uninstall will not be complete. (markt) + + Use Tomcat icon (cat) instead of Apache Commons Daemon (feather) one + in the list of uninstallable programs on Windows. (kkolinko) + Update to Apache Commons Daemon 1.0.7. (markt) -- 2.11.0