Author: kkolinko
Date: Thu Jun 3 06:17:47 2010
New Revision: 950885
URL: http://svn.apache.org/viewvc?rev=950885&view=rev
Log:
Include major.minor version numbers into the name of the registry key used to
autolaunch Tomcat Monitor at Windows startup. This allows Tomcat 7 monitor to
be installed and run in parallel to the Tomcat 6 one.
Modified:
tomcat/trunk/res/tomcat.nsi
Modified: tomcat/trunk/res/tomcat.nsi
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/tomcat.nsi?rev=950885&r1=950884&r2=950885&view=diff
==============================================================================
--- tomcat/trunk/res/tomcat.nsi (original)
+++ tomcat/trunk/res/tomcat.nsi Thu Jun 3 06:17:47 2010
@@ -209,7 +209,7 @@ Section "Service" SecTomcatService
nsExec::ExecToLog '"$instdir\bin\tom...@version_major@.exe"
//US//tom...@version_major@ --Startup auto'
; Behave like Apache Httpd (put the icon in tray on login)
- WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Run"
"ApacheTomcatMonitor" '"$instdir\bin\tom...@version_major@w.exe"
//MS//tom...@version_major@'
+ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Run"
"apachetomcatmoni...@version_major_minor@"
'"$instdir\bin\tom...@version_major@w.exe" //MS//tom...@version_major@'
ClearErrors
@@ -716,7 +716,7 @@ Section Uninstall
DeleteRegKey HKCR "JSPFile"
DeleteRegKey HKLM
"Software\Microsoft\Windows\CurrentVersion\Uninstall\Apache Tomcat
@VERSION_MAJOR_MINOR@"
DeleteRegKey HKLM "SOFTWARE\Apache Software
foundation\tomc...@version_major_minor@"
- DeleteRegValue HKLM "Software\Microsoft\Windows\CurrentVersion\Run"
"ApacheTomcatMonitor"
+ DeleteRegValue HKLM "Software\Microsoft\Windows\CurrentVersion\Run"
"apachetomcatmoni...@version_major_minor@"
RMDir /r "$SMPROGRAMS\Apache Tomcat @VERSION_MAJOR_MINOR@"
Delete "$INSTDIR\tomcat.ico"
Delete "$INSTDIR\LICENSE"
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
