projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos/telefire: Radio status (no data, weak data, good data) on LEDs
[fw/altos]
/
altosui
/
Makefile.am
diff --git
a/altosui/Makefile.am
b/altosui/Makefile.am
index 0482029477a143f1843ba3cd64852cd99e2e6ae4..78e29cd8242fc33d1dd525b6341cfdddd399cf15 100644
(file)
--- a/
altosui/Makefile.am
+++ b/
altosui/Makefile.am
@@
-1,4
+1,4
@@
-SUBDIRS=libaltos
+
JAVAROOT=classes
AM_JAVACFLAGS=-encoding UTF-8 -Xlint:deprecation
JAVAROOT=classes
AM_JAVACFLAGS=-encoding UTF-8 -Xlint:deprecation
@@
-6,7
+6,7
@@
man_MANS=altosui.1
altoslibdir=$(libdir)/altos
altoslibdir=$(libdir)/altos
-CLASSPATH_ENV=mkdir -p $(JAVAROOT); CLASSPATH="
.:classes:../altoslib/*:
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
bin_SCRIPTS=altosui
@@
-24,16
+24,14
@@
altosui_JAVA = \
AltosConfig.java \
AltosConfigFreqUI.java \
AltosConfigUI.java \
AltosConfig.java \
AltosConfigFreqUI.java \
AltosConfigUI.java \
+ AltosConfigPyroUI.java \
AltosConfigureUI.java \
AltosConfigTD.java \
AltosConfigTDUI.java \
AltosCSV.java \
AltosCSVUI.java \
AltosConfigureUI.java \
AltosConfigTD.java \
AltosConfigTDUI.java \
AltosCSV.java \
AltosCSVUI.java \
- AltosDebug.java \
AltosDescent.java \
AltosDescent.java \
- AltosDeviceDialog.java \
- AltosDevice.java \
- AltosUSBDevice.java \
+ AltosDeviceUIDialog.java \
AltosDisplayThread.java \
AltosEepromDelete.java \
AltosEepromDownload.java \
AltosDisplayThread.java \
AltosEepromDelete.java \
AltosEepromDownload.java \
@@
-41,7
+39,6
@@
altosui_JAVA = \
AltosEepromManage.java \
AltosEepromMonitor.java \
AltosEepromSelect.java \
AltosEepromManage.java \
AltosEepromMonitor.java \
AltosEepromSelect.java \
- AltosFlash.java \
AltosFlashUI.java \
AltosFlightDisplay.java \
AltosFlightInfoTableModel.java \
AltosFlashUI.java \
AltosFlightDisplay.java \
AltosFlightInfoTableModel.java \
@@
-50,9
+47,7
@@
altosui_JAVA = \
AltosFlightStatus.java \
AltosFlightStatusUpdate.java \
AltosFlightUI.java \
AltosFlightStatus.java \
AltosFlightStatusUpdate.java \
AltosFlightUI.java \
- AltosFontListener.java \
AltosFreqList.java \
AltosFreqList.java \
- AltosHexfile.java \
Altos.java \
AltosIdleMonitorUI.java \
AltosIgniteUI.java \
Altos.java \
AltosIdleMonitorUI.java \
AltosIgniteUI.java \
@@
-64,8
+59,7
@@
altosui_JAVA = \
AltosLed.java \
AltosLights.java \
AltosPad.java \
AltosLed.java \
AltosLights.java \
AltosPad.java \
- AltosUIPreferences.java \
- AltosRomconfig.java \
+ AltosUIPreferencesBackend.java \
AltosRomconfigUI.java \
AltosScanUI.java \
AltosSerial.java \
AltosRomconfigUI.java \
AltosScanUI.java \
AltosSerial.java \
@@
-75,17
+69,12
@@
altosui_JAVA = \
AltosSiteMapCache.java \
AltosSiteMapTile.java \
AltosUI.java \
AltosSiteMapCache.java \
AltosSiteMapTile.java \
AltosUI.java \
- AltosUIListener.java \
- AltosFrame.java \
- AltosDialog.java \
AltosWriter.java \
AltosWriter.java \
- AltosDataPointReader.java \
- AltosDataPoint.java \
AltosGraph.java \
AltosGraph.java \
- AltosGraphTime.java \
+ AltosGraphDataPoint.java \
+ AltosGraphDataSet.java \
AltosGraphUI.java \
AltosDataChooser.java \
AltosGraphUI.java \
AltosDataChooser.java \
- AltosVersion.java \
AltosVoice.java \
$(altosui_BT)
AltosVoice.java \
$(altosui_BT)
@@
-105,7
+94,10
@@
FREETTS_CLASS= \
freetts.jar
ALTOSLIB_CLASS=\
freetts.jar
ALTOSLIB_CLASS=\
- AltosLib.jar
+ altoslib_$(ALTOSLIB_VERSION).jar
+
+ALTOSUILIB_CLASS=\
+ altosuilib_$(ALTOSUILIB_VERSION).jar
LIBALTOS= \
libaltos.so \
LIBALTOS= \
libaltos.so \
@@
-119,14
+111,25
@@
FATJAR=altosui-fat.jar
# Icons
ICONDIR=$(top_srcdir)/icon
# Icons
ICONDIR=$(top_srcdir)/icon
-JAVA_ICON=$(ICONDIR)/altus-metrum-16x16.jpg
+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
# icon base names for jar
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 \
+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
-C $(ICONDIR) redled.png -C $(ICONDIR) redoff.png \
-C $(ICONDIR) greenled.png -C $(ICONDIR) greenoff.png \
-C $(ICONDIR) grayon.png -C $(ICONDIR) grayled.png
@@
-145,27
+148,30
@@
FIRMWARE_TM=$(FIRMWARE_TM_1_0) $(FIRMWARE_TM_1_1) $(FIRMWARE_TM_1_2)
FIRMWARE_TELEMINI_1_0=$(top_srcdir)/src/telemini-v1.0-$(VERSION).ihx
FIRMWARE_TELEMINI=$(FIRMWARE_TELEMINI_1_0)
FIRMWARE_TELEMINI_1_0=$(top_srcdir)/src/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-$(VERSION).ihx
+FIRMWARE_TBT=$(FIRMWARE_TBT_1_0)
+
+FIRMWARE=$(FIRMWARE_TM) $(FIRMWARE_TELEMINI) $(FIRMWARE_TD) $(FIRMWARE_TBT)
ALTUSMETRUM_DOC=$(top_srcdir)/doc/altusmetrum.pdf
ALTOS_DOC=$(top_srcdir)/doc/altos.pdf
TELEMETRY_DOC=$(top_srcdir)/doc/telemetry.pdf
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/
telemega
-outline.pdf
DOC=$(ALTUSMETRUM_DOC) $(ALTOS_DOC) $(TELEMETRY_DOC) $(TEMPLATE_DOC)
# Distribution targets
LINUX_DIST=Altos-Linux-$(VERSION).tar.bz2
DOC=$(ALTUSMETRUM_DOC) $(ALTOS_DOC) $(TELEMETRY_DOC) $(TEMPLATE_DOC)
# Distribution targets
LINUX_DIST=Altos-Linux-$(VERSION).tar.bz2
-MACOSX_DIST=Altos-Mac-$(VERSION).
zip
+MACOSX_DIST=Altos-Mac-$(VERSION).
dmg
WINDOWS_DIST=Altos-Windows-$(VERSION_DASH).exe
WINDOWS_DIST=Altos-Windows-$(VERSION_DASH).exe
-FAT_FILES=$(FATJAR) $(ALTOSLIB_CLASS) $(FREETTS_CLASS) $(JFREECHART_CLASS) $(JCOMMON_CLASS)
+FAT_FILES=$(FATJAR) $(ALTOSLIB_CLASS) $(
ALTOSUILIB_CLASS) $(
FREETTS_CLASS) $(JFREECHART_CLASS) $(JCOMMON_CLASS)
LINUX_FILES=$(FAT_FILES) libaltos.so $(FIRMWARE) $(DOC)
LINUX_EXTRA=altosui-fat
MACOSX_INFO_PLIST=Info.plist
LINUX_FILES=$(FAT_FILES) libaltos.so $(FIRMWARE) $(DOC)
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)
ReadMe-Mac.rtf
MACOSX_EXTRA=$(FIRMWARE)
WINDOWS_FILES=$(FAT_FILES) altos.dll altos64.dll $(top_srcdir)/telemetrum.inf $(WINDOWS_ICON)
MACOSX_EXTRA=$(FIRMWARE)
WINDOWS_FILES=$(FAT_FILES) altos.dll altos64.dll $(top_srcdir)/telemetrum.inf $(WINDOWS_ICON)
@@
-174,8
+180,8
@@
all-local: classes/altosui $(JAR) altosui altosui-test altosui-jdb
clean-local:
-rm -rf classes $(JAR) $(FATJAR) \
clean-local:
-rm -rf classes $(JAR) $(FATJAR) \
- $(LINUX_DIST) $(MACOSX_DIST) windows $(WINDOWS_DIST) $(ALTOSLIB_CLASS) $(FREETTS_CLASS) \
- $(JFREECHART_CLASS) $(JCOMMON_CLASS) $(LIBALTOS) Manifest.txt Manifest-fat.txt altos-windows.log \
+ $(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
altos-windows.nsi
\
altosui altosui-test altosui-jdb macosx linux
if FATINSTALL
altosui altosui-test altosui-jdb macosx linux
if FATINSTALL
@@
-216,75
+222,79
@@
install-altosuiJAVA: altosui.jar
classes/altosui:
mkdir -p classes/altosui
classes/altosui:
mkdir -p classes/altosui
-$(JAR): classaltosui.stamp Manifest.txt $(JAVA_ICON
) $(ALTOS
LIB_CLASS)
+$(JAR): classaltosui.stamp Manifest.txt $(JAVA_ICON
S) $(ALTOSLIB_CLASS) $(ALTOSUI
LIB_CLASS)
jar cfm $@ Manifest.txt \
$(ICONJAR) \
-C classes altosui \
jar cfm $@ Manifest.txt \
$(ICONJAR) \
-C classes altosui \
- -C libaltos libaltosJNI
+ -C
../
libaltos libaltosJNI
-$(FATJAR): classaltosui.stamp Manifest-fat.txt $(ALTOSLIB_CLASS) $(
FREETTS_CLASS) $(JFREECHART_CLASS) $(JCOMMON_CLASS) $(LIBALTOS) $(JAVA_ICON
)
+$(FATJAR): classaltosui.stamp Manifest-fat.txt $(ALTOSLIB_CLASS) $(
ALTOSUILIB_CLASS) $(FREETTS_CLASS) $(JFREECHART_CLASS) $(JCOMMON_CLASS) $(LIBALTOS) $(JAVA_ICONS
)
jar cfm $@ Manifest-fat.txt \
$(ICONJAR) \
-C classes altosui \
jar cfm $@ Manifest-fat.txt \
$(ICONJAR) \
-C classes altosui \
- -C libaltos libaltosJNI
+ -C
../
libaltos libaltosJNI
Manifest.txt: Makefile
echo 'Main-Class: altosui.AltosUI' > $@
Manifest.txt: Makefile
echo 'Main-Class: altosui.AltosUI' > $@
- echo "Class-Path:
AltosLib.jar $(FREETTS)/freetts.jar $(JFREECHART)/jfreechart.jar $(JCOMMON)/jcommon
.jar" >> $@
+ echo "Class-Path:
$(ALTOSLIB_CLASS) $(ALTOSUILIB_CLASS) $(FREETTS)/freetts.jar $(JCOMMON)/jcommon.jar $(JFREECHART)/jfreechart
.jar" >> $@
Manifest-fat.txt:
echo 'Main-Class: altosui.AltosUI' > $@
Manifest-fat.txt:
echo 'Main-Class: altosui.AltosUI' > $@
- echo "Class-Path:
AltosLib.jar freetts.jar jfreechart.jar jcommon
.jar" >> $@
+ echo "Class-Path:
$(ALTOSLIB_CLASS) $(ALTOSUILIB_CLASS) freetts.jar jcommon.jar jfreechart
.jar" >> $@
altosui: Makefile
echo "#!/bin/sh" > $@
altosui: Makefile
echo "#!/bin/sh" > $@
- echo 'exec java
-cp "$(FREETTS)/*:$(JFREECHART)/*:$(JCOMMON)/*"
-Djava.library.path="$(altoslibdir)" -jar "$(altosuidir)/altosui.jar" "$$@"' >> $@
+ echo 'exec java -Djava.library.path="$(altoslibdir)" -jar "$(altosuidir)/altosui.jar" "$$@"' >> $@
chmod +x $@
altosui-test: Makefile
echo "#!/bin/sh" > $@
chmod +x $@
altosui-test: Makefile
echo "#!/bin/sh" > $@
- echo 'exec java -
cp "./*:$(FREETTS)/*:$(JFREECHART)/*:$(JCOMMON)/*" -Djava.library.path="
libaltos/.libs" -jar altosui.jar "$$@"' >> $@
+ echo 'exec java -
Djava.library.path="../
libaltos/.libs" -jar altosui.jar "$$@"' >> $@
chmod +x $@
altosui-jdb: Makefile
echo "#!/bin/sh" > $@
chmod +x $@
altosui-jdb: Makefile
echo "#!/bin/sh" > $@
- echo 'exec jdb -classpath "classes:
libaltos:$(FREETTS)/*:$(JFREECHART)/*:$(JCOMMON)/*" -Djava.library.path="
libaltos/.libs" altosui/AltosUI "$$@"' >> $@
+ 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
-rm -f "$@"
chmod +x $@
libaltos.so: build-libaltos
-rm -f "$@"
- $(LN_S) libaltos/.libs/"$@" .
+ $(LN_S)
../
libaltos/.libs/"$@" .
libaltos.dylib:
-rm -f "$@"
libaltos.dylib:
-rm -f "$@"
- $(LN_S) libaltos/"$@" .
+ $(LN_S)
../
libaltos/"$@" .
-altos.dll: libaltos/altos.dll
+altos.dll:
../
libaltos/altos.dll
-rm -f "$@"
-rm -f "$@"
- $(LN_S) libaltos/"$@" .
+ $(LN_S)
../
libaltos/"$@" .
-altos64.dll: libaltos/altos64.dll
+altos64.dll:
../
libaltos/altos64.dll
-rm -f "$@"
-rm -f "$@"
- $(LN_S) libaltos/"$@" .
+ $(LN_S)
../
libaltos/"$@" .
-libaltos/.libs/libaltos.so: build-libaltos
+
../
libaltos/.libs/libaltos.so: build-libaltos
-libaltos/altos.dll: build-altos-dll
+
../
libaltos/altos.dll: build-altos-dll
-libaltos/altos64.dll: build-altos64-dll
+
../
libaltos/altos64.dll: build-altos64-dll
build-libaltos:
build-libaltos:
- +cd libaltos && make libaltos.la
+ +cd
../
libaltos && make libaltos.la
build-altos-dll:
build-altos-dll:
- +cd libaltos && make altos.dll
+ +cd
../
libaltos && make altos.dll
build-altos64-dll:
build-altos64-dll:
- +cd libaltos && make altos64.dll
+ +cd
../
libaltos && make altos64.dll
$(ALTOSLIB_CLASS):
-rm -f "$@"
$(LN_S) ../altoslib/"$@" .
$(ALTOSLIB_CLASS):
-rm -f "$@"
$(LN_S) ../altoslib/"$@" .
+$(ALTOSUILIB_CLASS):
+ -rm -f "$@"
+ $(LN_S) ../altosuilib/"$@" .
+
$(FREETTS_CLASS):
-rm -f "$@"
$(LN_S) "$(FREETTS)"/"$@" .
$(FREETTS_CLASS):
-rm -f "$@"
$(LN_S) "$(FREETTS)"/"$@" .
@@
-306,25
+316,25
@@
$(LINUX_DIST): $(LINUX_FILES) $(LINUX_EXTRA)
chmod +x linux/AltOS/altosui
tar cjf $@ -C linux AltOS
chmod +x linux/AltOS/altosui
tar cjf $@ -C linux AltOS
-$(MACOSX_DIST): $(MACOSX_FILES) $(MACOSX_EXTRA)
+$(MACOSX_DIST): $(MACOSX_FILES) $(MACOSX_EXTRA)
Makefile
-rm -f $@
-rm -rf macosx
mkdir macosx
cp -a AltosUI.app macosx/
-rm -f $@
-rm -rf macosx
mkdir macosx
cp -a AltosUI.app macosx/
+ cp -a ReadMe-Mac.rtf macosx/ReadMe.rtf
cp -p Info.plist macosx/AltosUI.app/Contents
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 $(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
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
+ cp -p $(ALTOSUILIB_CLASS) macosx/AltosUI.app/Contents/Resources/Java
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 $(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
-rm -f $@
makensis -Oaltos-windows.log "-XOutFile $@" "-DVERSION=$(VERSION)" altos-windows.nsi
$(WINDOWS_DIST): $(WINDOWS_FILES) altos-windows.nsi
-rm -f $@
makensis -Oaltos-windows.log "-XOutFile $@" "-DVERSION=$(VERSION)" altos-windows.nsi
-publish:
- scp launch-sites.txt gag.com:public_html
\ No newline at end of file