altosui: Check for JRE 1.7 in Windows installer

altosui runs fine with version 1.7 (on Linux at least), so allow that
version to satisfy the java check instead of requiring the user to
down-grade to 1.6

Signed-off-by: Keith Packard <keithp@keithp.com>

diff --git a/altosui/altos-windows.nsi b/altosui/altos-windows.nsi
index 92c985a9550db170274d78300a40dc4931b9c6e6..986919d4a4297c0291ddca7e1ae0e89e8938a399 100644 (file)
--- a/altosui/altos-windows.nsi
+++ b/altosui/altos-windows.nsi
@@ -1,6 +1,7 @@
 !addplugindir Instdrv/NSIS/Plugins
 ; Definitions for Java 1.6 Detection
 !define JRE_VERSION "1.6"
+!define JRE_ALTERNATE "1.7"
 !define JRE_URL "http://javadl.sun.com/webapps/download/AutoDL?BundleId=52247&/jre-6u27-windows-i586-p.exe"
 !define PRODUCT_NAME "Altus Metrum Windows Software"
 
@@ -42,6 +43,8 @@ Function DetectJRE
              "CurrentVersion"
   StrCmp $2 ${JRE_VERSION} done
 
+  StrCmp $2 ${JRE_ALTERNATE} done
+
   Call GetJRE
 
   done: