|
Lines 38-43
Link Here
|
| 38 |
!include "StrFunc.nsh" |
38 |
!include "StrFunc.nsh" |
| 39 |
!include "LogicLib.nsh" |
39 |
!include "LogicLib.nsh" |
| 40 |
!include "FileFunc.nsh" |
40 |
!include "FileFunc.nsh" |
|
|
41 |
!include "TextFunc.nsh" |
| 41 |
${StrRep} |
42 |
${StrRep} |
| 42 |
|
43 |
|
| 43 |
Var JavaHome |
44 |
Var JavaHome |
|
Lines 354-359
Link Here
|
| 354 |
|
355 |
|
| 355 |
SectionEnd |
356 |
SectionEnd |
| 356 |
|
357 |
|
|
|
358 |
|
| 359 |
!define ReadFromConfigIni "!insertmacro ReadFromConfigIni" |
| 360 |
!macro ReadFromConfigIni Return_Variable Key_Name Config_File |
| 361 |
Push "${Config_File}" |
| 362 |
Push "${Return_Variable}" |
| 363 |
Push "${Key_Name}" |
| 364 |
Call ReadFromConfigIni |
| 365 |
IfErrors +2 |
| 366 |
StrCpy ${Return_Variable} $1 |
| 367 |
!macroend |
| 368 |
|
| 369 |
Function ReadFromConfigIni |
| 370 |
ClearErrors |
| 371 |
; Stack: <Key_Name> <Return_Variable> <Config_File> |
| 372 |
Pop $0 ; <Key_Name> Stack: <Return_Variable> <Config_File> |
| 373 |
Pop $1 ; <Return_Variable> Stack: <Config_File> |
| 374 |
Pop $2 ; <Config_File> Stack: -empty- |
| 375 |
|
| 376 |
${ConfigRead} $2 '$0=' $1 ; <Config_File> <Key_Name> <Return_Variable> |
| 377 |
FunctionEnd |
| 378 |
|
| 379 |
|
| 357 |
Function .onInit |
380 |
Function .onInit |
| 358 |
${GetParameters} $R0 |
381 |
${GetParameters} $R0 |
| 359 |
ClearErrors |
382 |
ClearErrors |
|
Lines 362-367
Link Here
|
| 362 |
${IfNot} ${Errors} |
385 |
${IfNot} ${Errors} |
| 363 |
MessageBox MB_OK|MB_ICONINFORMATION 'Available options:$\r$\n\ |
386 |
MessageBox MB_OK|MB_ICONINFORMATION 'Available options:$\r$\n\ |
| 364 |
/S - Silent install.$\r$\n\ |
387 |
/S - Silent install.$\r$\n\ |
|
|
388 |
/C=config.ini - specify full path of config file to override default values.$\r$\n\ |
| 365 |
/D=INSTDIR - Specify installation directory.' |
389 |
/D=INSTDIR - Specify installation directory.' |
| 366 |
Abort |
390 |
Abort |
| 367 |
${EndIf} |
391 |
${EndIf} |
|
Lines 384-389
Link Here
|
| 384 |
StrCpy $TomcatAdminUsername "" |
408 |
StrCpy $TomcatAdminUsername "" |
| 385 |
StrCpy $TomcatAdminPassword "" |
409 |
StrCpy $TomcatAdminPassword "" |
| 386 |
StrCpy $TomcatAdminRoles "" |
410 |
StrCpy $TomcatAdminRoles "" |
|
|
411 |
|
| 412 |
;override default values in case config file was passed in |
| 413 |
${GetOptions} "$R0" "/C=" $R2 |
| 414 |
${IfNot} ${Errors} |
| 415 |
${ReadFromConfigIni} $JavaHome "JavaHome" $R2 |
| 416 |
${ReadFromConfigIni} $TomcatPortShutdown "TomcatPortShutdown" $R2 |
| 417 |
${ReadFromConfigIni} $TomcatPortHttp "TomcatPortHttp" $R2 |
| 418 |
${ReadFromConfigIni} $TomcatPortAjp "TomcatPortAjp" $R2 |
| 419 |
${ReadFromConfigIni} $TomcatMenuEntriesEnable "TomcatMenuEntriesEnable" $R2 |
| 420 |
${ReadFromConfigIni} $TomcatShortcutAllUsers "TomcatShortcutAllUsers" $R2 |
| 421 |
${ReadFromConfigIni} $TomcatServiceDefaultName "TomcatServiceDefaultName" $R2 |
| 422 |
${ReadFromConfigIni} $TomcatServiceName "TomcatServiceName" $R2 |
| 423 |
${ReadFromConfigIni} $TomcatServiceFileName "TomcatServiceFileName" $R2 |
| 424 |
${ReadFromConfigIni} $TomcatServiceManagerFileName "TomcatServiceManagerFileName" $R2 |
| 425 |
${ReadFromConfigIni} $TomcatAdminEnable "TomcatAdminEnable" $R2 |
| 426 |
${ReadFromConfigIni} $TomcatAdminUsername "TomcatAdminUsername" $R2 |
| 427 |
${ReadFromConfigIni} $TomcatAdminPassword "TomcatAdminPassword" $R2 |
| 428 |
${ReadFromConfigIni} $TomcatAdminRoles "TomcatAdminRoles" $R2 |
| 429 |
${EndIf} |
| 430 |
ClearErrors |
| 431 |
|
| 432 |
|
| 387 |
FunctionEnd |
433 |
FunctionEnd |
| 388 |
|
434 |
|
| 389 |
Function pageChooseJVM |
435 |
Function pageChooseJVM |