Merge branch 'branch-1.4' of ssh://git.gag.com/scm/git/fw/altos into branch-1.4

13 files changed, 173 insertions, 143 deletions

diff --git a/altosui/Instdrv/NSIS/Includes/java.nsh b/altosui/Instdrv/NSIS/Includes/java.nsh
new file mode 100644
index 00000000..ebf1c5b9
--- /dev/null
+++ b/altosui/Instdrv/NSIS/Includes/java.nsh
@@ -0,0 +1,50 @@
+!include WordFunc.nsh
+
+; Definitions for Java Detection
+
+!define JRE_VERSION "1.6"
+!define JRE32_URL "http://javadl.sun.com/webapps/download/AutoDL?BundleId=52247&/jre-6u27-windows-i586.exe"
+!define JRE64_URL "http://javadl.sun.com/webapps/download/AutoDL?BundleId=52249&/jre-6u27-windows-x64.exe"
+
+Var JavaDownload
+Var JavaBits
+
+Function GetJRE
+	${If} ${RunningX64}
+	   StrCpy $JavaDownload ${JRE64_URL}
+	   StrCpy $JavaBits "64"
+	${Else}
+	   StrCpy $JavaDownload ${JRE32_URL}
+	   StrCpy $JavaBits "32"
+	${EndIf}
+
+        MessageBox MB_OK "This product uses Java ${JRE_VERSION}, \
+			$JavaBits bits, it will now \
+                        be downloaded and installed"
+
+        StrCpy $2 "$TEMP\Java Runtime Environment.exe"
+        nsisdl::download /TIMEOUT=30000 $JavaDownload $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"
+
+  DetailPrint "Desired Java version ${JRE_VERSION}"
+  DetailPrint "Actual Java version $2"
+
+  ${VersionCompare} $2 ${JRE_VERSION} $3
+
+  IntCmp $3 1 done done
+
+  Call GetJRE
+
+done:
+
+FunctionEnd
diff --git a/altosui/Makefile.am b/altosui/Makefile.am
index 98a5e193..4cb5df58 100644
--- a/altosui/Makefile.am
+++ b/altosui/Makefile.am
@@ -100,7 +100,8 @@ FIRMWARE_TD=$(FIRMWARE_TD_0_2)
 FIRMWARE_TM_1_0=$(top_srcdir)/src/telemetrum-v1.0/telemetrum-v1.0-$(VERSION).ihx
 FIRMWARE_TM_1_1=$(top_srcdir)/src/telemetrum-v1.1/telemetrum-v1.1-$(VERSION).ihx
 FIRMWARE_TM_1_2=$(top_srcdir)/src/telemetrum-v1.2/telemetrum-v1.2-$(VERSION).ihx
-FIRMWARE_TM=$(FIRMWARE_TM_1_0) $(FIRMWARE_TM_1_1) $(FIRMWARE_TM_1_2)
+FIRMWARE_TM_2_0=$(top_srcdir)/src/telemetrum-v2.0/telemetrum-v2.0-$(VERSION).ihx
+FIRMWARE_TM=$(FIRMWARE_TM_1_0) $(FIRMWARE_TM_1_1) $(FIRMWARE_TM_1_2) $(FIRMWARE_TM_2_0)
 
 FIRMWARE_TELEMINI_1_0=$(top_srcdir)/src/telemini-v1.0/telemini-v1.0-$(VERSION).ihx
 FIRMWARE_TELEMINI=$(FIRMWARE_TELEMINI_1_0)
diff --git a/altosui/altos-windows.nsi.in b/altosui/altos-windows.nsi.in
index b72772e2..2e2a46f1 100644
--- a/altosui/altos-windows.nsi.in
+++ b/altosui/altos-windows.nsi.in
@@ -1,10 +1,8 @@
 !addplugindir Instdrv/NSIS/Plugins
+!addincludedir Instdrv/NSIS/Includes
 !include x64.nsh
-; Definitions for Java 1.7 Detection
-!define JRE_VERSION "1.7"
-!define JRE_ALTERNATE "1.6"
-!define JRE32_URL "http://javadl.sun.com/webapps/download/AutoDL?BundleId=83383&/jre-7u51-windows-i586.exe"
-!define JRE64_URL "http://javadl.sun.com/webapps/download/AutoDL?BundleId=83385&/jre-7u51-windows-x64.exe"
+!include java.nsh
+
 !define PRODUCT_NAME "Altus Metrum Windows Software"
 
 Name "Altus Metrum Installer"
@@ -35,45 +33,6 @@ Function .onInit
 	${EndIf}
 FunctionEnd
 
-Var JavaDownload
-Var JavaBits
-
-Function GetJRE
-	${If} ${RunningX64}
-	   StrCpy $JavaDownload ${JRE64_URL}
-	   StrCpy $JavaBits "64"
-	${Else}
-	   StrCpy $JavaDownload ${JRE32_URL}
-	   StrCpy $JavaBits "32"
-	${EndIf}
-
-        MessageBox MB_OK "${PRODUCT_NAME} uses Java ${JRE_VERSION}, \
-			$JavaBits bits, it will now \
-                        be downloaded and installed"
-
-        StrCpy $2 "$TEMP\Java Runtime Environment.exe"
-        nsisdl::download /TIMEOUT=30000 $JavaDownload $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
-
-  StrCmp $2 ${JRE_ALTERNATE} done
-
-  Call GetJRE
-
-  done:
-FunctionEnd
-
 ; Pages to present
 
 Page license
@@ -145,6 +104,7 @@ Section "TeleMetrum, TeleDongle and TeleBT 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/telemetrum-v2.0/telemetrum-v2.0-${VERSION}.ihx"
 	File "../src/telemini-v1.0/telemini-v1.0-${VERSION}.ihx"
 	File "../src/telegps-v1.0/telegps-v1.0-${VERSION}.ihx"
 	File "../src/teledongle-v0.2/teledongle-v0.2-${VERSION}.ihx"
diff --git a/altosuilib/AltosUIConfigure.java b/altosuilib/AltosUIConfigure.java
index 920ed8e2..0e82cacb 100644
--- a/altosuilib/AltosUIConfigure.java
+++ b/altosuilib/AltosUIConfigure.java
@@ -243,7 +243,9 @@ public class AltosUIConfigure
 			 constraints(0, 3));
 		row++;
 
-		pane.add(new JLabel (String.format("AltOS version %s", AltosUIVersion.version)),
+		pane.add(new JLabel (String.format("AltOS version %s (%smaps key)",
+						   AltosUIVersion.version,
+						   AltosUIVersion.has_google_maps_api_key() ? "" : "no ")),
 			 constraints(0, 3));
 		row++;
 
diff --git a/altusmetrum.cat b/altusmetrum.cat
index 2d7e8b26..eb5dff98 100644
--- a/altusmetrum.cat
+++ b/altusmetrum.cat
diff --git a/doc/Makefile b/doc/Makefile
index 254e63c4..c39450c7 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -15,7 +15,8 @@ RELNOTES=\
 	release-notes-1.3.html \
 	release-notes-1.3.1.html \
 	release-notes-1.3.2.html \
-	release-notes-1.4.html
+	release-notes-1.4.html \
+	release-notes-1.4.1.html
 
 PICTURES=\
 	altosui.png \
@@ -107,6 +108,9 @@ distclean:
 altusmetrum.html: $(RELNOTES_XSL) $(IMAGES)
 altusmetrum.pdf: $(RELNOTES_XSL) $(IMAGES)
 
+telegps.html: $(RELNOTES_XSL) $(IMAGES)
+telegps.pdf: $(RELNOTES_XSL) $(IMAGES)
+
 $(PDF): $(FOSTYLE) $(TEMPLATES)
 
 indent:		altusmetrum.xsl
diff --git a/doc/altusmetrum.xsl b/doc/altusmetrum.xsl
index 5ccbee9f..082271d7 100644
--- a/doc/altusmetrum.xsl
+++ b/doc/altusmetrum.xsl
@@ -41,6 +41,13 @@
     </legalnotice>
     <revhistory>
       <revision>
+	<revnumber>1.4.1</revnumber>
+	<date>20 June 2014</date>
+	<revremark>
+	  Minor release fixing some installation bugs.
+	</revremark>
+      </revision>
+      <revision>
 	<revnumber>1.4</revnumber>
 	<date>15 June 2014</date>
 	<revremark>
@@ -5414,6 +5421,13 @@ NAR #88757, TRA #12200
   <appendix>
     <title>Release Notes</title>
     <simplesect>
+      <title>Version 1.41</title>
+      <xi:include
+	  xmlns:xi="http://www.w3.org/2001/XInclude"
+	  href="release-notes-1.4.1.xsl"
+	  xpointer="xpointer(/article/*)"/>
+    </simplesect>
+    <simplesect>
       <title>Version 1.4</title>
       <xi:include
 	  xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/doc/release-notes-1.4.1.xsl b/doc/release-notes-1.4.1.xsl
new file mode 100644
index 00000000..e6c82d60
--- /dev/null
+++ b/doc/release-notes-1.4.1.xsl
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+"/usr/share/xml/docbook/schema/dtd/4.5/docbookx.dtd">
+
+<article>
+  <para>
+    Version 1.4.1 is a minor release. It fixes install issues on
+    Windows and provides the missing TeleMetrum V2.0 firmware. There
+    aren't any changes to the firmware or host applications at
+    all. All Windows users will want to upgrade to get the signed
+    driver, but Mac and Linux users who do not need the TeleMetrum
+    V2.0 firmware image will not need to upgrade.
+  </para>
+  <para>
+    Windows Install Fixes
+    <itemizedlist>
+      <listitem>
+	<para>
+	  Provide signed Windows driver files. This should avoid any need to
+	  disable driver signature checking on Windows 7 or 8.
+	</para>
+      </listitem>
+      <listitem>
+	<para>
+	  Fix Java version detection and download. Previously, the
+	  installer would only look for Java 6 or 7 and insist on
+	  downloading its own Java bits if there was something else
+	  installed. Furthermore, the 64-bit Java link provided didn't
+	  work for anyone other than Keith, making it impossible to
+	  install AltOS on any machine with Java SE 8 installed.
+	</para>
+      </listitem>
+    </itemizedlist>
+  </para>
+  <para>
+    Other Fixes
+    <itemizedlist>
+      <listitem>
+	<para>
+	  Include 1.4 firmware for TeleMetrum V2.0. None of the
+	  installers shipped this file. Now it's included in the AltOS
+	  packages for Linux, Mac and Windows.
+	</para>
+      </listitem>
+      <listitem>
+	<para>
+	  Include Google Application Key for map downloading. The 1.4
+	  release didn't have this key in the released version of the
+	  software, making map downloading fail for most people.
+	</para>
+      </listitem>
+    </itemizedlist>
+  </para>
+</article>
diff --git a/doc/telegps.xsl b/doc/telegps.xsl
index 836c3d9a..bf7eec5a 100644
--- a/doc/telegps.xsl
+++ b/doc/telegps.xsl
@@ -29,6 +29,13 @@
     </legalnotice>
     <revhistory>
       <revision>
+	<revnumber>1.4.1</revnumber>
+	<date>20 June 2014</date>
+	<revremark>
+	  Minor release fixing some installation bugs.
+	</revremark>
+      </revision>
+      <revision>
 	<revnumber>1.4</revnumber>
 	<date>13 June 2014</date>
 	<revremark>
@@ -1295,6 +1302,23 @@ NAR #88757, TRA #12200
       </para>
     </section>
   </chapter>
+  <appendix>
+    <title>Release Notes</title>
+    <simplesect>
+      <title>Version 1.41</title>
+      <xi:include
+	  xmlns:xi="http://www.w3.org/2001/XInclude"
+	  href="release-notes-1.4.1.xsl"
+	  xpointer="xpointer(/article/*)"/>
+    </simplesect>
+    <simplesect>
+      <title>Version 1.4</title>
+      <xi:include
+	  xmlns:xi="http://www.w3.org/2001/XInclude"
+	  href="release-notes-1.4.xsl"
+	  xpointer="xpointer(/article/*)"/>
+    </simplesect>
+  </appendix>
 </book>
 <!--  LocalWords:  Altusmetrum TeleGPS
 -->
diff --git a/micropeak/Makefile.am b/micropeak/Makefile.am
index 216874df..39ebc43a 100644
--- a/micropeak/Makefile.am
+++ b/micropeak/Makefile.am
@@ -272,7 +272,7 @@ $(MACOSX_DIST): $(MACOSX_FILES)
 
 $(WINDOWS_DIST): $(WINDOWS_FILES) micropeak-windows.nsi
 	-rm -f $@
-	makensis -Omicropeak-windows.log "-XOutFile $@" "-DVERSION=$(VERSION)" micropeak-windows.nsi
+	makensis -Omicropeak-windows.log "-XOutFile $@" "-DVERSION=$(VERSION)" micropeak-windows.nsi || (cat micropeak-windows.log && exit 1)
 
 Manifest.txt: Makefile
 	echo 'Main-Class: org.altusmetrum.micropeak.MicroPeak' > $@
diff --git a/micropeak/micropeak-windows.nsi.in b/micropeak/micropeak-windows.nsi.in
index 6dc9d8c1..bb5da1bb 100644
--- a/micropeak/micropeak-windows.nsi.in
+++ b/micropeak/micropeak-windows.nsi.in
@@ -1,11 +1,7 @@
 !addplugindir Instdrv/NSIS/Plugins
+!addincludedir ../altosui/Instdrv/NSIS/Includes
 !include x64.nsh
-; Definitions for Java 1.7 Detection
-!define JRE_VERSION "1.7"
-!define JRE_ALTERNATE "1.6"
-!define JRE32_URL "http://javadl.sun.com/webapps/download/AutoDL?BundleId=83383&/jre-7u51-windows-i586.exe"
-!define JRE64_URL "http://javadl.sun.com/webapps/download/AutoDL?BundleId=83385&/jre-7u51-windows-x64.exe"
-!define PRODUCT_NAME "Altus Metrum Windows Software"
+!include java.nsh
 
 Name "Altus Metrum MicroPeak Installer"
 
@@ -35,44 +31,6 @@ Function .onInit
 	${EndIf}
 FunctionEnd
 
-Var JavaDownload
-Var JavaBits
-
-Function GetJRE
-	${If} ${RunningX64}
-	   StrCpy $JavaDownload ${JRE64_URL}
-	   StrCpy $JavaBits "64"
-	${Else}
-	   StrCpy $JavaDownload ${JRE32_URL}
-	   StrCpy $JavaBits "32"
-	${EndIf}
-
-        MessageBox MB_OK "${PRODUCT_NAME} uses Java ${JRE_VERSION}, \
-			$JavaBits bits, it will now \
-                        be downloaded and installed"
-
-        StrCpy $2 "$TEMP\Java Runtime Environment.exe"
-        nsisdl::download /TIMEOUT=30000 $JavaDownload $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
-
-  StrCmp $2 ${JRE_ALTERNATE} done
-
-  Call GetJRE
-
-  done:
-FunctionEnd
-
 ; Pages to present
 
 Page license
diff --git a/signing-driver b/signing-driver
index 177c5079..240609c4 100644
--- a/signing-driver
+++ b/signing-driver
@@ -2,19 +2,25 @@ Notes on getting a signing key for driver signing
 
 http://technet.microsoft.com/en-us/library/dd919238%28v=ws.10%29.aspx
 
-# use MMC to add the certificates snap-in for ComputerAccount on Local computer
+Start MMC as administrator (start a console as administrator, launch
+mmc from there).
 
-Run console as Administrator:
+Use MMC to add the certificates snap-in for ComputerAccount on Local computer
 
-makecert -r -n "CN=AltusMetrum" -ss AltusMetrumCertStore -sr LocalMachine
+Create a key store for our keys called AltusMetrumCertStore
+
+Add our key from ~/altusmetrumllc/altusmetrum-key.p12
+
+# Our cert is now called "Altus Metrum, LLC"
+
+Create a new directory with a simple path. Copy altusmetrum.inf to
+that directory
 
 # <path> contains the altusmetrum.inf file we ship. Make sure <path>
 # is otherwise empty or inf2cat will get confused
 
 inf2cat /driver:<path> /os:7_X86,7_X64,8_X86,8_X64
 
-signtool sign /s AltusMetrumCertStore /n “AltusMetrum"
+signtool sign /s AltusMetrumCertStore /n “Altus Metrum, LLC"
          /t http://timestamp.verisign.com/scripts/timestamp.dll
          altusmetrum.cat
-
-pnputil -i -a altusmetrum.inf
diff --git a/telegps/telegps-windows.nsi.in b/telegps/telegps-windows.nsi.in
index e6798c46..b4145520 100644
--- a/telegps/telegps-windows.nsi.in
+++ b/telegps/telegps-windows.nsi.in
@@ -1,11 +1,7 @@
 !addplugindir ../altosui/Instdrv/NSIS/Plugins
+!addincludedir ../altosui/Instdrv/NSIS/Includes
 !include x64.nsh
-; Definitions for Java 1.7 Detection
-!define JRE_VERSION "1.7"
-!define JRE_ALTERNATE "1.6"
-!define JRE32_URL "http://javadl.sun.com/webapps/download/AutoDL?BundleId=83383&/jre-7u51-windows-i586.exe"
-!define JRE64_URL "http://javadl.sun.com/webapps/download/AutoDL?BundleId=83385&/jre-7u51-windows-x64.exe"
-!define PRODUCT_NAME "TeleGPS Windows Software"
+!include java.nsh
 
 Name "TeleGPS Installer"
 
@@ -35,45 +31,6 @@ Function .onInit
 	${EndIf}
 FunctionEnd
 
-Var JavaDownload
-Var JavaBits
-
-Function GetJRE
-	${If} ${RunningX64}
-	   StrCpy $JavaDownload ${JRE64_URL}
-	   StrCpy $JavaBits "64"
-	${Else}
-	   StrCpy $JavaDownload ${JRE32_URL}
-	   StrCpy $JavaBits "32"
-	${EndIf}
-
-        MessageBox MB_OK "${PRODUCT_NAME} uses Java ${JRE_VERSION}, \
-			$JavaBits bits, it will now \
-                        be downloaded and installed"
-
-        StrCpy $2 "$TEMP\Java Runtime Environment.exe"
-        nsisdl::download /TIMEOUT=30000 $JavaDownload $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
-
-  StrCmp $2 ${JRE_ALTERNATE} done
-
-  Call GetJRE
-
-  done:
-FunctionEnd
-
 ; Pages to present
 
 Page license