X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2Faltos-windows.nsi;h=92c985a9550db170274d78300a40dc4931b9c6e6;hp=0e9859675a54146477525f74af29e8539294995a;hb=7be98836e69a222b2f9f4baacddcf12d168e2207;hpb=641c5373724d34c3adfcf42420a528d6bba736b9

diff --git a/altosui/altos-windows.nsi b/altosui/altos-windows.nsi
index 0e985967..92c985a9 100644
--- 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
@@ -32,42 +61,27 @@ UninstPage instfiles
 
 Section "Install Driver" InstDriver
 
-	InstDrv::InitDriverSetup /NOUNLOAD {4D36E96D-E325-11CE-BFC1-08002BE10318} USB\VID_FFFE&PID_000A
-	Pop $0
-	DetailPrint "InitDriverSetup: $0"
-	InstDrv::DeleteOemInfFiles /NOUNLOAD
-	InstDrv::CreateDevice /NOUNLOAD
-
-	InstDrv::InitDriverSetup /NOUNLOAD {4D36E96D-E325-11CE-BFC1-08002BE10318} USB\VID_FFFE&PID_000B
-	Pop $0
-	DetailPrint "InitDriverSetup: $0"
-	InstDrv::DeleteOemInfFiles /NOUNLOAD
-	InstDrv::CreateDevice /NOUNLOAD
-
-	InstDrv::InitDriverSetup /NOUNLOAD {4D36E96D-E325-11CE-BFC1-08002BE10318} USB\VID_FFFE&PID_000C
-	Pop $0
-	DetailPrint "InitDriverSetup: $0"
-	InstDrv::DeleteOemInfFiles /NOUNLOAD
-	InstDrv::CreateDevice /NOUNLOAD
-
-	InstDrv::InitDriverSetup /NOUNLOAD {4D36E96D-E325-11CE-BFC1-08002BE10318} USB\VID_FFFE&PID_000D
+	InstDrv::InitDriverSetup /NOUNLOAD {4D36E96D-E325-11CE-BFC1-08002BE10318} AltusMetrumSerial
 	Pop $0
 	DetailPrint "InitDriverSetup: $0"
 	InstDrv::DeleteOemInfFiles /NOUNLOAD
 	InstDrv::CreateDevice /NOUNLOAD
 
-	SetOutPath $WINDIR\Inf
-	File "../telemetrum.inf"
-
 	SetOutPath $TEMP
 	File "../telemetrum.inf"
 	InstDrv::InstallDriver /NOUNLOAD "$TEMP\telemetrum.inf"
 
 	SetOutPath $INSTDIR
 	File "../telemetrum.inf"
+
+	SetOutPath $WINDIR\Inf
+	File "../telemetrum.inf"
+
 SectionEnd
 
 Section "AltosUI Application"
+	Call DetectJRE
+
 	SetOutPath $INSTDIR
 
 	File "altosui-fat.jar"
@@ -78,12 +92,14 @@ Section "AltosUI Application"
 	File "cmu_us_kal.jar"
 	File "en_us.jar"
 	File "freetts.jar"
+	File "jfreechart.jar"
+	File "jcommon.jar"
 
 	File "*.dll"
 
 	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"
@@ -95,19 +111,33 @@ 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/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"
 
 SectionEnd
 
+Section "Documentation"
+
+	SetOutPath $INSTDIR
+
+	File "../doc/altusmetrum.pdf"
+	File "../doc/altos.pdf"
+	File "../doc/telemetry.pdf"
+	File "../doc/telemetrum-outline.pdf"
+	File "../doc/megametrum-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"'
@@ -125,10 +155,7 @@ Section "Uninstall"
 	RMDir "$INSTDIR"
 
 	; Remove devices
-	InstDrv::InitDriverSetup /NOUNLOAD {4D36E96D-E325-11CE-BFC1-08002BE10318} USB\VID_FFFE&PID_000A
-	InstDrv::InitDriverSetup /NOUNLOAD {4D36E96D-E325-11CE-BFC1-08002BE10318} USB\VID_FFFE&PID_000B
-	InstDrv::InitDriverSetup /NOUNLOAD {4D36E96D-E325-11CE-BFC1-08002BE10318} USB\VID_FFFE&PID_000C
-	InstDrv::InitDriverSetup /NOUNLOAD {4D36E96D-E325-11CE-BFC1-08002BE10318} USB\VID_FFFE&PID_000D
+	InstDrv::InitDriverSetup /NOUNLOAD {4D36E96D-E325-11CE-BFC1-08002BE10318} AltusMetrumSerial
 	InstDrv::DeleteOemInfFiles /NOUNLOAD
 	InstDrv::RemoveAllDevices