projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altosui: Check for JRE 1.7 in Windows installer
[fw/altos]
/
altosui
/
altos-windows.nsi
diff --git
a/altosui/altos-windows.nsi
b/altosui/altos-windows.nsi
index 70dc03ca973ca7e4a19c8fe3acdb570a28a7ce61..986919d4a4297c0291ddca7e1ae0e89e8938a399 100644
(file)
--- a/
altosui/altos-windows.nsi
+++ b/
altosui/altos-windows.nsi
@@
-1,7
+1,8
@@
!addplugindir Instdrv/NSIS/Plugins
; Definitions for Java 1.6 Detection
!define JRE_VERSION "1.6"
!addplugindir Instdrv/NSIS/Plugins
; Definitions for Java 1.6 Detection
!define JRE_VERSION "1.6"
-!define JRE_URL "http://javadl.sun.com/webapps/download/AutoDL?BundleId=18714&/jre-6u5-windows-i586-p.exe"
+!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"
Name "Altus Metrum Installer"
!define PRODUCT_NAME "Altus Metrum Windows Software"
Name "Altus Metrum Installer"
@@
-23,7
+24,7
@@
ShowInstDetails Show
ComponentText "Altus Metrum Software and Driver Installer"
Function GetJRE
ComponentText "Altus Metrum Software and Driver Installer"
Function GetJRE
- MessageBox MB_OK "${PRODUCT_NAME} uses Java ${JRE_VERSION}, it will now \
+ MessageBox MB_OK "${PRODUCT_NAME} uses Java ${JRE_VERSION}
32-bit
, it will now \
be downloaded and installed"
StrCpy $2 "$TEMP\Java Runtime Environment.exe"
be downloaded and installed"
StrCpy $2 "$TEMP\Java Runtime Environment.exe"
@@
-42,6
+43,8
@@
Function DetectJRE
"CurrentVersion"
StrCmp $2 ${JRE_VERSION} done
"CurrentVersion"
StrCmp $2 ${JRE_VERSION} done
+ StrCmp $2 ${JRE_ALTERNATE} done
+
Call GetJRE
done:
Call GetJRE
done:
@@
-112,6
+115,7
@@
Section "TeleMetrum and TeleDongle Firmware"
File "../src/telemetrum-v1.0/telemetrum-v1.0-${VERSION}.ihx"
File "../src/telemetrum-v1.1/telemetrum-v1.1-${VERSION}.ihx"
File "../src/telemetrum-v1.0/telemetrum-v1.0-${VERSION}.ihx"
File "../src/telemetrum-v1.1/telemetrum-v1.1-${VERSION}.ihx"
+ File "../src/telemetrum-v1.2/telemetrum-v1.2-${VERSION}.ihx"
File "../src/telemini-v1.0/telemini-v1.0-${VERSION}.ihx"
File "../src/teledongle-v0.2/teledongle-v0.2-${VERSION}.ihx"
File "../src/telemini-v1.0/telemini-v1.0-${VERSION}.ihx"
File "../src/teledongle-v0.2/teledongle-v0.2-${VERSION}.ihx"
@@
-125,6
+129,7
@@
Section "Documentation"
File "../doc/altos.pdf"
File "../doc/telemetry.pdf"
File "../doc/telemetrum-outline.pdf"
File "../doc/altos.pdf"
File "../doc/telemetry.pdf"
File "../doc/telemetrum-outline.pdf"
+ File "../doc/megametrum-outline.pdf"
SectionEnd
Section "Uninstaller"
SectionEnd
Section "Uninstaller"