Author: tyrell
Date: Wed Jul  9 09:15:23 2008
New Revision: 19047
URL: http://wso2.org/svn/browse/wso2?view=rev&revision=19047

Log:
Fixing MASHUP-914

Modified:
   trunk/mashup/java/modules/distribution/installer/mashupserver-setup.nsi

Modified: 
trunk/mashup/java/modules/distribution/installer/mashupserver-setup.nsi
URL: 
http://wso2.org/svn/browse/wso2/trunk/mashup/java/modules/distribution/installer/mashupserver-setup.nsi?rev=19047&r1=19046&r2=19047&view=diff
==============================================================================
--- trunk/mashup/java/modules/distribution/installer/mashupserver-setup.nsi     
(original)
+++ trunk/mashup/java/modules/distribution/installer/mashupserver-setup.nsi     
Wed Jul  9 09:15:23 2008
@@ -216,7 +216,7 @@
             Delete $2
             Goto done
         no:
-           MessageBox MB_OK|MB_ICONEXCLAMATION "The $(^Name) requires Java 
${JRE_VERSION}. \
+           MessageBox MB_OK|MB_ICONEXCLAMATION "The $(^Name) requires Java 
${JRE_VERSION} or higher. \
               Please ensure that a compatible Java version is installed and 
the JAVA_HOME environment variable is set."
         
         done:
@@ -226,7 +226,8 @@
 Function DetectJRE
   ReadRegStr $2 HKLM "SOFTWARE\JavaSoft\Java Runtime Environment" \
              "CurrentVersion"
-  StrCmp $2 ${JRE_VERSION} done
+  StrCmp $2 ${JRE_VERSION} done     # If 1.5 is there we're ok
+  StrCmp $2 "1.6" done              # If 1.6 is there we're ok              
   
   Call GetJRE
   

_______________________________________________
Mashup-dev mailing list
[email protected]
http://wso2.org/cgi-bin/mailman/listinfo/mashup-dev

Reply via email to