Author: kkolinko
Date: Fri Nov 13 22:35:49 2009
New Revision: 836036
URL: http://svn.apache.org/viewvc?rev=836036&view=rev
Log:
1. Correct some computations in "configure" Function:
a) Always set initial value for $R5
b) $R4 and $R0 have to be consistent when Silent mode is used
2. Correct some messages. Do not mention Windows NT etc., as Win98 is all
history now.
Modified:
tomcat/trunk/res/tomcat.nsi
Modified: tomcat/trunk/res/tomcat.nsi
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/tomcat.nsi?rev=836036&r1=836035&r2=836036&view=diff
==============================================================================
--- tomcat/trunk/res/tomcat.nsi (original)
+++ tomcat/trunk/res/tomcat.nsi Fri Nov 13 22:35:49 2009
@@ -94,10 +94,10 @@
;Descriptions
LangString DESC_SecTomcat ${LANG_ENGLISH} "Install the Tomcat Servlet
container."
LangString DESC_SecTomcatCore ${LANG_ENGLISH} "Install the Tomcat Servlet
container core."
- LangString DESC_SecTomcatService ${LANG_ENGLISH} "Automatically start
Tomcat when the computer is started. This requires Windows NT 4.0, Windows 2000
or Windows XP."
+ LangString DESC_SecTomcatService ${LANG_ENGLISH} "Automatically start
Tomcat when the computer is started."
LangString DESC_SecTomcatNative ${LANG_ENGLISH} "Install APR based Tomcat
native .dll for better performance and scalability in production environments."
LangString DESC_SecMenu ${LANG_ENGLISH} "Create a Start Menu program group
for Tomcat."
- LangString DESC_SecDocs ${LANG_ENGLISH} "Install the Tomcat documentation
bundle. This include documentation on the servlet container and its
configuration options, on the Jasper JSP page compiler, as well as on the
native webserver connectors."
+ LangString DESC_SecDocs ${LANG_ENGLISH} "Install the Tomcat documentation
bundle. This includes documentation on the servlet container and its
configuration options, on the Jasper JSP page compiler, as well as on the
native webserver connectors."
LangString DESC_SecManager ${LANG_ENGLISH} "Install the Tomcat Manager
administrative web application."
LangString DESC_SecHostManager ${LANG_ENGLISH} "Install the Tomcat Host
Manager administrative web application."
LangString DESC_SecExamples ${LANG_ENGLISH} "Install the Servlet and JSP
example web applications."
@@ -184,7 +184,7 @@
Pop $0
StrCmp $0 "0" InstallOk
MessageBox MB_ABORTRETRYIGNORE|MB_ICONSTOP \
- "Failed to install tom...@version_major@ service.$\r$\nCheck your
settings and permissions$\r$\nIgnore and continue anyway (not recommended)?" \
+ "Failed to install tom...@version_major@ service.$\r$\nCheck your
settings and permissions.$\r$\nIgnore and continue anyway (not recommended)?" \
/SD IDIGNORE IDIGNORE InstallOk IDRETRY InstallRetry
Quit
InstallOk:
@@ -589,12 +589,9 @@
!insertmacro MUI_INSTALLOPTIONS_READ $R2 "config.ini" "Field 7" "State"
IfSilent 0 +2
- StrCpy $R4 'port="8080"'
+ StrCpy $R0 '8080'
- IfSilent +2 0
StrCpy $R4 'port="$R0"'
-
- IfSilent 0 +2
StrCpy $R5 ''
IfSilent Silent 0
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
