projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altosui/altoslib: add methods to interface, fix imports/exceptions in BT code
[fw/altos]
/
altosui
/
Makefile.am
diff --git
a/altosui/Makefile.am
b/altosui/Makefile.am
index cfe453022f5082b028497ab2d36e92e0dd62a5a1..6010df58544cf5c608b58afbafc417828788907a 100644
(file)
--- a/
altosui/Makefile.am
+++ b/
altosui/Makefile.am
@@
-1,4
+1,4
@@
-SUBDIRS=libaltos
altoslib
+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/bin:libaltos:$(FREETTS)/*:/usr/share/java/*
"
+CLASSPATH_ENV=mkdir -p $(JAVAROOT); CLASSPATH=".:classes:
../altoslib/*:libaltos:$(JCOMMON)/jcommon.jar:$(JFREECHART)/jfreechart.jar:$(FREETTS)/freetts.jar
"
bin_SCRIPTS=altosui
bin_SCRIPTS=altosui
@@
-22,14
+22,11
@@
altosui_JAVA = \
AltosChannelMenu.java \
AltosCompanionInfo.java \
AltosConfig.java \
AltosChannelMenu.java \
AltosCompanionInfo.java \
AltosConfig.java \
- AltosConfigData.java \
AltosConfigFreqUI.java \
AltosConfigUI.java \
AltosConfigureUI.java \
AltosConfigTD.java \
AltosConfigTDUI.java \
AltosConfigFreqUI.java \
AltosConfigUI.java \
AltosConfigureUI.java \
AltosConfigTD.java \
AltosConfigTDUI.java \
- AltosConvert.java \
- AltosCRCException.java \
AltosCSV.java \
AltosCSVUI.java \
AltosDebug.java \
AltosCSV.java \
AltosCSVUI.java \
AltosDebug.java \
@@
-38,28
+35,16
@@
altosui_JAVA = \
AltosDevice.java \
AltosUSBDevice.java \
AltosDisplayThread.java \
AltosDevice.java \
AltosUSBDevice.java \
AltosDisplayThread.java \
- AltosEepromChunk.java \
AltosEepromDelete.java \
AltosEepromDownload.java \
AltosEepromList.java \
AltosEepromDelete.java \
AltosEepromDownload.java \
AltosEepromList.java \
- AltosEepromLog.java \
AltosEepromManage.java \
AltosEepromMonitor.java \
AltosEepromManage.java \
AltosEepromMonitor.java \
- AltosEepromIterable.java \
- AltosEepromRecord.java \
- AltosEepromTeleScience.java \
- AltosEepromMega.java \
- AltosEepromMegaIterable.java \
- AltosMs5607.java \
- AltosIMU.java \
- AltosMag.java \
AltosEepromSelect.java \
AltosEepromSelect.java \
- AltosFile.java \
AltosFlash.java \
AltosFlashUI.java \
AltosFlightDisplay.java \
AltosFlightInfoTableModel.java \
AltosFlash.java \
AltosFlashUI.java \
AltosFlightDisplay.java \
AltosFlightInfoTableModel.java \
- AltosFlightReader.java \
AltosFlightStats.java \
AltosFlightStatsTable.java \
AltosFlightStatus.java \
AltosFlightStats.java \
AltosFlightStatsTable.java \
AltosFlightStatus.java \
@@
-67,11
+52,9
@@
altosui_JAVA = \
AltosFlightUI.java \
AltosFontListener.java \
AltosFreqList.java \
AltosFlightUI.java \
AltosFontListener.java \
AltosFreqList.java \
- AltosGreatCircle.java \
AltosHexfile.java \
Altos.java \
AltosIdleMonitorUI.java \
AltosHexfile.java \
Altos.java \
AltosIdleMonitorUI.java \
- AltosIgnite.java \
AltosIgniteUI.java \
AltosLaunch.java \
AltosLaunchUI.java \
AltosIgniteUI.java \
AltosLaunch.java \
AltosLaunchUI.java \
@@
-80,24
+63,17
@@
altosui_JAVA = \
AltosLanded.java \
AltosLed.java \
AltosLights.java \
AltosLanded.java \
AltosLed.java \
AltosLights.java \
- AltosLog.java \
AltosPad.java \
AltosUIPreferences.java \
AltosPad.java \
AltosUIPreferences.java \
- AltosReader.java \
- AltosTelemetryReader.java \
- AltosReplayReader.java \
AltosRomconfig.java \
AltosRomconfigUI.java \
AltosScanUI.java \
AltosSerial.java \
AltosSerialInUseException.java \
AltosRomconfig.java \
AltosRomconfigUI.java \
AltosScanUI.java \
AltosSerial.java \
AltosSerialInUseException.java \
- AltosSerialMonitor.java \
AltosSiteMap.java \
AltosSiteMapPreload.java \
AltosSiteMapCache.java \
AltosSiteMapTile.java \
AltosSiteMap.java \
AltosSiteMapPreload.java \
AltosSiteMapCache.java \
AltosSiteMapTile.java \
- AltosState.java \
- AltosTelemetryReader.java \
AltosUI.java \
AltosUIListener.java \
AltosFrame.java \
AltosUI.java \
AltosUIListener.java \
AltosFrame.java \
@@
-143,14
+119,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
@@
-174,7
+161,7
@@
FIRMWARE=$(FIRMWARE_TM) $(FIRMWARE_TELEMINI) $(FIRMWARE_TD)
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
+TEMPLATE_DOC=$(top_srcdir)/doc/telemetrum-outline.pdf
$(top_srcdir)/doc/megametrum-outline.pdf
DOC=$(ALTUSMETRUM_DOC) $(ALTOS_DOC) $(TELEMETRY_DOC) $(TEMPLATE_DOC)
DOC=$(ALTUSMETRUM_DOC) $(ALTOS_DOC) $(TELEMETRY_DOC) $(TEMPLATE_DOC)
@@
-188,7
+175,8
@@
FAT_FILES=$(FATJAR) $(ALTOSLIB_CLASS) $(FREETTS_CLASS) $(JFREECHART_CLASS) $(JCO
LINUX_FILES=$(FAT_FILES) libaltos.so $(FIRMWARE) $(DOC)
LINUX_EXTRA=altosui-fat
LINUX_FILES=$(FAT_FILES) libaltos.so $(FIRMWARE) $(DOC)
LINUX_EXTRA=altosui-fat
-MACOSX_FILES=$(FAT_FILES) libaltos.dylib
+MACOSX_INFO_PLIST=Info.plist
+MACOSX_FILES=$(FAT_FILES) libaltos.dylib $(MACOSX_INFO_PLIST)
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)
@@
-239,13
+227,13
@@
install-altosuiJAVA: altosui.jar
classes/altosui:
mkdir -p classes/altosui
classes/altosui:
mkdir -p classes/altosui
-$(JAR): classaltosui.stamp Manifest.txt $(JAVA_ICON) $(ALTOSLIB_CLASS)
+$(JAR): classaltosui.stamp Manifest.txt $(JAVA_ICON
S
) $(ALTOSLIB_CLASS)
jar cfm $@ Manifest.txt \
$(ICONJAR) \
-C classes altosui \
-C libaltos libaltosJNI
jar cfm $@ Manifest.txt \
$(ICONJAR) \
-C classes altosui \
-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) $(FREETTS_CLASS) $(JFREECHART_CLASS) $(JCOMMON_CLASS) $(LIBALTOS) $(JAVA_ICON
S
)
jar cfm $@ Manifest-fat.txt \
$(ICONJAR) \
-C classes altosui \
jar cfm $@ Manifest-fat.txt \
$(ICONJAR) \
-C classes altosui \
@@
-253,28
+241,28
@@
$(FATJAR): classaltosui.stamp Manifest-fat.txt $(ALTOSLIB_CLASS) $(FREETTS_CLASS
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.jar $(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.jar 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 -cp "$(FREETTS)/
freetts.jar:$(JCOMMON)/jcommon.jar:$(JFREECHART)/jfreechart.jar
" -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 "
:altoslib/*:$(FREETTS)/*:$(JFREECHART)/*:$(JCOMMON)/*
" -Djava.library.path="libaltos/.libs" -jar altosui.jar "$$@"' >> $@
+ echo 'exec java -cp "
./*:$(FREETTS)/freetts.jar:$(JCOMMON)/jcommon.jar:$(JFREECHART)/jfreechart.jar
" -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 $@
chmod +x $@
-libaltos.so:
+libaltos.so:
build-libaltos
-rm -f "$@"
$(LN_S) libaltos/.libs/"$@" .
-rm -f "$@"
$(LN_S) libaltos/.libs/"$@" .
@@
-290,10
+278,14
@@
altos64.dll: libaltos/altos64.dll
-rm -f "$@"
$(LN_S) libaltos/"$@" .
-rm -f "$@"
$(LN_S) libaltos/"$@" .
+libaltos/.libs/libaltos.so: build-libaltos
+
libaltos/altos.dll: build-altos-dll
libaltos/altos64.dll: build-altos64-dll
libaltos/altos.dll: build-altos-dll
libaltos/altos64.dll: build-altos64-dll
+build-libaltos:
+ +cd libaltos && make libaltos.la
build-altos-dll:
+cd libaltos && make altos.dll
build-altos-dll:
+cd libaltos && make altos.dll
@@
-302,7
+294,7
@@
build-altos64-dll:
$(ALTOSLIB_CLASS):
-rm -f "$@"
$(ALTOSLIB_CLASS):
-rm -f "$@"
- $(LN_S) altoslib/"$@" .
+ $(LN_S)
../
altoslib/"$@" .
$(FREETTS_CLASS):
-rm -f "$@"
$(FREETTS_CLASS):
-rm -f "$@"
@@
-330,6
+322,7
@@
$(MACOSX_DIST): $(MACOSX_FILES) $(MACOSX_EXTRA)
-rm -rf macosx
mkdir macosx
cp -a AltosUI.app macosx/
-rm -rf macosx
mkdir macosx
cp -a AltosUI.app macosx/
+ cp -p Info.plist macosx/AltosUI.app/Contents
mkdir -p macosx/AltOS 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
mkdir -p macosx/AltOS 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