tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kkoli...@apache.org
Subject svn commit: r1153573 - in /tomcat/trunk: res/tomcat.nsi webapps/docs/changelog.xml
Date Wed, 03 Aug 2011 16:41:48 GMT
Author: kkolinko
Date: Wed Aug  3 16:41:47 2011
New Revision: 1153573

URL: http://svn.apache.org/viewvc?rev=1153573&view=rev
Log:
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<N>.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.

Modified:
    tomcat/trunk/res/tomcat.nsi
    tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/res/tomcat.nsi
URL: http://svn.apache.org/viewvc/tomcat/trunk/res/tomcat.nsi?rev=1153573&r1=1153572&r2=1153573&view=diff
==============================================================================
--- tomcat/trunk/res/tomcat.nsi (original)
+++ tomcat/trunk/res/tomcat.nsi Wed Aug  3 16:41:47 2011
@@ -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

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1153573&r1=1153572&r2=1153573&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Wed Aug  3 16:41:47 2011
@@ -258,6 +258,10 @@
         without a service name from executing since the uninstall will not be
         complete. (markt)
       </fix>
+      <fix>
+        Use Tomcat icon (cat) instead of Apache Commons Daemon (feather) one
+        in the list of uninstallable programs on Windows. (kkolinko) 
+      </fix>
       <update>
         Update to Apache Commons Daemon 1.0.7. (markt)
       </update>



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message