You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2011/06/24 00:25:12 UTC
svn commit: r1139098 - /tomcat/trunk/res/tomcat.nsi
Author: markt
Date: Thu Jun 23 22:25:12 2011
New Revision: 1139098
URL: http://svn.apache.org/viewvc?rev=1139098&view=rev
Log:
Remove inaccurate comment
Modified:
tomcat/trunk/res/tomcat.nsi
Modified: tomcat/trunk/res/tomcat.nsi
URL: http://svn.apache.org/viewvc/tomcat/trunk/res/tomcat.nsi?rev=1139098&r1=1139097&r2=1139098&view=diff
==============================================================================
--- tomcat/trunk/res/tomcat.nsi (original)
+++ tomcat/trunk/res/tomcat.nsi Thu Jun 23 22:25:12 2011
@@ -74,6 +74,7 @@ Var ServiceInstallLog
!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_NOREBOOTSUPPORT
@@ -881,12 +882,6 @@ FunctionEnd
; =================
; createShortcuts Function
; =================
-;
-; This is called by the SecMenu section.
-;
-; The code is moved here, because ${SecManager} etc. are not visible
-; in SecMenu, because they are defined lower than it.
-;
Function createShortcuts
${If} $TomcatShortcutAllUsers == ${BST_CHECKED}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: svn commit: r1139098 - /tomcat/trunk/res/tomcat.nsi
Posted by ma...@apache.org.
Mladen Turk <mt...@apache.org> wrote:
>On Fri, Jun 24, 2011 at 12:27 AM, Mark Thomas <ma...@apache.org> wrote:
>>> + !define MUI_FINISHPAGE_RUN_FUNCTION "StartService"
>$INSTDIR\bin\tomcat@VERSION_MAJOR@w.exe
>>
>> Sorry about this random line. I'll fix it in the next commit
>>
>
>Does it mean that the service will be always started when the install
>finishes?
No. It works exactly as before. By using a function we can delay specifying the actual service name to the end of the install.
The next task is ensuring that the registry entries for multiple services don't clash. That should be doable. The last bit, getting the service name from the user, is the easy bit although it will need validation. I hope to get this done later today.
Mark
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: svn commit: r1139098 - /tomcat/trunk/res/tomcat.nsi
Posted by Mladen Turk <mt...@apache.org>.
On Fri, Jun 24, 2011 at 12:27 AM, Mark Thomas <ma...@apache.org> wrote:
>> + !define MUI_FINISHPAGE_RUN_FUNCTION "StartService" $INSTDIR\bin\tomcat@VERSION_MAJOR@w.exe
>
> Sorry about this random line. I'll fix it in the next commit
>
Does it mean that the service will be always started when the install finishes?
If does, I don't think that's good, cause tomcat installer might be
part of higher level installer
that calls silent tomcat install as a prerequisite and the tomcat
might not be ready to start at that time.
Regards
--
^TM
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: svn commit: r1139098 - /tomcat/trunk/res/tomcat.nsi
Posted by Mark Thomas <ma...@apache.org>.
On 23/06/2011 23:25, markt@apache.org wrote:
> Author: markt
> Date: Thu Jun 23 22:25:12 2011
> New Revision: 1139098
>
> URL: http://svn.apache.org/viewvc?rev=1139098&view=rev
> Log:
> Remove inaccurate comment
>
> Modified:
> tomcat/trunk/res/tomcat.nsi
>
> Modified: tomcat/trunk/res/tomcat.nsi
> URL: http://svn.apache.org/viewvc/tomcat/trunk/res/tomcat.nsi?rev=1139098&r1=1139097&r2=1139098&view=diff
> ==============================================================================
> --- tomcat/trunk/res/tomcat.nsi (original)
> +++ tomcat/trunk/res/tomcat.nsi Thu Jun 23 22:25:12 2011
> @@ -74,6 +74,7 @@ Var ServiceInstallLog
> !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
Sorry about this random line. I'll fix it in the next commit
Mark
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org