From 659c0cd3ee4b9581c12ac2cd1b4162bf07a921ce Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Sun, 19 Aug 2012 10:02:16 -0700 Subject: [PATCH] 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 --- altosui/altos-windows.nsi | 3 +++ 1 file changed, 3 insertions(+) diff --git a/altosui/altos-windows.nsi b/altosui/altos-windows.nsi index 92c985a9..986919d4 100644 --- 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: -- 2.30.2