remm        2004/02/11 04:54:30

  Modified:    .        tomcat.nsi
  Log:
  - Add support for silent installations.
  
  Revision  Changes    Path
  1.42      +23 -1     jakarta-tomcat-5/tomcat.nsi
  
  Index: tomcat.nsi
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-5/tomcat.nsi,v
  retrieving revision 1.41
  retrieving revision 1.42
  diff -u -r1.41 -r1.42
  --- tomcat.nsi        1 Feb 2004 18:27:28 -0000       1.41
  +++ tomcat.nsi        11 Feb 2004 12:54:30 -0000      1.42
  @@ -105,6 +105,7 @@
   
     SectionIn 1 2 3
   
  +  IfSilent +2 0
     Call checkJvm
   
     SetOutPath $INSTDIR
  @@ -122,7 +123,13 @@
     File /r webapps\balancer
     File /r webapps\ROOT
   
  +  IfSilent 0 +3
  +  Call findJavaPath
  +  Pop $2
  +
  +  IfSilent +2 0
     !insertmacro MUI_INSTALLOPTIONS_READ $2 "jvm.ini" "Field 2" "State"
  +
     CopyFiles /SILENT "$2\lib\tools.jar" "$INSTDIR\common\lib" 4500
     ClearErrors
   
  @@ -136,7 +143,13 @@
   
     SectionIn 3
   
  +  IfSilent 0 +3
  +  Call findJavaPath
  +  Pop $2
  +
  +  IfSilent +2 0
     !insertmacro MUI_INSTALLOPTIONS_READ $2 "jvm.ini" "Field 2" "State"
  +
     Push $2
     Call findJVMPath
     Pop $2
  @@ -392,7 +405,16 @@
     !insertmacro MUI_INSTALLOPTIONS_READ $R1 "config.ini" "Field 5" "State"
     !insertmacro MUI_INSTALLOPTIONS_READ $R2 "config.ini" "Field 7" "State"
   
  +  IfSilent 0 +2
  +  StrCpy $R4 'port="8080"'
  +
  +  IfSilent +2 0
     StrCpy $R4 'port="$R0"'
  +
  +  IfSilent 0 +2
  +  StrCpy $R5 ''
  +
  +  IfSilent +2 0
     StrCpy $R5 '<user name="$R1" password="$R2" roles="admin,manager" />'
   
     DetailPrint 'HTTP/1.1 Connector configured on port "$R0"'
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to