svn commit: r1033856 - /tomcat/trunk/res/tomcat.nsi

[kk...@apache.org]

Author: kkolinko
Date: Thu Nov 11 09:40:26 2010
New Revision: 1033856

URL: http://svn.apache.org/viewvc?rev=1033856&view=rev
Log:
Folloup to 1027504:
NSIS docs say that using relative offset in Goto does not play well with macros, because those may be expanded into several lines. Use a label instead.

Modified:
    tomcat/trunk/res/tomcat.nsi

Modified: tomcat/trunk/res/tomcat.nsi
URL: http://svn.apache.org/viewvc/tomcat/trunk/res/tomcat.nsi?rev=1033856&r1=1033855&r2=1033856&view=diff
==============================================================================
--- tomcat/trunk/res/tomcat.nsi (original)
+++ tomcat/trunk/res/tomcat.nsi Thu Nov 11 09:40:26 2010
@@ -465,11 +465,12 @@ FunctionEnd
 ; 64-bit JVMs, also determines if it is x64 or ia64
 Function checkJava
 
-  IfSilent +3
+  IfSilent SilentFindJavaHome
   !insertmacro MUI_INSTALLOPTIONS_READ $5 "jvm.ini" "Field 2" "State"
   Goto TestJavaHome
   
   ; Silent install so try and find JavaHome from registry
+SilentFindJavaHome:
   Call findJavaHome
   Pop $5
   
@@ -568,7 +569,7 @@ FunctionEnd
 ; ====================
 ;
 ; Find the full JVM path, and put the result on top of the stack
-; Argument: JVM base path (result of findJavaHome)
+; Implicit argument: $JavaHome
 ; Will return an empty string if the path cannot be determined
 ;
 Function findJVMPath



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org