Author: markt
Date: Thu Jun 23 22:35:22 2011
New Revision: 1139101
URL: http://svn.apache.org/viewvc?rev=1139101&view=rev
Log:
Use a function to start the service so the service name can be changed during
the install
Modified:
tomcat/trunk/res/tomcat.nsi
Modified: tomcat/trunk/res/tomcat.nsi
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/tomcat.nsi?rev=1139101&r1=1139100&r2=1139101&view=diff
==============================================================================
--- tomcat/trunk/res/tomcat.nsi (original)
+++ tomcat/trunk/res/tomcat.nsi Thu Jun 23 22:35:22 2011
@@ -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@[email protected]
- !define MUI_FINISHPAGE_RUN_FUNCTION "StartService"
$INSTDIR\bin\tomcat@[email protected]
- !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@[email protected]"
"//MR//Tomcat@VERSION_MAJOR@"
+FunctionEnd
+
+
;--------------------------------
;Uninstaller Section
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
