Author: markt
Date: Mon Aug 4 18:43:42 2014
New Revision: 1615725
URL: http://svn.apache.org/r1615725
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56788
Display the full version in the list of installed applications when installed
via the Windows installer package. Patch provided by Alexandre Garnier.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/res/tomcat.nsi
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1615724
Modified: tomcat/tc7.0.x/trunk/res/tomcat.nsi
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/tomcat.nsi?rev=1615725&r1=1615724&r2=1615725&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/res/tomcat.nsi (original)
+++ tomcat/tc7.0.x/trunk/res/tomcat.nsi Mon Aug 4 18:43:42 2014
@@ -345,6 +345,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" \
+ "DisplayVersion" @VERSION@
+ 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$\""
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1615725&r1=1615724&r2=1615725&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Mon Aug 4 18:43:42 2014
@@ -105,6 +105,15 @@
</fix>
</changelog>
</subsection>
+ <subsection name="Other">
+ <changelog>
+ <add>
+ <bug>56788</bug>: Display the full version in the list of installed
+ applications when installed via the Windows installer package. Patch
+ provided by Alexandre Garnier. (markt)
+ </add>
+ </changelog>
+ </subsection>
</section>
<section name="Tomcat 7.0.55 (violetagg)" rtext="released 2014-07-27">
<subsection name="Catalina">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
