altosui: Add debug dongle API, split flash UI out

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

diff --git a/ao-tools/altosui/Makefile b/ao-tools/altosui/Makefile
index cd1230238a1cd199fb3e2a5156248cf67ead5e9f..affbac39485e4d0ce2c7a2f4a1addeb7c606a526 100644 (file)
--- a/ao-tools/altosui/Makefile
+++ b/ao-tools/altosui/Makefile
@@ -2,20 +2,39 @@
 
 CLASSPATH=classes:./*
 CLASSFILES=\
+       Altos.class \
+       AltosChannelMenu.class \
+       AltosConfig.class \
+       AltosConfigUI.class \
        AltosConvert.class \
+       AltosCSV.class \
+       AltosDebug.class \
+       AltosEepromDownload.class \
+       AltosEepromMonitor.class \
+       AltosEepromReader.class \
+       AltosEepromRecord.class \
        AltosFile.class \
+       AltosFlash.class \
+       AltosFlashUI.class \
+       AltosFlightInfoTableModel.class \
+       AltosFlightStatusTableModel.class \
        AltosGPS.class \
        AltosGreatCircle.class \
+       AltosHexfile.class \
        AltosLog.class \
        AltosParse.class \
        AltosPreferences.class \
+       AltosRecord.class \
        AltosSerialMonitor.class \
        AltosSerial.class \
        AltosState.class \
        AltosTelemetry.class \
+       AltosTelemetryReader.class \
        AltosUI.class \
        AltosDevice.class \
        AltosDeviceDialog.class \
+       AltosRomconfig.class \
+       AltosRomconfigUI.class \
        AltosVoice.class
 
 FREETTSSRC=/home/keithp/src/freetts/freetts-1.2.2
@@ -27,18 +46,26 @@ FREETTSJAR= \
        cmutimelex.jar \
        cmu_us_kal.jar \
        en_us.jar \
-       freetts.jar \
-       freetts-jsapi10.jar \
-       jsapi.jar
+       freetts.jar
 
-JAVAFLAGS=-Xlint:unchecked
+JAVAFLAGS=-Xlint:unchecked -Xlint:deprecation
 
-all: altosui.jar
+OS:=$(shell uname)
+
+ifeq ($(OS),Linux)
+ALTOSUI_APP=altosui
+endif
+
+ifeq ($(OS),Darwin)
+ALTOSUI_APP=AltosUI.app/Contents/Resources/Java/altosui.jar
+endif
+
+all: altosui.jar $(ALTOSUI_APP)
 
 $(CLASSFILES):
 
 .java.class:
-       javac -cp "$(CLASSPATH)" $(JAVAFLAGS) $*.java
+       javac -encoding UTF8 -classpath "$(CLASSPATH)" $(JAVAFLAGS) $*.java
 
 altosui.jar: classes/altosui classes/libaltosJNI $(FREETTSJAR) $(CLASSFILES) Manifest.txt
        cd ./classes && jar cfm ../$@ altosui/Manifest.txt altosui/*.class libaltosJNI/*.class
@@ -54,6 +81,23 @@ classes/libaltosJNI:
 $(FREETTSJAR):
        ln -s $(FREETTSLIB)/$@ .
 
+ifeq ($(OS),Darwin)
+RESOURCES=altosui.jar $(FREETTSJAR) ../libaltos/libaltos.dylib
+
+$(ALTOSUI_APP): $(RESOURCES)
+       mkdir -p AltosUI.app/Contents/Resources/Java
+       cp $(RESOURCES) AltosUI.app/Contents/Resources/Java
+
+endif
+
+ifeq ($(OS),Linux)
+altosui:
+       echo "#!/bin/sh" > $@
+       echo "exec java -Djava.library.path=../libaltos -jar altosui.jar" >> $@
+       chmod +x ./altosui
+endif
+
 clean:
        rm -f *.class $(FREETTSJAR) altosui.jar
+       rm -f AltosUI.app/Contents/Resources/Java/*
        rm -rf classes