X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosui%2Faltos-windows.nsi;h=986919d4a4297c0291ddca7e1ae0e89e8938a399;hb=583458772746317b98fced907ec780edff465888;hp=92c985a9550db170274d78300a40dc4931b9c6e6;hpb=7be98836e69a222b2f9f4baacddcf12d168e2207;p=fw%2Faltos 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: