X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=ao-tools%2Faltosui%2FMakefile.am;h=b6b2e572c205f0655d9d4fc307cb8863262442b5;hp=20c8b26d4bdbf0d014fa788c40ab667c7d081f6b;hb=483346a03c94b200692f5e6d59f3feee4dcf2ace;hpb=887b11f6b9c81b9f15348d54017e700ca7dc5e55

diff --git a/ao-tools/altosui/Makefile.am b/ao-tools/altosui/Makefile.am
index 20c8b26d..b6b2e572 100644
--- a/ao-tools/altosui/Makefile.am
+++ b/ao-tools/altosui/Makefile.am
@@ -1,48 +1,87 @@
 JAVAROOT=classes
+AM_JAVACFLAGS=-encoding UTF-8
 
-CLASSPATH_ENV=CLASSPATH="classes/altosui/*:../libaltos/libaltosJNI/*:$(FREETTS)/*:/usr/share/java/*"
+man_MANS=altosui.1
+
+altoslibdir=$(libdir)/altos
+
+CLASSPATH_ENV=mkdir -p $(JAVAROOT); CLASSPATH=".:classes:../libaltos:$(FREETTS)/*:/usr/share/java/*"
+
+bin_SCRIPTS=altosui
 
 altosui_JAVA = \
+	AltosAscent.java \
 	AltosChannelMenu.java \
 	AltosConfig.java \
 	AltosConfigUI.java \
+	AltosConfigureUI.java \
 	AltosConvert.java \
 	AltosCRCException.java \
 	AltosCSV.java \
 	AltosCSVUI.java \
 	AltosDebug.java \
+	AltosDescent.java \
 	AltosDeviceDialog.java \
 	AltosDevice.java \
+	AltosDisplayThread.java \
 	AltosEepromDownload.java \
 	AltosEepromMonitor.java \
-	AltosEepromReader.java \
+	AltosEepromIterable.java \
 	AltosEepromRecord.java \
 	AltosFile.java \
 	AltosFlash.java \
 	AltosFlashUI.java \
+	AltosFlightDisplay.java \
 	AltosFlightInfoTableModel.java \
-	AltosFlightStatusTableModel.java \
+	AltosFlightReader.java \
+	AltosFlightStatus.java \
+	AltosFlightUI.java \
 	AltosGPS.java \
 	AltosGreatCircle.java \
 	AltosHexfile.java \
 	Altos.java \
+	AltosInfoTable.java \
+	AltosKML.java \
+	AltosLanded.java \
+	AltosLed.java \
+	AltosLights.java \
 	AltosLine.java \
 	AltosLogfileChooser.java \
 	AltosLog.java \
+	AltosPad.java \
 	AltosParse.java \
 	AltosPreferences.java \
 	AltosReader.java \
 	AltosRecord.java \
+	AltosRecordIterable.java \
+	AltosTelemetryReader.java \
+	AltosReplayReader.java \
 	AltosRomconfig.java \
 	AltosRomconfigUI.java \
 	AltosSerial.java \
+	AltosSerialInUseException.java \
 	AltosSerialMonitor.java \
+	AltosSiteMap.java \
+	AltosSiteMapTile.java \
 	AltosState.java \
 	AltosTelemetry.java \
-	AltosTelemetryReader.java \
+	AltosTelemetryIterable.java \
 	AltosUI.java \
+	AltosWriter.java \
+	AltosDataPointReader.java \
+	AltosDataPoint.java \
+	AltosGraph.java \
+	AltosGraphTime.java \
+	AltosGraphUI.java \
+	AltosGraphDataChooser.java \
 	AltosVoice.java
 
+JFREECHART_CLASS= \
+    jfreechart.jar
+
+JCOMMON_CLASS=\
+    jcommon.jar
+
 FREETTS_CLASS= \
 	cmudict04.jar \
 	cmulex.jar \
@@ -62,12 +101,25 @@ JAR=altosui.jar
 FATJAR=altosui-fat.jar
 
 # Icons
-JAVA_ICON=$(top_srcdir)/icon/altus-metrum-16x16.jpg
-WINDOWS_ICON=$(top_srcdir)/icon/altus-metrum.ico
+ICONDIR=$(top_srcdir)/icon
+
+JAVA_ICON=$(ICONDIR)/altus-metrum-16x16.jpg
+
+ICONS=	$(ICONDIR)/redled.png $(ICONDIR)/redoff.png \
+	$(ICONDIR)/greenled.png $(ICONDIR)/greenoff.png \
+	$(ICONDIR)/grayled.png $(ICONDIR)/grayoff.png
+
+# icon base names for jar
+ICONJAR= -C $(ICONDIR) altus-metrum-16x16.jpg \
+	-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
 
 # Firmware
-FIRMWARE_TD=$(top_srcdir)/src/teledongle-v0.2.ihx
-FIRMWARE_TM=$(top_srcdir)/src/telemetrum-v1.0.ihx
+FIRMWARE_TD=$(top_srcdir)/src/teledongle-v0.2-$(VERSION).ihx
+FIRMWARE_TM=$(top_srcdir)/src/telemetrum-v1.0-$(VERSION).ihx
 FIRMWARE=$(FIRMWARE_TM) $(FIRMWARE_TD)
 
 # Distribution targets
@@ -75,24 +127,50 @@ LINUX_DIST=Altos-Linux-$(VERSION).tar.bz2
 MACOSX_DIST=Altos-Mac-$(VERSION).zip
 WINDOWS_DIST=Altos-Windows-$(VERSION_DASH).exe
 
-FAT_FILES=$(FATJAR) $(FREETTS_CLASS)
+FAT_FILES=$(FATJAR) $(FREETTS_CLASS) $(JFREECHART_CLASS) $(JCOMMON_CLASS)
 
-LINUX_FILES=$(FAT_FILES) libaltos.so
+LINUX_FILES=$(FAT_FILES) libaltos.so $(FIRMWARE)
+LINUX_EXTRA=altosui-fat
 
 MACOSX_FILES=$(FAT_FILES) libaltos.dylib
 MACOSX_EXTRA=$(FIRMWARE)
 
 WINDOWS_FILES=$(FAT_FILES) altos.dll $(top_srcdir)/telemetrum.inf $(WINDOWS_ICON)
 
-all-local: classes/altosui $(JAR) $(FATJAR)
+all-local: classes/altosui $(JAR) altosui altosui-test altosui-jdb
 
 clean-local:
-	-rm -rf classes/altosui $(JAR) $(FATJAR) \
-		$(LINUX_DIST) $(MACOSX_DIST) $(WINDOWS_DIST) $(FREETTS_CLASS) \
-		$(LIBALTOS) Manifest.txt Manifest-fat.txt altos-windows.log \
-		altosui altosui-test macosx linux
+	-rm -rf classes $(JAR) $(FATJAR) \
+		$(LINUX_DIST) $(MACOSX_DIST) windows $(WINDOWS_DIST) $(FREETTS_CLASS) \
+		$(JFREECHART_CLASS) $(JCOMMON_CLASS) $(LIBALTOS) Manifest.txt Manifest-fat.txt altos-windows.log \
+		altosui altosui-test altosui-jdb macosx linux
+
+if FATINSTALL
+
+FATTARGET=$(FATDIR)/$(VERSION)
+
+LINUX_DIST_TARGET=$(FATTARGET)/$(LINUX_DIST)
+MACOSX_DIST_TARGET=$(FATTARGET)/$(MACOSX_DIST)
+WINDOWS_DIST_TARGET=$(FATTARGET)/$(WINDOWS_DIST)
+
+fat: $(LINUX_DIST_TARGET) $(MACOSX_DIST_TARGET) $(WINDOWS_DIST_TARGET)
+
+$(LINUX_DIST_TARGET): $(LINUX_DIST)
+	mkdir -p $(FATTARGET)
+	cp -p $< $@
+
+$(MACOSX_DIST_TARGET): $(MACOSX_DIST)
+	mkdir -p $(FATTARGET)
+	cp -p $< $@
+
+$(WINDOWS_DIST_TARGET): $(WINDOWS_DIST)
+	mkdir -p $(FATTARGET)
+	cp -p $< $@
+
+else
+fat: $(LINUX_DIST) $(MACOSX_DIST) $(WINDOWS_DIST)
+endif
 
-fat: $(FATJAR) $(LINUX_DIST) $(MACOSX_DIST) $(WINDOWS_DIST)
 
 altosuidir=$(datadir)/java
 
@@ -107,47 +185,70 @@ classes/altosui:
 
 $(JAR): classaltosui.stamp Manifest.txt $(JAVA_ICON)
 	jar cfm $@ Manifest.txt \
-		-C $(top_srcdir)/icon altus-metrum-16x16.jpg \
+		$(ICONJAR) \
 		-C classes altosui \
 		-C ../libaltos libaltosJNI
 
-$(FATJAR): classaltosui.stamp Manifest-fat.txt $(FREETTS_CLASS) $(LIBALTOS) $(JAVA_ICON)
+$(FATJAR): classaltosui.stamp Manifest-fat.txt $(FREETTS_CLASS) $(JFREECHART_CLASS) $(JCOMMON_CLASS) $(LIBALTOS) $(JAVA_ICON)
 	jar cfm $@ Manifest-fat.txt \
-		-C $(top_srcdir)/icon altus-metrum-16x16.jpg \
+		$(ICONJAR) \
 		-C classes altosui \
 		-C ../libaltos libaltosJNI
 
 Manifest.txt: Makefile
 	echo 'Main-Class: altosui.AltosUI' > $@
-	echo "Class-Path: $(FREETTS)/freetts.jar" >> $@
+	echo "Class-Path: $(FREETTS)/freetts.jar $(JFREECHART)/jfreechart.jar $(JCOMMON)/jcommon.jar" >> $@
 
 Manifest-fat.txt:
 	echo 'Main-Class: altosui.AltosUI' > $@
-	echo "Class-Path: freetts.jar" >> $@
+	echo "Class-Path: freetts.jar jfreechart.jar jcommon.jar" >> $@
 
 altosui: Makefile
 	echo "#!/bin/sh" > $@
-	echo 'exec java  -cp "$(FREETTS)/*" -Djava.library.path="$(libdir)" -jar "$(altosuidir)/altosui.jar"' >> $@
+	echo 'exec java  -cp "$(FREETTS)/*:$(JFREECHART)/*:$(JCOMMON)/*" -Djava.library.path="$(altoslibdir)" -jar "$(altosuidir)/altosui.jar" "$$@"' >> $@
 	chmod +x $@
 
 altosui-test: Makefile
 	echo "#!/bin/sh" > $@
-	echo 'exec java -cp "$(FREETTS)/*" -Djava.library.path="../libaltos" -jar altosui.jar' >> $@
+	echo 'exec java -cp "$(FREETTS)/*:$(JFREECHART)/*:$(JCOMMON)/*" -Djava.library.path="../libaltos/.libs" -jar altosui.jar "$$@"' >> $@
+	chmod +x $@
+
+altosui-jdb: Makefile
+	echo "#!/bin/sh" > $@
+	echo 'exec jdb -classpath "classes:../libaltos:$(FREETTS)/*:$(JFREECHART)/*:$(JCOMMON)/*" -Djava.library.path="../libaltos/.libs" altosui/AltosUI "$$@"' >> $@
 	chmod +x $@
 
-$(LIBALTOS):
+libaltos.so:
+	-rm -f "$@"
+	$(LN_S) ../libaltos/.libs/"$@" .
+
+libaltos.dylib:
 	-rm -f "$@"
 	$(LN_S) ../libaltos/"$@" .
 
-$(FREETTS_CLASS): Makefile
+altos.dll:
+	-rm -f "$@"
+	$(LN_S) ../libaltos/"$@" .
+
+$(FREETTS_CLASS):
 	-rm -f "$@"
 	$(LN_S) "$(FREETTS)"/"$@" .
 
-$(LINUX_DIST): $(LINUX_FILES)
+$(JFREECHART_CLASS):
+	-rm -f "$@"
+	$(LN_S) "$(JFREECHART)"/"$@" .
+
+$(JCOMMON_CLASS):
+	-rm -f "$@"
+	$(LN_S) "$(JCOMMON)"/"$@" .
+
+$(LINUX_DIST): $(LINUX_FILES) $(LINUX_EXTRA)
 	-rm -f $@
 	-rm -rf linux
 	mkdir -p linux/AltOS
-	cp -a $(LINUX_FILES) linux/AltOS
+	cp -p $(LINUX_FILES) linux/AltOS
+	cp -p altosui-fat linux/AltOS/altosui
+	chmod +x linux/AltOS/altosui
 	tar cjf $@ -C linux AltOS
 
 $(MACOSX_DIST): $(MACOSX_FILES) $(MACOSX_EXTRA)
@@ -156,10 +257,12 @@ $(MACOSX_DIST): $(MACOSX_FILES) $(MACOSX_EXTRA)
 	mkdir macosx
 	cp -a AltosUI.app macosx/
 	mkdir -p macosx/AltOS macosx/AltosUI.app/Contents/Resources/Java
-	cp -a $(MACOSX_FILES) macosx/AltosUI.app/Contents/Resources/Java
-	cp -a $(MACOSX_EXTRA) macosx/AltOS
+	cp -p $(FATJAR) macosx/AltosUI.app/Contents/Resources/Java/altosui.jar
+	cp -p $(FREETTS_CLASS) libaltos.dylib macosx/AltosUI.app/Contents/Resources/Java
+	cp -p $(JFREECHART_CLASS) libaltos.dylib macosx/AltosUI.app/Contents/Resources/Java
+	cp -p $(MACOSX_EXTRA) macosx/AltOS
 	cd macosx && zip -r ../$@ AltosUI.app AltOS
 
 $(WINDOWS_DIST): $(WINDOWS_FILES) altos-windows.nsi
 	-rm -f $@
-	makensis -Oaltos-windows.log "-XOutFile $@" altos-windows.nsi
\ No newline at end of file
+	makensis -Oaltos-windows.log "-XOutFile $@" "-DVERSION=$(VERSION)" altos-windows.nsi