You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by kk...@apache.org on 2014/04/11 15:08:47 UTC
svn commit: r1586641 - /tomcat/tc6.0.x/trunk/res/tomcat.nsi
Author: kkolinko
Date: Fri Apr 11 13:08:46 2014
New Revision: 1586641
URL: http://svn.apache.org/r1586641
Log:
CTR: whitespaces
Aligning this file with Tomcat 7 one before proposing a patch
Modified:
tomcat/tc6.0.x/trunk/res/tomcat.nsi
Modified: tomcat/tc6.0.x/trunk/res/tomcat.nsi
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/res/tomcat.nsi?rev=1586641&r1=1586640&r2=1586641&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/res/tomcat.nsi (original)
+++ tomcat/tc6.0.x/trunk/res/tomcat.nsi Fri Apr 11 13:08:46 2014
@@ -333,7 +333,7 @@ Section -post
${Else}
WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Run" "ApacheTomcatMonitor@VERSION_MAJOR_MINOR@_$TomcatServiceName" '"$INSTDIR\bin\$TomcatServiceManagerFileName" //MS//$TomcatServiceName'
${EndIf}
-
+
${If} $TomcatMenuEntriesEnable == "1"
Call createShortcuts
${EndIf}
@@ -453,7 +453,7 @@ Function pageComponentsLeave
StrCpy $TomcatAdminRoles "admin-gui"
${EndIf}
${EndIf}
-
+
SectionGetFlags ${SecMenu} $0
IntOp $0 $0 & ${SF_SELECTED}
${If} $0 <> 0
@@ -575,7 +575,7 @@ Function pageConfigurationLeave
Push $TomcatServiceName
Call validateServiceName
Pop $0
-
+
IntCmp $0 1 exit
MessageBox MB_ICONEXCLAMATION|MB_OK 'The Service Name may not contain a space or any of the following characters: <>:"/\:|?*'
Abort "Config not right"
@@ -595,7 +595,7 @@ Function validateServiceName
StrLen $1 $0
StrCpy $3 '<>:"/\:|?* '
StrLen $4 $3
-
+
loopInput:
IntOp $1 $1 - 1
IntCmp $1 -1 valid
@@ -612,7 +612,7 @@ Function validateServiceName
invalid:
Push 0
Goto exit
-
+
valid:
Push 1
exit:
@@ -814,7 +814,7 @@ Function findJavaHome
IfErrors 0 +2
StrCpy $1 ""
ClearErrors
-
+
; If using 64-bit, go back to using 64-bit registry
${If} $0 != "%PROGRAMW6432%"
SetRegView 64
@@ -914,7 +914,7 @@ Function configure
Call copyFile
FileClose $R9
Delete "$INSTDIR\conf\server.xml.new"
-
+
DetailPrint 'Server shutdown listener configured on port "$TomcatPortShutdown"'
DetailPrint 'HTTP/1.1 Connector configured on port "$TomcatPortHttp"'
DetailPrint 'AJP/1.3 Connector configured on port "$TomcatPortAjp"'
@@ -1023,7 +1023,7 @@ Function createShortcuts
${If} $TomcatShortcutAllUsers == ${BST_CHECKED}
SetShellVarContext all
${EndIf}
-
+
SetOutPath "$SMPROGRAMS\Apache Tomcat @VERSION_MAJOR_MINOR@ $TomcatServiceName"
CreateShortCut "$SMPROGRAMS\Apache Tomcat @VERSION_MAJOR_MINOR@ $TomcatServiceName\Tomcat Home Page.lnk" \
@@ -1091,7 +1091,7 @@ Section Uninstall
the command line with -ServiceName=$\"<name of service>$\"."
Quit
${EndIf}
-
+
Delete "$INSTDIR\Uninstall.exe"
; Stop Tomcat service monitor if running
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org