tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mt...@apache.org
Subject cvs commit: jakarta-tomcat-5 tomcat.nsi
Date Sat, 18 Sep 2004 19:29:34 GMT
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


Mime
View raw message