From: markt Date: Thu, 23 Jun 2011 22:35:22 +0000 (+0000) Subject: Use a function to start the service so the service name can be changed during the... X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=b7c23e327fd7627abb05f8780a92f1067c1143f7;p=tomcat7.0 Use a function to start the service so the service name can be changed during the install git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1139101 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/res/tomcat.nsi b/res/tomcat.nsi index 77c679f61..846ddc495 100644 --- a/res/tomcat.nsi +++ b/res/tomcat.nsi @@ -73,9 +73,8 @@ Var ServiceInstallLog !define MUI_HEADERIMAGE_BITMAP header.bmp !define MUI_WELCOMEFINISHPAGE_BITMAP side_left.bmp !define MUI_FINISHPAGE_SHOWREADME "$INSTDIR\webapps\ROOT\RELEASE-NOTES.txt" - !define MUI_FINISHPAGE_RUN $INSTDIR\bin\tomcat@VERSION_MAJOR@w.exe - !define MUI_FINISHPAGE_RUN_FUNCTION "StartService" $INSTDIR\bin\tomcat@VERSION_MAJOR@w.exe - !define MUI_FINISHPAGE_RUN_PARAMETERS //MR//Tomcat@VERSION_MAJOR@ + !define MUI_FINISHPAGE_RUN + !define MUI_FINISHPAGE_RUN_FUNCTION "startService" !define MUI_FINISHPAGE_NOREBOOTSUPPORT !define MUI_ABORTWARNING @@ -933,6 +932,16 @@ Function createShortcuts FunctionEnd +; ================= +; startService Function +; +; Using a function allows the service name to be varied +; ================= +Function startService + ExecShell "" "$INSTDIR\bin\tomcat@VERSION_MAJOR@w.exe" "//MR//Tomcat@VERSION_MAJOR@" +FunctionEnd + + ;-------------------------------- ;Uninstaller Section