use multimaint-merge to make Debian changelogs less ugly

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

diff --git a/altosui/altos-windows.nsi b/altosui/altos-windows.nsi
index 6f296f186505575aad53580de170f36a610c5516..cbcb389d96f14896806098a373e4fb4784fd13b9 100644 (file)
--- a/altosui/altos-windows.nsi
+++ b/altosui/altos-windows.nsi
@@ -1,4 +1,8 @@
 !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=52247&/jre-6u27-windows-i586-p.exe"
+!define PRODUCT_NAME "Altus Metrum Windows Software"
 
 Name "Altus Metrum Installer"
 
@@ -18,6 +22,31 @@ ShowInstDetails Show
 
 ComponentText "Altus Metrum Software and Driver Installer"
 
+Function GetJRE
+        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"
+        nsisdl::download /TIMEOUT=30000 ${JRE_URL} $2
+        Pop $R0 ;Get the return value
+                StrCmp $R0 "success" +3
+                MessageBox MB_OK "Download failed: $R0"
+                Quit
+        ExecWait $2
+        Delete $2
+FunctionEnd
+
+
+Function DetectJRE
+  ReadRegStr $2 HKLM "SOFTWARE\JavaSoft\Java Runtime Environment" \
+             "CurrentVersion"
+  StrCmp $2 ${JRE_VERSION} done
+
+  Call GetJRE
+
+  done:
+FunctionEnd
+
 ; Pages to present
 
 Page license
@@ -51,6 +80,8 @@ Section "Install Driver" InstDriver
 SectionEnd
 
 Section "AltosUI Application"
+       Call DetectJRE
+
        SetOutPath $INSTDIR
 
        File "altosui-fat.jar"
@@ -68,7 +99,7 @@ Section "AltosUI Application"
 
        File "../icon/*.ico"
 
-       CreateShortCut "$SMPROGRAMS\AltusMetrum.lnk" "$INSTDIR\altosui-fat.jar" "" "$INSTDIR\altus-metrum.ico"
+       CreateShortCut "$SMPROGRAMS\AltusMetrum.lnk" "$SYSDIR\javaw.exe" "-jar altosui-fat.jar" "$INSTDIR\altus-metrum.ico"
 SectionEnd
 
 Section "AltosUI Desktop Shortcut"
@@ -80,19 +111,31 @@ Section "TeleMetrum and TeleDongle Firmware"
        SetOutPath $INSTDIR
 
        File "../src/telemetrum-v1.0/telemetrum-v1.0-${VERSION}.ihx"
+       File "../src/telemetrum-v1.1/telemetrum-v1.1-${VERSION}.ihx"
+       File "../src/telemini-v1.0/telemini-v1.0-${VERSION}.ihx"
        File "../src/teledongle-v0.2/teledongle-v0.2-${VERSION}.ihx"
 
 SectionEnd
 
+Section "Documentation"
+
+       SetOutPath $INSTDIR
+
+       File "../doc/altusmetrum.pdf"
+       File "../doc/altos.pdf"
+       File "../doc/telemetry.pdf"
+       File "../doc/telemetrum-outline.pdf"
+SectionEnd
+
 Section "Uninstaller"
 
        ; Deal with the uninstaller
-       
+
        SetOutPath $INSTDIR
 
        ; Write the install path to the registry
        WriteRegStr HKLM SOFTWARE\AltusMetrum "Install_Dir" "$INSTDIR"
-       
+
        ; Write the uninstall keys for windows
        WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\AltusMetrum" "DisplayName" "Altus Metrum"
        WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\AltusMetrum" "UninstallString" '"$INSTDIR\uninstall.exe"'