Merge remote-tracking branch 'mjb/master'

[fw/altos] / altosui / altos-windows.nsi

diff --git a/altosui/altos-windows.nsi b/altosui/altos-windows.nsi
index e5e01d7977e969b73d14e3dbe66163126d5b6746..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:
@@ -126,6 +129,7 @@ Section "Documentation"
        File "../doc/altos.pdf"
        File "../doc/telemetry.pdf"
        File "../doc/telemetrum-outline.pdf"
+       File "../doc/megametrum-outline.pdf"
 SectionEnd
 
 Section "Uninstaller"