diff options
| author | Keith Packard <keithp@keithp.com> | 2012-08-19 10:02:16 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2012-08-19 10:02:16 -0700 |
| commit | 659c0cd3ee4b9581c12ac2cd1b4162bf07a921ce (patch) | |
| tree | 03e59a95aedaf2f8bc3d2bef7e1277ee5b3dc6c1 /altosui | |
| parent | ab1279cc6a683595631d7ac8bed7b36e0c8a691c (diff) | |
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>
Diffstat (limited to 'altosui')
| -rw-r--r-- | altosui/altos-windows.nsi | 3 |
1 files changed, 3 insertions, 0 deletions
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: |