X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2Faltos-windows.nsi;h=20dd65f04baa976a7e9ee49fe74f1da9388588bc;hp=70dc03ca973ca7e4a19c8fe3acdb570a28a7ce61;hb=69d42b26223b45df4167aa3baafba100ad71baab;hpb=2353d83be15b398754c2564f95374c6ea0f8de92

diff --git a/altosui/altos-windows.nsi b/altosui/altos-windows.nsi
index 70dc03ca..20dd65f0 100644
--- 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"
-!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"
@@ -23,7 +24,7 @@ ShowInstDetails Show
 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"
@@ -42,6 +43,8 @@ Function DetectJRE
              "CurrentVersion"
   StrCmp $2 ${JRE_VERSION} done
 
+  StrCmp $2 ${JRE_ALTERNATE} done
+
   Call GetJRE
 
   done:
@@ -85,6 +88,7 @@ Section "AltosUI Application"
 	SetOutPath $INSTDIR
 
 	File "altosui-fat.jar"
+	File "AltosLib.jar"
 	File "cmudict04.jar"
 	File "cmulex.jar"
 	File "cmu_time_awb.jar"
@@ -112,6 +116,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.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"
 
@@ -125,6 +130,7 @@ Section "Documentation"
 	File "../doc/altos.pdf"
 	File "../doc/telemetry.pdf"
 	File "../doc/telemetrum-outline.pdf"
+	File "../doc/megametrum-outline.pdf"
 SectionEnd
 
 Section "Uninstaller"
@@ -152,6 +158,9 @@ Section "Uninstall"
 	Delete "$INSTDIR\*.*"
 	RMDir "$INSTDIR"
 
+	; Remove .inf file
+	Delete "$WINDIR\Inf\telemetrum.inf"
+
 	; Remove devices
 	InstDrv::InitDriverSetup /NOUNLOAD {4D36E96D-E325-11CE-BFC1-08002BE10318} AltusMetrumSerial
 	InstDrv::DeleteOemInfFiles /NOUNLOAD
@@ -160,4 +169,5 @@ Section "Uninstall"
 	; Remove shortcuts, if any
 	Delete "$SMPROGRAMS\AltusMetrum.lnk"
 	Delete "$DESKTOP\AltusMetrum.lnk"
+	
 SectionEnd