projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altosui: Remove AltosVersion.java
[fw/altos]
/
altosui
/
Makefile.am
diff --git
a/altosui/Makefile.am
b/altosui/Makefile.am
index ca5d2b3519f1381dee5425cb44a05ff3bba3558a..b3aa1f558f7803b55d69e91aa3b2dbe1451794b1 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:
:$(JFREECHART)/jfreechart.jar:$(FREETTS)/freetts.jar"
+CLASSPATH_ENV=mkdir -p $(JAVAROOT); CLASSPATH=".
/*:$(JAVAROOT):../libaltos:$(JCOMMON)/jcommon.jar
:$(JFREECHART)/jfreechart.jar:$(FREETTS)/freetts.jar"
bin_SCRIPTS=altosui
bin_SCRIPTS=altosui
@@
-24,6
+24,7
@@
altosui_JAVA = \
AltosConfig.java \
AltosConfigFreqUI.java \
AltosConfigUI.java \
AltosConfig.java \
AltosConfigFreqUI.java \
AltosConfigUI.java \
+ AltosConfigPyroUI.java \
AltosConfigureUI.java \
AltosConfigTD.java \
AltosConfigTDUI.java \
AltosConfigureUI.java \
AltosConfigTD.java \
AltosConfigTDUI.java \
@@
-65,6
+66,7
@@
altosui_JAVA = \
AltosLights.java \
AltosPad.java \
AltosUIPreferences.java \
AltosLights.java \
AltosPad.java \
AltosUIPreferences.java \
+ AltosUIPreferencesBackend.java \
AltosRomconfig.java \
AltosRomconfigUI.java \
AltosScanUI.java \
AltosRomconfig.java \
AltosRomconfigUI.java \
AltosScanUI.java \
@@
-85,7
+87,6
@@
altosui_JAVA = \
AltosGraphTime.java \
AltosGraphUI.java \
AltosDataChooser.java \
AltosGraphTime.java \
AltosGraphUI.java \
AltosDataChooser.java \
- AltosVersion.java \
AltosVoice.java \
$(altosui_BT)
AltosVoice.java \
$(altosui_BT)
@@
-107,26
+108,40
@@
FREETTS_CLASS= \
ALTOSLIB_CLASS=\
AltosLib.jar
ALTOSLIB_CLASS=\
AltosLib.jar
+ALTOSUILIB_CLASS=\
+ altosuilib.jar
+
LIBALTOS= \
libaltos.so \
libaltos.dylib \
altos.dll
LIBALTOS= \
libaltos.so \
libaltos.dylib \
altos.dll
-JAR=
AltosUI
.jar
+JAR=
altosui
.jar
-FATJAR=
AltosUI
-fat.jar
+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
@@
-159,7
+174,7
@@
LINUX_DIST=Altos-Linux-$(VERSION).tar.bz2
MACOSX_DIST=Altos-Mac-$(VERSION).zip
WINDOWS_DIST=Altos-Windows-$(VERSION_DASH).exe
MACOSX_DIST=Altos-Mac-$(VERSION).zip
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
LINUX_FILES=$(FAT_FILES) libaltos.so $(FIRMWARE) $(DOC)
LINUX_EXTRA=altosui-fat
@@
-170,11
+185,11
@@
MACOSX_EXTRA=$(FIRMWARE)
WINDOWS_FILES=$(FAT_FILES) altos.dll altos64.dll $(top_srcdir)/telemetrum.inf $(WINDOWS_ICON)
WINDOWS_FILES=$(FAT_FILES) altos.dll altos64.dll $(top_srcdir)/telemetrum.inf $(WINDOWS_ICON)
-all-local: classes/
AltosUI
$(JAR) altosui altosui-test altosui-jdb
+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) \
+ $(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 \
altosui altosui-test altosui-jdb macosx linux
$(JFREECHART_CLASS) $(JCOMMON_CLASS) $(LIBALTOS) Manifest.txt Manifest-fat.txt altos-windows.log \
altosui altosui-test altosui-jdb macosx linux
@@
-207,84
+222,88
@@
endif
altosuidir=$(datadir)/java
altosuidir=$(datadir)/java
-install-altosuiJAVA:
AltosUI
.jar
+install-altosuiJAVA:
altosui
.jar
@$(NORMAL_INSTALL)
test -z "$(altosuidir)" || $(MKDIR_P) "$(DESTDIR)$(altosuidir)"
@$(NORMAL_INSTALL)
test -z "$(altosuidir)" || $(MKDIR_P) "$(DESTDIR)$(altosuidir)"
- echo " $(INSTALL_DATA)" "$<" "'$(DESTDIR)$(altosuidir)/
AltosUI
.jar'"; \
+ echo " $(INSTALL_DATA)" "$<" "'$(DESTDIR)$(altosuidir)/
altosui
.jar'"; \
$(INSTALL_DATA) "$<" "$(DESTDIR)$(altosuidir)"
$(INSTALL_DATA) "$<" "$(DESTDIR)$(altosuidir)"
-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) \
jar cfm $@ Manifest.txt \
$(ICONJAR) \
- -C classes
AltosUI
\
- -C libaltos libaltosJNI
+ -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) $(
ALTOSUILIB_CLASS) $(FREETTS_CLASS) $(JFREECHART_CLASS) $(JCOMMON_CLASS) $(LIBALTOS) $(JAVA_ICONS
)
jar cfm $@ Manifest-fat.txt \
$(ICONJAR) \
jar cfm $@ Manifest-fat.txt \
$(ICONJAR) \
- -C classes
AltosUI
\
- -C libaltos libaltosJNI
+ -C classes
altosui
\
+ -C
../
libaltos libaltosJNI
Manifest.txt: Makefile
Manifest.txt: Makefile
- echo 'Main-Class:
AltosUI
.AltosUI' > $@
- echo "Class-Path:
AltosLib.jar $(FREETTS)/freetts.jar $(JFREECHART)/jfreechart.jar $(JCOMMON)/jcommon
.jar" >> $@
+ echo 'Main-Class:
altosui
.AltosUI' > $@
+ echo "Class-Path:
$(ALTOSLIB_CLASS) $(ALTOSUILIB_CLASS) $(FREETTS)/freetts.jar $(JCOMMON)/jcommon.jar $(JFREECHART)/jfreechart
.jar" >> $@
Manifest-fat.txt:
Manifest-fat.txt:
- echo 'Main-Class:
AltosUI
.AltosUI' > $@
- echo "Class-Path:
AltosLib.jar freetts.jar jfreechart.jar jcommon
.jar" >> $@
+ echo 'Main-Class:
altosui
.AltosUI' > $@
+ 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)"/"$@" .
@@
-316,6
+335,7
@@
$(MACOSX_DIST): $(MACOSX_FILES) $(MACOSX_EXTRA)
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
@@
-326,5
+346,3
@@
$(WINDOWS_DIST): $(WINDOWS_FILES) altos-windows.nsi
-rm -f $@
makensis -Oaltos-windows.log "-XOutFile $@" "-DVERSION=$(VERSION)" 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