telegps: Working towards building fat versions of telegps application

Lots more of the bits necessary for windows/macosx

Signed-off-by: Keith Packard <keithp@keithp.com>

9 files changed, 170 insertions, 45 deletions

diff --git a/telegps/.gitignore b/telegps/.gitignore
new file mode 100644
index 00000000..c57079da
--- /dev/null
+++ b/telegps/.gitignore
@@ -0,0 +1,26 @@
+windows/
+linux/
+macosx/
+fat/
+Manifest.txt
+Manifest-fat.txt
+AltosVersion.java
+Info.plist
+libaltosJNI
+classes
+telegps
+telegps-test
+telegps-jdb
+classtelegps.stamp
+telegps-windows.nsi
+TeleGPS-Linux-*.tar.bz2
+TeleGPS-Linux-*.sh
+TeleGPS-Mac-*.zip
+TeleGPS-Windows-*.exe
+telegps.desktop
+*.dll
+*.dylib
+*.so
+*.jar
+*.class
+*.dmg
diff --git a/telegps/Info.plist.in b/telegps/Info.plist.in
index 40984c5a..4c351c79 100644
--- a/telegps/Info.plist.in
+++ b/telegps/Info.plist.in
@@ -3,7 +3,7 @@
 <plist version="0.9">
 <dict>
 	<key>CFBundleName</key>
-	<string>MicroPeak</string>
+	<string>TeleGPS</string>
 	<key>CFBundleVersion</key>
 	<string>@VERSION@</string>
 	<key>CFBundleAllowMixedLocalizations</key>
@@ -15,30 +15,26 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleIdentifier</key>
-	<string>org.altusmetrum.micropeak</string>
+	<string>org.altusmetrum.telegps</string>
 	<key>CFBundleSignature</key>
 	<string>Altu</string>
 	<key>CFBundleGetInfoString</key>
-	<string>MicroPeak UI version @VERSION@</string>
+	<string>TeleGPS version @VERSION@</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleIconFile</key>
-	<string>MicroPeak.icns</string>
+	<string>TeleGPSIcon.icns</string>
 	<key>Java</key>
 	<dict>
 		<key>MainClass</key>
-		<string>org.altusmetrum.micropeak.MicroPeak</string>
+		<string>org.altusmetrum.telegps.TeleGPS</string>
 		<key>JVMVersion</key>
 		<string>1.5+</string>
 		<key>ClassPath</key>
 		<array>
-			<string>$JAVAROOT/micropeak.jar</string>
+			<string>$JAVAROOT/telegps.jar</string>
+			<string>$JAVAROOT/freetts.jar</string>
 		</array>
-		<key>Properties</key>
-		<dict>
-		  <key>apple.laf.useScreenMenuBar</key>
-		  <string>true</string>
-		</dict>
 		<key>VMOptions</key>
 		<array>
 		  <string>-Xms512M</string>
diff --git a/telegps/Makefile.am b/telegps/Makefile.am
index cd2de1f9..9091aaae 100644
--- a/telegps/Makefile.am
+++ b/telegps/Makefile.am
@@ -5,7 +5,7 @@ man_MANS=telegps.1
 
 altoslibdir=$(libdir)/altos
 
-CLASSPATH_ENV=mkdir -p $(JAVAROOT); CLASSPATH=".:classes:../altoslib/*:../altosuilib/*:../libaltos:$(JCOMMON)/jcommon.jar:$(JFREECHART)/jfreechart.jar"
+CLASSPATH_ENV=mkdir -p $(JAVAROOT); CLASSPATH=".:classes:../altoslib/*:../altosuilib/*:../libaltos:$(JCOMMON)/jcommon.jar:$(JFREECHART)/jfreechart.jar $(FREETTS)/freetts.jar"
 
 bin_SCRIPTS=telegps
 
@@ -22,6 +22,15 @@ JFREECHART_CLASS= \
 JCOMMON_CLASS=\
     jcommon.jar
 
+FREETTS_CLASS= \
+	cmudict04.jar \
+	cmulex.jar \
+	cmu_time_awb.jar \
+	cmutimelex.jar \
+	cmu_us_kal.jar \
+	en_us.jar \
+	freetts.jar
+
 JAR=telegps.jar
 
 FATJAR=telegps-fat.jar
@@ -59,6 +68,15 @@ ICONJAR= -C $(ICONDIR) telegps-16.png \
 
 WINDOWS_ICON=$(ICONDIR)/telegps.ico
 
+# Firmware
+FIRMWARE_TD_0_2=$(top_srcdir)/src/teledongle-v0.2/teledongle-v0.2-$(VERSION).ihx
+FIRMWARE_TD=$(FIRMWARE_TD_0_2)
+
+FIRMWARE_TG_1_0=$(top_srcdir)/src/telegps-v1.0/telegps-v1.0-$(VERSION).ihx
+FIRMWARE_TG=$(FIRMWARE_TG_1_0)
+
+FIRMWARE=$(FIRMWARE_TG)
+
 desktopdir = $(datadir)/applications
 desktop_file = telegps.desktop
 desktop_SCRIPTS = $(desktop_file)
@@ -85,31 +103,21 @@ LINUX_SH=TeleGPS-Linux-$(VERSION).sh
 MACOSX_DIST=TeleGPS-Mac-$(VERSION).dmg
 WINDOWS_DIST=TeleGPS-Windows-$(VERSION_DASH).exe
 
-MICROPEAK_DOC=$(top_srcdir)/doc/telegps.pdf
+TELEGPS_DOC=$(top_srcdir)/doc/telegps.pdf
 
-DOC=$(MICROPEAK_DOC)
+DOC=$(TELEGPS_DOC)
 
 FAT_FILES=$(FATJAR) $(ALTOSLIB_CLASS) $(ALTOSUILIB_CLASS) $(FREETTS_CLASS) $(JFREECHART_CLASS) $(JCOMMON_CLASS)
 
 LINUX_FILES=$(FAT_FILES) libaltos.so $(FIRMWARE) $(DOC) telegps.desktop.in ../icon/telegps.svg
 LINUX_EXTRA=telegps-fat telegps.desktop.in
 
-MACOSX_DRIVER_URL=http://www.ftdichip.com/Drivers/VCP/MacOSX/FTDIUSBSerialDriver_v2_2_18.dmg
-MACOSX_DRIVER=FTDIUSBSerialDriver_v2_2_18.dmg
 MACOSX_INFO_PLIST=Info.plist
 MACOSX_README=ReadMe-Mac.rtf
-MACOSX_FILES=$(FAT_FILES) libaltos.dylib $(MACOSX_INFO_PLIST) $(MACOSX_DRIVER) $(MACOSX_README) $(DOC)
-
-$(MACOSX_DRIVER):
-	wget $(MACOSX_DRIVER_URL)
+MACOSX_FILES=$(FAT_FILES) libaltos.dylib $(MACOSX_INFO_PLIST) $(MACOSX_README) $(DOC)
+MACOSX_EXTRA=$(FIRMWARE)
 
-WINDOWS_DRIVER_URL=http://www.ftdichip.com/Drivers/CDM/CDM20824_Setup.exe
-WINDOWS_DRIVER=CDM20824_Setup.exe
-
-$(WINDOWS_DRIVER):
-	wget $(WINDOWS_DRIVER_URL)
-
-WINDOWS_FILES=$(FAT_FILES) altos.dll altos64.dll $(DOC) $(WINDOWS_ICON) $(WINDOWS_DRIVER)
+WINDOWS_FILES=$(FAT_FILES) altos.dll altos64.dll $(top_srcdir)/telemetrum.inf $(DOC) $(WINDOWS_ICON)
 
 if FATINSTALL
 
@@ -215,6 +223,10 @@ $(ALTOSUILIB_CLASS):
 	-rm -f "$@"
 	$(LN_S) ../altosuilib/"$@" .
 
+$(FREETTS_CLASS):
+	-rm -f "$@"
+	$(LN_S) "$(FREETTS)"/"$@" .
+
 $(JFREECHART_CLASS):
 	-rm -f "$@"
 	$(LN_S) "$(JFREECHART)"/"$@" .
@@ -236,7 +248,7 @@ $(LINUX_SH): $(LINUX_DIST) $(srcdir)/../altosui/linux-install.sh
 	sed 's/AltOS/TeleGPS/g' $(srcdir)/../altosui/linux-install.sh | cat - $(LINUX_DIST) > $@
 	chmod +x $@
 
-$(MACOSX_DIST): $(MACOSX_FILES)
+$(MACOSX_DIST): $(MACOSX_FILES) $(MACOSX_EXTRA) Makefile
 	-rm -f $@
 	-rm -rf macosx
 	mkdir macosx
@@ -244,14 +256,15 @@ $(MACOSX_DIST): $(MACOSX_FILES)
 	cp -a $(MACOSX_README) macosx/ReadMe.rtf
 	cp -a $(DOC) macosx
 	cp -p Info.plist macosx/TeleGPS.app/Contents
-	cp -p $(MACOSX_DRIVER) macosx
 	mkdir -p macosx/TeleGPS.app/Contents/Resources/Java
 	cp -p $(FATJAR) macosx/TeleGPS.app/Contents/Resources/Java/telegps.jar
 	cp -p libaltos.dylib macosx/TeleGPS.app/Contents/Resources/Java
 	cp -p $(ALTOSLIB_CLASS) macosx/TeleGPS.app/Contents/Resources/Java
 	cp -p $(ALTOSUILIB_CLASS) macosx/TeleGPS.app/Contents/Resources/Java
+	cp -p $(FREETTS_CLASS) macosx/TeleGPS.app/Contents/Resources/Java
 	cp -p $(JFREECHART_CLASS) macosx/TeleGPS.app/Contents/Resources/Java
 	cp -p $(JCOMMON_CLASS) macosx/TeleGPS.app/Contents/Resources/Java
+	cp -p $(MACOSX_EXTRA) macosx/AltOS-$(VERSION)
 	genisoimage -D -V TeleGPS-$(VERSION) -no-pad -r -apple -o $@ macosx
 
 $(WINDOWS_DIST): $(WINDOWS_FILES) telegps-windows.nsi
diff --git a/telegps/ReadMe-Mac.rtf b/telegps/ReadMe-Mac.rtf
new file mode 100644
index 00000000..48a82ed3
--- /dev/null
+++ b/telegps/ReadMe-Mac.rtf
@@ -0,0 +1,58 @@
+{\rtf1\ansi\ansicpg1252\deff0\uc1
+{\fonttbl
+{\f0\fnil\fcharset0\fprq0\fttruetype Helvetica;}
+{\f1\fnil\fcharset0\fprq0\fttruetype Arial;}
+{\f2\fnil\fcharset0\fprq0\fttruetype Liberation Serif;}
+{\f3\fnil\fcharset0\fprq0\fttruetype Courier New;}}
+{\colortbl
+\red0\green0\blue0;
+\red255\green255\blue255;
+\red255\green255\blue255;}
+{\stylesheet
+{\s6\fi-431\li720\sbasedon28\snext28 Contents 1;}
+{\s7\fi-431\li1440\sbasedon28\snext28 Contents 2;}
+{\s1\fi-431\li720 Arrowhead List;}
+{\s27\fi-431\li720\sbasedon28 Lower Roman List;}
+{\s29\tx431\sbasedon20\snext28 Numbered Heading 1;}
+{\s30\tx431\sbasedon21\snext28 Numbered Heading 2;}
+{\s12\fi-431\li720 Diamond List;}
+{\s9\fi-431\li2880\sbasedon28\snext28 Contents 4;}
+{\s8\fi-431\li2160\sbasedon28\snext28 Contents 3;}
+{\s31\tx431\sbasedon22\snext28 Numbered Heading 3;}
+{\s32\fi-431\li720 Numbered List;}
+{\s15\sbasedon28 Endnote Text;}
+{\*\cs14\fs20\super Endnote Reference;}
+{\s4\fi-431\li720 Bullet List;}
+{\s5\tx1584\sbasedon29\snext28 Chapter Heading;}
+{\s35\fi-431\li720 Square List;}
+{\s11\fi-431\li720 Dashed List;}
+{\s22\sb440\sa60\f1\fs24\b\sbasedon28\snext28 Heading 3;}
+{\s37\fi-431\li720 Tick List;}
+{\s24\fi-431\li720 Heart List;}
+{\s40\fi-431\li720\sbasedon32 Upper Roman List;}
+{\s39\fi-431\li720\sbasedon32 Upper Case List;}
+{\s16\fi-288\li288\fs20\sbasedon28 Footnote;}
+{\s19\fi-431\li720 Hand List;}
+{\s18\fs20\sbasedon28 Footnote Text;}
+{\s20\sb440\sa60\f1\fs34\b\sbasedon28\snext28 Heading 1;}
+{\s21\sb440\sa60\f1\fs28\b\sbasedon28\snext28 Heading 2;}
+{\s10\qc\sb240\sa120\f1\fs32\b\sbasedon28\snext28 Contents Header;}
+{\s23\sb440\sa60\f1\fs24\b\sbasedon28\snext28 Heading 4;}
+{\s28\f2\fs24 Normal;}
+{\s26\fi-431\li720\sbasedon32 Lower Case List;}
+{\s2\li1440\ri1440\sa120\sbasedon28 Block Text;}
+{\s33\f3\sbasedon28 Plain Text;}
+{\s34\tx1584\sbasedon29\snext28 Section Heading;}
+{\s25\fi-431\li720 Implies List;}
+{\s3\fi-431\li720 Box List;}
+{\s36\fi-431\li720 Star List;}
+{\*\cs17\fs20\super Footnote Reference;}
+{\s38\fi-431\li720 Triangle List;}
+{\s13\fi-288\li288\sbasedon28 Endnote;}}
+\kerning0\cf0\ftnbj\fet2\ftnstart1\ftnnar\aftnnar\ftnstart1\aftnstart1\aenddoc\revprop3{\*\rdf}{\info\uc1}\deftab720\viewkind1\paperw12240\paperh15840\margl1440\margr1440\widowctrl
+\sectd\sbknone\colsx0\pgncont\ltrsect
+\pard\plain\ltrpar\ql\sl240\slmult1\itap0\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640{\f0\fs24\lang1033{\*\listtag0}\abinodiroverride\ltrch Installing }{\f0\fs24\lang1033{\*\listtag0}TeleGPS}{\f0\fs24\lang1033{\*\listtag0} software for Mac OS X computers}{\f0\fs24\lang1033{\*\listtag0}\par}
+\pard\plain\ltrpar\ql\sl240\slmult1\itap0\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640{\f0\fs24\lang1033{\*\listtag0}\par}
+\pard\plain\ltrpar\ql\sl240\slmult1\itap0\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640{\f0\fs24\lang1033{\*\listtag0}\abinodiroverride\ltrch As with most Mac OS X applications, install }{\f0\fs24\lang1033{\*\listtag0}TeleGPS}{\f0\fs24\lang1033{\*\listtag0} by dragging it from the distribution disk image to a suitable place on your computer.}{\f0\fs24\lang1033{\*\listtag0}\par}
+\pard\plain\ltrpar\ql\sl240\slmult1\itap0\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640{\f0\fs24\lang1033{\*\listtag0}\par}
+\pard\plain\ltrpar\ql\sl240\slmult1\itap0\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640{\f0\fs24\lang1033{\*\listtag0}\abinodiroverride\ltrch Thanks for choosing AltusMetrum products!}{\f0\fs24\lang1033{\*\listtag0}\par}}
\ No newline at end of file
diff --git a/telegps/TeleGPS.app/Contents/MacOS/JavaApplicationStub b/telegps/TeleGPS.app/Contents/MacOS/JavaApplicationStub
new file mode 100755
index 00000000..c661d3e1
--- /dev/null
+++ b/telegps/TeleGPS.app/Contents/MacOS/JavaApplicationStub
diff --git a/telegps/TeleGPS.app/Contents/PkgInfo b/telegps/TeleGPS.app/Contents/PkgInfo
new file mode 100644
index 00000000..8a43480f
--- /dev/null
+++ b/telegps/TeleGPS.app/Contents/PkgInfo
@@ -0,0 +1 @@
+APPLAM.O
diff --git a/telegps/TeleGPS.app/Contents/Resources/TeleGPS.icns b/telegps/TeleGPS.app/Contents/Resources/TeleGPS.icns
new file mode 100644
index 00000000..44e2bceb
--- /dev/null
+++ b/telegps/TeleGPS.app/Contents/Resources/TeleGPS.icns
diff --git a/telegps/telegps-fat b/telegps/telegps-fat
new file mode 100755
index 00000000..87491248
--- /dev/null
+++ b/telegps/telegps-fat
@@ -0,0 +1,4 @@
+#!/bin/sh
+me=`which "$0"`
+dir=`dirname "$me"`
+exec java -cp "$dir/*" -Djava.library.path="$dir" -jar "$dir"/telegps-fat.jar  "$@"
diff --git a/telegps/telegps-windows.nsi.in b/telegps/telegps-windows.nsi.in
index 656f8af3..e852f88a 100644
--- a/telegps/telegps-windows.nsi.in
+++ b/telegps/telegps-windows.nsi.in
@@ -5,7 +5,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 MicroPeak Installer"
+Name "Altus Metrum TeleGPS Installer"
 
 ; Default install directory
 InstallDir "$PROGRAMFILES\AltusMetrum"
@@ -21,7 +21,7 @@ RequestExecutionLevel admin
 
 ShowInstDetails Show
 
-ComponentText "Altus Metrum MicroPeak Software Installer"
+ComponentText "Altus Metrum TeleGPS Software Installer"
 
 Function GetJRE
         MessageBox MB_OK "${PRODUCT_NAME} uses Java ${JRE_VERSION} 32-bit, it will now \
@@ -62,14 +62,41 @@ UninstPage instfiles
 
 ; And the stuff to install
 
-Section "MicroPeak Application"
+Section "Install Driver" InstDriver
+
+	InstDrv::InitDriverSetup /NOUNLOAD {4D36E96D-E325-11CE-BFC1-08002BE10318} AltusMetrumSerial
+	Pop $0
+	DetailPrint "InitDriverSetup: $0"
+	InstDrv::DeleteOemInfFiles /NOUNLOAD
+	InstDrv::CreateDevice /NOUNLOAD
+
+	SetOutPath $TEMP
+	File "../telemetrum.inf"
+	InstDrv::InstallDriver /NOUNLOAD "$TEMP\telemetrum.inf"
+
+	SetOutPath $INSTDIR
+	File "../telemetrum.inf"
+
+	SetOutPath $WINDIR\Inf
+	File "../telemetrum.inf"
+
+SectionEnd
+
+Section "TeleGPS Application"
 	Call DetectJRE
 
 	SetOutPath $INSTDIR
 
-	File "micropeak-fat.jar"
+	File "telegps-fat.jar"
 	File "altoslib_@ALTOSLIB_VERSION@.jar"
 	File "altosuilib_@ALTOSUILIB_VERSION@.jar"
+	File "cmudict04.jar"
+	File "cmulex.jar"
+	File "cmu_time_awb.jar"
+	File "cmutimelex.jar"
+	File "cmu_us_kal.jar"
+	File "en_us.jar"
+	File "freetts.jar"
 	File "jfreechart.jar"
 	File "jcommon.jar"
 
@@ -77,27 +104,27 @@ Section "MicroPeak Application"
 
 	File "../icon/*.ico"
 
-	CreateShortCut "$SMPROGRAMS\MicroPeak.lnk" "$SYSDIR\javaw.exe" "-jar micropeak-fat.jar" "$INSTDIR\micro-peak.ico"
+	CreateShortCut "$SMPROGRAMS\TeleGPS.lnk" "$SYSDIR\javaw.exe" "-jar telegps-fat.jar" "$INSTDIR\telegps.ico"
 SectionEnd
 
-Section "FTDI USB Driver"
-	SetOutPath $INSTDIR
+Section "TeleGPS Desktop Shortcut"
+	CreateShortCut "$DESKTOP\TeleGPS.lnk" "$INSTDIR\telegps-fat.jar"  "" "$INSTDIR\telegps.ico"
+SectionEnd
 
-	File "CDM20824_Setup.exe"
+Section "TeleGPS Firmware"
 
-	StrCpy $2 "$INSTDIR\CDM20824_Setup.exe"
-	ExecWait $2
-SectionEnd
+	SetOutPath $INSTDIR
 
-Section "MicroPeak Desktop Shortcut"
-	CreateShortCut "$DESKTOP\MicroPeak.lnk" "$INSTDIR\micropeak-fat.jar"  "" "$INSTDIR\micro-peak.ico"
+	File "../src/telegps-v1.0/telegps-v1.0-${VERSION}.ihx"
 SectionEnd
 
 Section "Documentation"
 
 	SetOutPath $INSTDIR
 
-	File "../doc/micropeak.pdf"
+	File "../doc/telegps.pdf"
+	File "../doc/altos.pdf"
+	File "../doc/telemetry.pdf"
 SectionEnd
 
 Section "Uninstaller"
@@ -126,7 +153,7 @@ Section "Uninstall"
 	RMDir "$INSTDIR"
 
 	; Remove shortcuts, if any
-	Delete "$SMPROGRAMS\MicroPeak.lnk"
-	Delete "$DESKTOP\MicroPeak.lnk"
+	Delete "$SMPROGRAMS\TeleGPS.lnk"
+	Delete "$DESKTOP\TeleGPS.lnk"
 	
 SectionEnd