[patch] Rev2 of the patch to add config file support. Incorporated changes suggested by Konstantin Kolinko

tomcat.nsi_add_config_support_rev2.patch (text/plain), 2.65 KB, created by Sandra Madden on 2012-04-04 18:58:31 UTC

(hide)

Description: Rev2 of the patch to add config file support. Incorporated changes suggested by Konstantin Kolinko

Filename:

MIME Type:

Creator: Sandra Madden

Created: 2012-04-04 18:58:31 UTC

Size: 2.65 KB

patch

obsolete

>Index: tomcat.nsi >=================================================================== >--- tomcat.nsi (revision 1309535) >+++ tomcat.nsi (working copy) >@@ -38,6 +38,7 @@ > !include "StrFunc.nsh" > !include "LogicLib.nsh" > !include "FileFunc.nsh" >+!include "TextFunc.nsh" > ${StrRep} > > Var JavaHome >@@ -354,6 +355,28 @@ > > SectionEnd > >+ >+!define ReadFromConfigIni "!insertmacro ReadFromConfigIni" >+!macro ReadFromConfigIni Return_Variable Key_Name Config_File >+ Push "${Config_File}" >+ Push "${Return_Variable}" >+ Push "${Key_Name}" >+ Call ReadFromConfigIni >+ IfErrors +2 >+ StrCpy ${Return_Variable} $1 >+!macroend >+ >+Function ReadFromConfigIni >+ ClearErrors >+ ; Stack: <Key_Name> <Return_Variable> <Config_File> >+ Pop $0 ; <Key_Name> Stack: <Return_Variable> <Config_File> >+ Pop $1 ; <Return_Variable> Stack: <Config_File> >+ Pop $2 ; <Config_File> Stack: -empty- >+ >+ ${ConfigRead} $2 '$0=' $1 ; <Config_File> <Key_Name> <Return_Variable> >+FunctionEnd >+ >+ > Function .onInit > ${GetParameters} $R0 > ClearErrors >@@ -362,6 +385,7 @@ > ${IfNot} ${Errors} > MessageBox MB_OK|MB_ICONINFORMATION 'Available options:$\r$\n\ > /S - Silent install.$\r$\n\ >+ /C=config.ini - specify full path of config file to override default values.$\r$\n\ > /D=INSTDIR - Specify installation directory.' > Abort > ${EndIf} >@@ -384,6 +408,28 @@ > StrCpy $TomcatAdminUsername "" > StrCpy $TomcatAdminPassword "" > StrCpy $TomcatAdminRoles "" >+ >+ ;override default values in case config file was passed in >+ ${GetOptions} "$R0" "/C=" $R2 >+ ${IfNot} ${Errors} >+ ${ReadFromConfigIni} $JavaHome "JavaHome" $R2 >+ ${ReadFromConfigIni} $TomcatPortShutdown "TomcatPortShutdown" $R2 >+ ${ReadFromConfigIni} $TomcatPortHttp "TomcatPortHttp" $R2 >+ ${ReadFromConfigIni} $TomcatPortAjp "TomcatPortAjp" $R2 >+ ${ReadFromConfigIni} $TomcatMenuEntriesEnable "TomcatMenuEntriesEnable" $R2 >+ ${ReadFromConfigIni} $TomcatShortcutAllUsers "TomcatShortcutAllUsers" $R2 >+ ${ReadFromConfigIni} $TomcatServiceDefaultName "TomcatServiceDefaultName" $R2 >+ ${ReadFromConfigIni} $TomcatServiceName "TomcatServiceName" $R2 >+ ${ReadFromConfigIni} $TomcatServiceFileName "TomcatServiceFileName" $R2 >+ ${ReadFromConfigIni} $TomcatServiceManagerFileName "TomcatServiceManagerFileName" $R2 >+ ${ReadFromConfigIni} $TomcatAdminEnable "TomcatAdminEnable" $R2 >+ ${ReadFromConfigIni} $TomcatAdminUsername "TomcatAdminUsername" $R2 >+ ${ReadFromConfigIni} $TomcatAdminPassword "TomcatAdminPassword" $R2 >+ ${ReadFromConfigIni} $TomcatAdminRoles "TomcatAdminRoles" $R2 >+ ${EndIf} >+ ClearErrors >+ >+ > FunctionEnd > > Function pageChooseJVM View Attachment As Diff View Attachment As Raw

This is ASF Bugzilla: the Apache Software Foundation bug system. In case of problems with the functioning of ASF Bugzilla, please contact bugzilla-admin@apache.org. Please Note: this e-mail address is only for reporting problems with ASF Bugzilla. Mail about any other subject will be silently ignored.

• • Home
  • | New
  • | Browse
  • | Search
  • |
    [?]
  • | Reports
  • | Help
  • | New Account
  • | Log In
    Remember [x]
  • | Forgot Password
    Login: [x]