|
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 |
Var _String |
| 359 |
Var _DefaultValue |
| 360 |
Var _Result |
| 361 |
|
| 362 |
!macro _Call func return param1 param2 |
| 363 |
Push $_String |
| 364 |
Push $_DefaultValue |
| 365 |
|
| 366 |
StrCpy $_String '${param1}' |
| 367 |
StrCpy $_DefaultValue '${param2}' |
| 368 |
Call ${func} |
| 369 |
StrCpy ${return} $_Result |
| 370 |
|
| 371 |
Pop $_DefaultValue |
| 372 |
Pop $_String |
| 373 |
!macroend |
| 374 |
|
| 375 |
!define ReadFromConfigIni "!insertmacro _ReadFromConfigIni" |
| 376 |
!macro _ReadFromConfigIni return param1 param2 |
| 377 |
!insertmacro _Call ReadFromConfigIniFunc ${return} '${param1}' '${param2}' |
| 378 |
!macroend |
| 379 |
Function ReadFromConfigIniFunc |
| 380 |
${ConfigRead} $EXEDIR\config.ini '$_String=' $_Result |
| 381 |
IfErrors 0 done |
| 382 |
StrCpy $_Result '$_DefaultValue' |
| 383 |
|
| 384 |
done: |
| 385 |
FunctionEnd |
| 386 |
|
| 387 |
|
| 357 |
Function .onInit |
388 |
Function .onInit |
| 358 |
${GetParameters} $R0 |
389 |
${GetParameters} $R0 |
| 359 |
ClearErrors |
390 |
ClearErrors |
|
Lines 370-389
Link Here
|
| 370 |
StrCpy $ResetInstDir "$INSTDIR" |
401 |
StrCpy $ResetInstDir "$INSTDIR" |
| 371 |
|
402 |
|
| 372 |
;Initialize default values |
403 |
;Initialize default values |
| 373 |
StrCpy $JavaHome "" |
404 |
${ReadFromConfigIni} $JavaHome "JavaHome" "" |
| 374 |
StrCpy $TomcatPortShutdown "8005" |
405 |
${ReadFromConfigIni} $TomcatPortShutdown "TomcatPortShutdown" "8007" |
| 375 |
StrCpy $TomcatPortHttp "8080" |
406 |
${ReadFromConfigIni} $TomcatPortHttp "TomcatPortHttp" "8080" |
| 376 |
StrCpy $TomcatPortAjp "8009" |
407 |
${ReadFromConfigIni} $TomcatPortAjp "TomcatPortAjp" "8009" |
| 377 |
StrCpy $TomcatMenuEntriesEnable "0" |
408 |
${ReadFromConfigIni} $TomcatMenuEntriesEnable "TomcatMenuEntriesEnable" "0" |
| 378 |
StrCpy $TomcatShortcutAllUsers "0" |
409 |
${ReadFromConfigIni} $TomcatShortcutAllUsers "TomcatShortcutAllUsers" "0" |
| 379 |
StrCpy $TomcatServiceDefaultName "Tomcat@VERSION_MAJOR@" |
410 |
${ReadFromConfigIni} $TomcatServiceDefaultName "TomcatServiceDefaultName" "Tomcat@VERSION_MAJOR@" |
| 380 |
StrCpy $TomcatServiceName $TomcatServiceDefaultName |
411 |
${ReadFromConfigIni} $TomcatServiceName "TomcatServiceName" $TomcatServiceDefaultName |
| 381 |
StrCpy $TomcatServiceFileName "Tomcat@VERSION_MAJOR@.exe" |
412 |
${ReadFromConfigIni} $TomcatServiceFileName "TomcatServiceFileName" "Tomcat@VERSION_MAJOR@.exe" |
| 382 |
StrCpy $TomcatServiceManagerFileName "Tomcat@VERSION_MAJOR@w.exe" |
413 |
${ReadFromConfigIni} $TomcatServiceManagerFileName "TomcatServiceManagerFileName" "Tomcat@VERSION_MAJOR@w.exe" |
| 383 |
StrCpy $TomcatAdminEnable "0" |
414 |
${ReadFromConfigIni} $TomcatAdminEnable "TomcatAdminEnable" "0" |
| 384 |
StrCpy $TomcatAdminUsername "" |
415 |
${ReadFromConfigIni} $TomcatAdminUsername "TomcatAdminUsername" "" |
| 385 |
StrCpy $TomcatAdminPassword "" |
416 |
${ReadFromConfigIni} $TomcatAdminPassword "TomcatAdminPassword" "" |
| 386 |
StrCpy $TomcatAdminRoles "" |
417 |
${ReadFromConfigIni} $TomcatAdminRoles "TomcatAdminRoles" "" |
|
|
418 |
|
| 387 |
FunctionEnd |
419 |
FunctionEnd |
| 388 |
|
420 |
|
| 389 |
Function pageChooseJVM |
421 |
Function pageChooseJVM |