X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FMakefile.am;h=e6de1d97345ddb66b7945f88b140b3fc20c72c42;hp=593eeb0a4600d10bfcd45a842cd92fabf4d8ab0b;hb=356617a3476e237311b8bbcefd6beda8271b120d;hpb=8af405f1ac4d1b930f10465fd0270a49176f16d1

diff --git a/altosui/Makefile.am b/altosui/Makefile.am
index 593eeb0a..e6de1d97 100644
--- a/altosui/Makefile.am
+++ b/altosui/Makefile.am
@@ -1,93 +1,39 @@
 
 JAVAROOT=classes
-AM_JAVACFLAGS=-encoding UTF-8 -Xlint:deprecation
+AM_JAVACFLAGS=-target 1.6 -encoding UTF-8 -Xlint:deprecation -Xlint:unchecked -source 6
 
 man_MANS=altosui.1
 
 altoslibdir=$(libdir)/altos
 
-CLASSPATH_ENV=mkdir -p $(JAVAROOT); CLASSPATH="./*:$(JAVAROOT):../libaltos:$(JCOMMON)/jcommon.jar:$(JFREECHART)/jfreechart.jar:$(FREETTS)/freetts.jar"
+CLASSPATH_ENV=mkdir -p $(JAVAROOT); CLASSPATH="$(JAVAROOT):../altoslib/*:../altosuilib/*:../libaltos:$(JCOMMON)/jcommon.jar:$(JFREECHART)/jfreechart.jar:$(FREETTS)/freetts.jar"
 
 bin_SCRIPTS=altosui
 
-altosui_BT = \
-	AltosBTDevice.java \
-	AltosBTDeviceIterator.java \
-	AltosBTManage.java \
-	AltosBTKnown.java
-
 altosui_JAVA = \
-	GrabNDrag.java \
 	AltosAscent.java \
 	AltosChannelMenu.java \
 	AltosCompanionInfo.java \
 	AltosConfig.java \
-	AltosConfigFreqUI.java \
 	AltosConfigUI.java \
 	AltosConfigPyroUI.java \
 	AltosConfigureUI.java \
 	AltosConfigTD.java \
 	AltosConfigTDUI.java \
-	AltosCSV.java \
-	AltosCSVUI.java \
-	AltosDebug.java \
 	AltosDescent.java \
-	AltosDeviceUIDialog.java \
-	AltosUSBDevice.java \
-	AltosDisplayThread.java \
-	AltosEepromDelete.java \
-	AltosEepromDownload.java \
-	AltosEepromList.java \
-	AltosEepromManage.java \
-	AltosEepromMonitor.java \
-	AltosEepromSelect.java \
-	AltosFlash.java \
-	AltosFlashUI.java \
-	AltosFlightDisplay.java \
-	AltosFlightInfoTableModel.java \
-	AltosFlightStats.java \
-	AltosFlightStatsTable.java \
 	AltosFlightStatus.java \
 	AltosFlightStatusUpdate.java \
 	AltosFlightUI.java \
-	AltosFontListener.java \
-	AltosFreqList.java \
-	AltosHexfile.java \
 	Altos.java \
 	AltosIdleMonitorUI.java \
 	AltosIgniteUI.java \
+	AltosIgnitor.java \
 	AltosLaunch.java \
 	AltosLaunchUI.java \
-	AltosInfoTable.java \
-	AltosKML.java \
 	AltosLanded.java \
-	AltosLed.java \
-	AltosLights.java \
 	AltosPad.java \
-	AltosUIPreferences.java \
-	AltosUIPreferencesBackend.java \
-	AltosRomconfig.java \
-	AltosRomconfigUI.java \
-	AltosScanUI.java \
-	AltosSerial.java \
-	AltosSerialInUseException.java \
-	AltosSiteMap.java \
-	AltosSiteMapPreload.java \
-	AltosSiteMapCache.java \
-	AltosSiteMapTile.java \
 	AltosUI.java \
-	AltosUIListener.java \
-	AltosFrame.java \
-	AltosDialog.java \
-	AltosWriter.java \
-	AltosDataPointReader.java \
-	AltosDataPoint.java \
-	AltosGraph.java \
-	AltosGraphTime.java \
-	AltosGraphUI.java \
-	AltosDataChooser.java \
-	AltosVoice.java \
-	$(altosui_BT)
+	AltosGraphUI.java
 
 JFREECHART_CLASS= \
     jfreechart.jar
@@ -105,107 +51,160 @@ FREETTS_CLASS= \
 	freetts.jar
 
 ALTOSLIB_CLASS=\
-	AltosLib.jar
+	altoslib_$(ALTOSLIB_VERSION).jar
 
 ALTOSUILIB_CLASS=\
-	altosuilib.jar
+	altosuilib_$(ALTOSUILIB_VERSION).jar
 
 LIBALTOS= \
-	libaltos.so \
+	libaltos32.so \
+	libaltos64.so \
 	libaltos.dylib \
 	altos.dll
 
+desktopdir = $(datadir)/applications
+desktop_file = altusmetrum-altosui.desktop
+desktop_SCRIPTS = $(desktop_file)
+
 JAR=altosui.jar
 
 FATJAR=altosui-fat.jar
 
 # Icons
-ICONDIR=$(top_srcdir)/icon
+ICONDIR=../icon
 
 JAVA_ICONS=\
-	$(ICONDIR)/altus-metrum-16.png \
-	$(ICONDIR)/altus-metrum-32.png \
-	$(ICONDIR)/altus-metrum-48.png \
-	$(ICONDIR)/altus-metrum-64.png \
-	$(ICONDIR)/altus-metrum-128.png \
-	$(ICONDIR)/altus-metrum-256.png
-
-ICONS=	$(ICONDIR)/redled.png $(ICONDIR)/redoff.png \
-	$(ICONDIR)/greenled.png $(ICONDIR)/greenoff.png \
-	$(ICONDIR)/grayled.png $(ICONDIR)/grayoff.png
+	$(ICONDIR)/altusmetrum-altosui-16.png \
+	$(ICONDIR)/altusmetrum-altosui-32.png \
+	$(ICONDIR)/altusmetrum-altosui-48.png \
+	$(ICONDIR)/altusmetrum-altosui-64.png \
+	$(ICONDIR)/altusmetrum-altosui-128.png\
+	$(ICONDIR)/altusmetrum-altosui-256.png
 
 # icon base names for jar
-ICONJAR= -C $(ICONDIR) altus-metrum-16.png \
-	-C $(ICONDIR) altus-metrum-32.png \
-	-C $(ICONDIR) altus-metrum-48.png \
-	-C $(ICONDIR) altus-metrum-64.png \
-	-C $(ICONDIR) altus-metrum-128.png \
-	-C $(ICONDIR) altus-metrum-256.png \
-	-C $(ICONDIR) redled.png -C $(ICONDIR) redoff.png \
-	-C $(ICONDIR) greenled.png -C $(ICONDIR) greenoff.png \
-	-C $(ICONDIR) grayon.png -C $(ICONDIR) grayled.png
-
-WINDOWS_ICON=$(ICONDIR)/altus-metrum.ico
+ICONJAR= \
+	-C $(ICONDIR) altusmetrum-altosui-16.png \
+	-C $(ICONDIR) altusmetrum-altosui-32.png \
+	-C $(ICONDIR) altusmetrum-altosui-48.png \
+	-C $(ICONDIR) altusmetrum-altosui-64.png \
+	-C $(ICONDIR) altusmetrum-altosui-128.png\
+	-C $(ICONDIR) altusmetrum-altosui-256.png
+
+WINDOWS_ICONS	=\
+	$(ICONDIR)/altusmetrum-altosui.ico \
+	$(ICONDIR)/altusmetrum-altosui.exe
+	$(ICONDIR)/application-vnd.altusmetrum.eeprom.ico \
+	$(ICONDIR)/application-vnd.altusmetrum.eeprom.exe \
+	$(ICONDIR)/application-vnd.altusmetrum.telemetry.ico \
+	$(ICONDIR)/application-vnd.altusmetrum.telemetry.exe
+
+MACOSX_ICONS	=\
+	$(ICONDIR)/altusmetrum-altosui.icns \
+	$(ICONDIR)/application-vnd.altusmetrum.eeprom.icns \
+	$(ICONDIR)/application-vnd.altusmetrum.telemetry.icns
+
+LINUX_ICONS	=\
+	$(ICONDIR)/altusmetrum-altosui.svg \
+	$(ICONDIR)/application-vnd.altusmetrum.eeprom.svg \
+	$(ICONDIR)/application-vnd.altusmetrum.telemetry.svg
+
+LINUX_MIMETYPE	=\
+	$(ICONDIR)/org-altusmetrum-mimetypes.xml
 
 # Firmware
-FIRMWARE_TD_0_2=$(top_srcdir)/src/teledongle-v0.2-$(VERSION).ihx
-FIRMWARE_TD=$(FIRMWARE_TD_0_2)
+FIRMWARE_TD_0_2=$(top_srcdir)/src/teledongle-v0.2/teledongle-v0.2-$(VERSION).ihx
+FIRMWARE_TD_3_0=$(top_srcdir)/src/teledongle-v3.0/teledongle-v3.0-$(VERSION).ihx
+FIRMWARE_TD=$(FIRMWARE_TD_0_2) $(FIRMWARE_TD_3_0)
 
-FIRMWARE_TM_1_0=$(top_srcdir)/src/telemetrum-v1.0-$(VERSION).ihx
-FIRMWARE_TM_1_1=$(top_srcdir)/src/telemetrum-v1.1-$(VERSION).ihx
-FIRMWARE_TM_1_2=$(top_srcdir)/src/telemetrum-v1.2-$(VERSION).ihx
-FIRMWARE_TM=$(FIRMWARE_TM_1_0) $(FIRMWARE_TM_1_1) $(FIRMWARE_TM_1_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_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-$(VERSION).ihx
+FIRMWARE_TELEMINI_1_0=$(top_srcdir)/src/telemini-v1.0/telemini-v1.0-$(VERSION).ihx
 FIRMWARE_TELEMINI=$(FIRMWARE_TELEMINI_1_0)
 
-FIRMWARE=$(FIRMWARE_TM) $(FIRMWARE_TELEMINI) $(FIRMWARE_TD) 
+FIRMWARE_TBT_1_0=$(top_srcdir)/src/telebt-v1.0/telebt-v1.0-$(VERSION).ihx
+FIRMWARE_TBT=$(FIRMWARE_TBT_1_0)
+
+FIRMWARE_TMEGA_1_0=$(top_srcdir)/src/telemega-v1.0/telemega-v1.0-$(VERSION).ihx
+FIRMWARE_TMEGA=$(FIRMWARE_TMEGA_1_0)
+
+FIRMWARE_EMINI_1_0=$(top_srcdir)/src/easymini-v1.0/easymini-v1.0-$(VERSION).ihx
+FIRMWARE_EMINI=$(FIRMWARE_EMINI_1_0)
+
+FIRMWARE_EMEGA_1_0=$(top_srcdir)/src/easymega-v1.0/easymega-v1.0-$(VERSION).ihx
+FIRMWARE_EMEGA=$(FIRMWARE_EMEGA_1_0)
+
+FIRMWARE_TGPS_1_0=$(top_srcdir)/src/telegps-v1.0/telegps-v1.0-$(VERSION).ihx
+FIRMWARE_TGPS=$(FIRMWARE_TGPS_1_0)
+
+FIRMWARE=$(FIRMWARE_TM) $(FIRMWARE_TELEMINI) $(FIRMWARE_TD) $(FIRMWARE_TBT) $(FIRMWARE_TMEGA) $(FIRMWARE_EMINI) $(FIRMWARE_TGPS) $(FIRMWARE_EMEGA)
 
 ALTUSMETRUM_DOC=$(top_srcdir)/doc/altusmetrum.pdf
 ALTOS_DOC=$(top_srcdir)/doc/altos.pdf
 TELEMETRY_DOC=$(top_srcdir)/doc/telemetry.pdf
-TEMPLATE_DOC=$(top_srcdir)/doc/telemetrum-outline.pdf $(top_srcdir)/doc/megametrum-outline.pdf
+TEMPLATE_DOC=\
+	$(top_srcdir)/doc/telemetrum-outline.pdf \
+	$(top_srcdir)/doc/easymini-outline.pdf \
+	$(top_srcdir)/doc/telemega-outline.pdf \
+	$(top_srcdir)/doc/telemini.pdf
 
 DOC=$(ALTUSMETRUM_DOC) $(ALTOS_DOC) $(TELEMETRY_DOC) $(TEMPLATE_DOC)
 
 # Distribution targets
 LINUX_DIST=Altos-Linux-$(VERSION).tar.bz2
-MACOSX_DIST=Altos-Mac-$(VERSION).zip
+LINUX_SH=Altos-Linux-$(VERSION).sh
+MACOSX_DIST=Altos-Mac-$(VERSION).dmg
 WINDOWS_DIST=Altos-Windows-$(VERSION_DASH).exe
 
 FAT_FILES=$(FATJAR) $(ALTOSLIB_CLASS) $(ALTOSUILIB_CLASS) $(FREETTS_CLASS) $(JFREECHART_CLASS) $(JCOMMON_CLASS)
 
-LINUX_FILES=$(FAT_FILES) libaltos.so $(FIRMWARE) $(DOC)
+LINUX_LIBS=libaltos32.so libaltos64.so
+
+LINUX_FILES=$(FAT_FILES) $(LINUX_LIBS) $(FIRMWARE) $(DOC) $(desktop_file).in $(LINUX_ICONS) $(LINUX_MIMETYPE)
 LINUX_EXTRA=altosui-fat
 
 MACOSX_INFO_PLIST=Info.plist
-MACOSX_FILES=$(FAT_FILES) libaltos.dylib $(MACOSX_INFO_PLIST)
+MACOSX_FILES=$(FAT_FILES) libaltos.dylib $(MACOSX_INFO_PLIST) $(DOC) ReadMe-Mac.rtf $(MACOSX_ICONS)
 MACOSX_EXTRA=$(FIRMWARE)
 
-WINDOWS_FILES=$(FAT_FILES) altos.dll altos64.dll $(top_srcdir)/telemetrum.inf $(WINDOWS_ICON)
+WINDOWS_FILES=$(FAT_FILES) $(FIRMWARE) altos.dll altos64.dll $(top_srcdir)/altusmetrum.inf $(top_srcdir)/altusmetrum.cat $(WINDOWS_ICONS)
 
 all-local: classes/altosui $(JAR) altosui altosui-test altosui-jdb
 
 clean-local:
 	-rm -rf classes $(JAR) $(FATJAR) \
-		$(LINUX_DIST) $(MACOSX_DIST) windows $(WINDOWS_DIST) $(ALTOSLIB_CLASS) $(ALTOSUILIB_CLASS) $(FREETTS_CLASS) \
-		$(JFREECHART_CLASS) $(JCOMMON_CLASS) $(LIBALTOS) Manifest.txt Manifest-fat.txt altos-windows.log \
-		altosui altosui-test altosui-jdb macosx linux
+		$(LINUX_DIST) $(LINUX_SH) $(MACOSX_DIST) windows $(WINDOWS_DIST) $(ALTOSLIB_CLASS) $(ALTOSUILIB_CLASS) $(FREETTS_CLASS) \
+		$(JFREECHART_CLASS) $(JCOMMON_CLASS) $(LIBALTOS) Manifest.txt Manifest-fat.txt altos-windows.log altos-windows.nsi \
+		altosui altosui-test altosui-jdb macosx linux *.desktop
+
+EXTRA_DIST = $(desktop_file).in
+
+$(desktop_file): $(desktop_file).in
+	sed -e 's#%bindir%#@bindir@#' -e 's#%icondir%#$(datadir)/icons/hicolor/scalable/apps#' ${srcdir}/$(desktop_file).in > $@
+	chmod +x $@
 
 if FATINSTALL
 
 FATTARGET=$(FATDIR)/$(VERSION)
 
 LINUX_DIST_TARGET=$(FATTARGET)/$(LINUX_DIST)
+LINUX_SH_TARGET=$(FATTARGET)/$(LINUX_SH)
 MACOSX_DIST_TARGET=$(FATTARGET)/$(MACOSX_DIST)
 WINDOWS_DIST_TARGET=$(FATTARGET)/$(WINDOWS_DIST)
 
-fat: $(LINUX_DIST_TARGET) $(MACOSX_DIST_TARGET) $(WINDOWS_DIST_TARGET)
+fat: $(LINUX_DIST_TARGET) $(LINUX_SH_TARGET) $(MACOSX_DIST_TARGET) $(WINDOWS_DIST_TARGET)
 
 $(LINUX_DIST_TARGET): $(LINUX_DIST)
 	mkdir -p $(FATTARGET)
 	cp -p $< $@
 
+$(LINUX_SH_TARGET): $(LINUX_SH)
+	mkdir -p $(FATTARGET)
+	cp -p $< $@
+
 $(MACOSX_DIST_TARGET): $(MACOSX_DIST)
 	mkdir -p $(FATTARGET)
 	cp -p $< $@
@@ -215,10 +214,9 @@ $(WINDOWS_DIST_TARGET): $(WINDOWS_DIST)
 	cp -p $< $@
 
 else
-fat: $(LINUX_DIST) $(MACOSX_DIST) $(WINDOWS_DIST)
+fat: $(LINUX_DIST) $(LINUX_SH) $(MACOSX_DIST) $(WINDOWS_DIST)
 endif
 
-
 altosuidir=$(datadir)/java
 
 install-altosuiJAVA: altosui.jar
@@ -256,8 +254,12 @@ altosui: Makefile
 	chmod +x $@
 
 altosui-test: Makefile
-	echo "#!/bin/sh" > $@
-	echo 'exec java -Djava.library.path="../libaltos/.libs" -jar altosui.jar "$$@"' >> $@
+	echo '#!/bin/sh' > $@
+	echo 'dir="$$(dirname $$0)"' >> $@
+	echo 'cd "$$dir"' >> $@
+	echo 'altosui="$$(pwd -P)"' >> $@
+	echo 'altos="$$(dirname $$altosui)"' >> $@
+	echo 'exec java -Djava.library.path="$$altos/libaltos/.libs" -jar "$$altosui/altosui.jar" "$$@"' >> $@
 	chmod +x $@
 
 altosui-jdb: Makefile
@@ -265,7 +267,11 @@ altosui-jdb: Makefile
 	echo 'exec jdb -classpath "classes:./*:../libaltos:$(FREETTS)/freetts.jar:$(JCOMMON)/jcommon.jar:$(JFREECHART)/jfreechart.jar" -Djava.library.path="../libaltos/.libs" altosui/AltosUI "$$@"' >> $@
 	chmod +x $@
 
-libaltos.so: build-libaltos
+libaltos32.so: build-libaltos
+	-rm -f "$@"
+	$(LN_S) ../libaltos/.libs/"$@" .
+
+libaltos64.so: build-libaltos
 	-rm -f "$@"
 	$(LN_S) ../libaltos/.libs/"$@" .
 
@@ -281,7 +287,9 @@ altos64.dll: ../libaltos/altos64.dll
 	-rm -f "$@"
 	$(LN_S) ../libaltos/"$@" .
 
-../libaltos/.libs/libaltos.so: build-libaltos
+../libaltos/.libs/libaltos64.so: ../libaltos/.libs/libaltos32.so
+
+../libaltos/.libs/libaltos32.so: build-libaltos
 
 ../libaltos/altos.dll: build-altos-dll
 
@@ -324,13 +332,21 @@ $(LINUX_DIST): $(LINUX_FILES) $(LINUX_EXTRA)
 	chmod +x linux/AltOS/altosui
 	tar cjf $@ -C linux AltOS
 
-$(MACOSX_DIST): $(MACOSX_FILES) $(MACOSX_EXTRA)
+$(LINUX_SH): $(LINUX_DIST) linux-install.sh
+	cat linux-install.sh $(LINUX_DIST) > $@
+	chmod +x $@
+
+$(MACOSX_DIST): $(MACOSX_FILES) $(MACOSX_EXTRA) Makefile
 	-rm -f $@
 	-rm -rf macosx
 	mkdir macosx
 	cp -a AltosUI.app macosx/
+	cp -a ReadMe-Mac.rtf macosx/ReadMe.rtf
+	mkdir -p macosx/Doc
+	cp -a $(DOC) macosx/Doc
 	cp -p Info.plist macosx/AltosUI.app/Contents
-	mkdir -p macosx/AltOS macosx/AltosUI.app/Contents/Resources/Java
+	mkdir -p macosx/AltOS-$(VERSION) macosx/AltosUI.app/Contents/Resources/Java
+	cp -p $(MACOSX_ICONS) macosx/AltosUI.app/Contents/Resources
 	cp -p $(FATJAR) macosx/AltosUI.app/Contents/Resources/Java/altosui.jar
 	cp -p libaltos.dylib macosx/AltosUI.app/Contents/Resources/Java
 	cp -p $(ALTOSLIB_CLASS) macosx/AltosUI.app/Contents/Resources/Java
@@ -338,10 +354,9 @@ $(MACOSX_DIST): $(MACOSX_FILES) $(MACOSX_EXTRA)
 	cp -p $(FREETTS_CLASS) macosx/AltosUI.app/Contents/Resources/Java
 	cp -p $(JFREECHART_CLASS) macosx/AltosUI.app/Contents/Resources/Java
 	cp -p $(JCOMMON_CLASS) macosx/AltosUI.app/Contents/Resources/Java
-	cp -p $(MACOSX_EXTRA) macosx/AltOS
-	cd macosx && zip -r ../$@ AltosUI.app AltOS
+	cp -p $(MACOSX_EXTRA) macosx/AltOS-$(VERSION)
+	genisoimage -D -V AltOS-$(VERSION) -no-pad -r -apple -o $@ macosx
 
-$(WINDOWS_DIST): $(WINDOWS_FILES) altos-windows.nsi
+$(WINDOWS_DIST): $(WINDOWS_FILES) altos-windows.nsi Instdrv/NSIS/Includes/java.nsh
 	-rm -f $@
-	makensis -Oaltos-windows.log "-XOutFile $@" "-DVERSION=$(VERSION)" altos-windows.nsi
-
+	makensis -Oaltos-windows.log "-XOutFile $@" "-DVERSION=$(VERSION)" altos-windows.nsi || (cat altos-windows.log && exit 1)