Return-Path: Delivered-To: apmail-jakarta-tomcat-dev-archive@www.apache.org Received: (qmail 82989 invoked from network); 18 Sep 2004 19:29:49 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 18 Sep 2004 19:29:49 -0000 Received: (qmail 744 invoked by uid 500); 18 Sep 2004 19:29:37 -0000 Delivered-To: apmail-jakarta-tomcat-dev-archive@jakarta.apache.org Received: (qmail 664 invoked by uid 500); 18 Sep 2004 19:29:37 -0000 Mailing-List: contact tomcat-dev-help@jakarta.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Tomcat Developers List" Reply-To: "Tomcat Developers List" Delivered-To: mailing list tomcat-dev@jakarta.apache.org Received: (qmail 585 invoked by uid 500); 18 Sep 2004 19:29:36 -0000 Received: (qmail 562 invoked by uid 99); 18 Sep 2004 19:29:36 -0000 X-ASF-Spam-Status: No, hits=-9.9 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME,UPPERCASE_25_50 X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Sat, 18 Sep 2004 12:29:36 -0700 Received: (qmail 82854 invoked by uid 1526); 18 Sep 2004 19:29:34 -0000 Date: 18 Sep 2004 19:29:34 -0000 Message-ID: <20040918192934.82853.qmail@minotaur.apache.org> From: mturk@apache.org To: jakarta-tomcat-5-cvs@apache.org Subject: cvs commit: jakarta-tomcat-5 tomcat.nsi X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N mturk 2004/09/18 12:29:34 Modified: . tomcat.nsi Log: Use new MR option to run the service if the user selects that. Use new MQ option to shutdown the monitor application on uninstall. Revision Changes Path 1.64 +7 -2 jakarta-tomcat-5/tomcat.nsi Index: tomcat.nsi =================================================================== RCS file: /home/cvs/jakarta-tomcat-5/tomcat.nsi,v retrieving revision 1.63 retrieving revision 1.64 diff -u -r1.63 -r1.64 --- tomcat.nsi 18 Sep 2004 17:43:34 -0000 1.63 +++ tomcat.nsi 18 Sep 2004 19:29:34 -0000 1.64 @@ -37,7 +37,7 @@ !define MUI_WELCOMEFINISHPAGE_BITMAP side_left.bmp !define MUI_FINISHPAGE_SHOWREADME "$INSTDIR\webapps\ROOT\RELEASE-NOTES.txt" !define MUI_FINISHPAGE_RUN $INSTDIR\bin\tomcat5w.exe - !define MUI_FINISHPAGE_RUN_PARAMETERS //MS//Tomcat5 + !define MUI_FINISHPAGE_RUN_PARAMETERS //MR//Tomcat5 !define MUI_FINISHPAGE_NOREBOOTSUPPORT !define MUI_ABORTWARNING @@ -187,6 +187,8 @@ Pop $2 nsExec::ExecToLog '"$INSTDIR\bin\tomcat5.exe" //US//Tomcat5 --Startup auto' + ; Bahave like Apache Httpd (put the icon in try on login) + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Run" "ApacheTomcatMonitor" '"$INSTDIR\bin\tomcat5w.exe" //MS//Tomcat5' ClearErrors @@ -595,6 +597,8 @@ Delete "$INSTDIR\modern.exe" Delete "$INSTDIR\Uninstall.exe" + ; Stop Tomcat service monitor if running + nsExec::ExecToLog '"$INSTDIR\bin\tomcat5w.exe" //MQ//Tomcat5' ; Delete Tomcat service nsExec::ExecToLog '"$INSTDIR\bin\tomcat5.exe" //DS//Tomcat5' ClearErrors @@ -602,6 +606,7 @@ DeleteRegKey HKCR "JSPFile" DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Apache Tomcat 5.5" DeleteRegKey HKLM "SOFTWARE\Apache Software Foundation\Tomcat\5.5" + DeleteRegValue HKLM "Software\Microsoft\Windows\CurrentVersion\Run" "ApacheTomcatMonitor" RMDir /r "$SMPROGRAMS\Apache Tomcat 5.5" Delete "$INSTDIR\tomcat.ico" Delete "$INSTDIR\LICENSE" --------------------------------------------------------------------- To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org