From 117433e854875e2db5bb9b9f7dad1fb40148db71 Mon Sep 17 00:00:00 2001 From: kkolinko Date: Thu, 3 Jun 2010 06:17:47 +0000 Subject: [PATCH] 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. git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@950885 13f79535-47bb-0310-9956-ffa450edef68 --- res/tomcat.nsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/res/tomcat.nsi b/res/tomcat.nsi index 02b30dd13..47246d9ad 100644 --- a/res/tomcat.nsi +++ b/res/tomcat.nsi @@ -209,7 +209,7 @@ Section "Service" SecTomcatService nsExec::ExecToLog '"$INSTDIR\bin\tomcat@VERSION_MAJOR@.exe" //US//Tomcat@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\tomcat@VERSION_MAJOR@w.exe" //MS//Tomcat@VERSION_MAJOR@' + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Run" "ApacheTomcatMonitor@VERSION_MAJOR_MINOR@" '"$INSTDIR\bin\tomcat@VERSION_MAJOR@w.exe" //MS//Tomcat@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\Tomcat\@VERSION_MAJOR_MINOR@" - DeleteRegValue HKLM "Software\Microsoft\Windows\CurrentVersion\Run" "ApacheTomcatMonitor" + DeleteRegValue HKLM "Software\Microsoft\Windows\CurrentVersion\Run" "ApacheTomcatMonitor@VERSION_MAJOR_MINOR@" RMDir /r "$SMPROGRAMS\Apache Tomcat @VERSION_MAJOR_MINOR@" Delete "$INSTDIR\tomcat.ico" Delete "$INSTDIR\LICENSE" -- 2.11.0