altosui: Create iterables for log file scanning. Split out display threads

[fw/altos] / ao-tools / altosui / Makefile.am

diff --git a/ao-tools/altosui/Makefile.am b/ao-tools/altosui/Makefile.am
index bc8dbc0dd0c5de4773f488ef5650286ca49b76b9..7070af22e7fda87a0786a7e5d818b08a793f266a 100644 (file)
--- a/ao-tools/altosui/Makefile.am
+++ b/ao-tools/altosui/Makefile.am
@@ -1,7 +1,13 @@
 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 = \
        AltosChannelMenu.java \
@@ -14,9 +20,10 @@ altosui_JAVA = \
        AltosDebug.java \
        AltosDeviceDialog.java \
        AltosDevice.java \
+       AltosDisplayThread.java \
        AltosEepromDownload.java \
        AltosEepromMonitor.java \
-       AltosEepromReader.java \
+       AltosEepromIterable.java \
        AltosEepromRecord.java \
        AltosFile.java \
        AltosFlash.java \
@@ -27,6 +34,7 @@ altosui_JAVA = \
        AltosGreatCircle.java \
        AltosHexfile.java \
        Altos.java \
+       AltosInfoTable.java \
        AltosLine.java \
        AltosLogfileChooser.java \
        AltosLog.java \
@@ -34,13 +42,16 @@ altosui_JAVA = \
        AltosPreferences.java \
        AltosReader.java \
        AltosRecord.java \
+       AltosRecordIterable.java \
+       AltosReplayThread.java \
        AltosRomconfig.java \
        AltosRomconfigUI.java \
        AltosSerial.java \
        AltosSerialMonitor.java \
        AltosState.java \
+       AltosStatusTable.java \
        AltosTelemetry.java \
-       AltosTelemetryReader.java \
+       AltosTelemetryIterable.java \
        AltosUI.java \
        AltosVoice.java
 
@@ -86,15 +97,40 @@ MACOSX_EXTRA=$(FIRMWARE)
 
 WINDOWS_FILES=$(FAT_FILES) altos.dll $(top_srcdir)/telemetrum.inf $(WINDOWS_ICON)
 
-all-local: classes/altosui $(JAR) $(FATJAR) altosui altosui-test
+all-local: classes/altosui $(JAR) altosui altosui-test
 
 clean-local:
-       -rm -rf classes/altosui $(JAR) $(FATJAR) \
-               $(LINUX_DIST) $(MACOSX_DIST) $(WINDOWS_DIST) $(FREETTS_CLASS) \
+       -rm -rf classes $(JAR) $(FATJAR) \
+               $(LINUX_DIST) $(MACOSX_DIST) windows $(WINDOWS_DIST) $(FREETTS_CLASS) \
                $(LIBALTOS) Manifest.txt Manifest-fat.txt altos-windows.log \
                altosui altosui-test macosx linux
 
-fat: $(FATJAR) $(LINUX_DIST) $(MACOSX_DIST) $(WINDOWS_DIST)
+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
+
 
 altosuidir=$(datadir)/java
 
@@ -129,15 +165,23 @@ Manifest-fat.txt:
 
 altosui: Makefile
        echo "#!/bin/sh" > $@
-       echo 'exec java  -cp "$(FREETTS)/*" -Djava.library.path="$(libdir)" -jar "$(altosuidir)/altosui.jar"' >> $@
+       echo 'exec java  -cp "$(FREETTS)/*" -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)/*" -Djava.library.path="../libaltos/.libs" -jar altosui.jar "$$@"' >> $@
        chmod +x $@
 
-$(LIBALTOS):
+libaltos.so:
+       -rm -f "$@"
+       $(LN_S) ../libaltos/.libs/"$@" .
+
+libaltos.dylib:
+       -rm -f "$@"
+       $(LN_S) ../libaltos/"$@" .
+
+altos.dll:
        -rm -f "$@"
        $(LN_S) ../libaltos/"$@" .
 
@@ -167,4 +211,4 @@ $(MACOSX_DIST): $(MACOSX_FILES) $(MACOSX_EXTRA)
 
 $(WINDOWS_DIST): $(WINDOWS_FILES) altos-windows.nsi
        -rm -f $@
-       makensis -Oaltos-windows.log "-XOutFile $@" "-DVERSION=$(VERSION)" altos-windows.nsi
\ No newline at end of file
+       makensis -Oaltos-windows.log "-XOutFile $@" "-DVERSION=$(VERSION)" altos-windows.nsi