altosui,micropeak: Link altoslib.jar and altosuilib.jar before compiling

[fw/altos] / micropeak / Makefile.am

diff --git a/micropeak/Makefile.am b/micropeak/Makefile.am
index 26431bd55db49bcf93738c9b5f644576df1b130a..4a7aaaa1de0d85ab13d98a4056aebc8d8b6d00c8 100644 (file)
--- a/micropeak/Makefile.am
+++ b/micropeak/Makefile.am
@@ -1,6 +1,8 @@
 JAVAROOT=classes
 AM_JAVACFLAGS=-encoding UTF-8 -Xlint:deprecation
 
+altoslibdir=$(libdir)/altos
+
 CLASSPATH_ENV=mkdir -p $(JAVAROOT); CLASSPATH=".:classes:../altoslib/*:../altosuilib/*:../libaltos:$(JCOMMON)/jcommon.jar:$(JFREECHART)/jfreechart.jar"
 
 bin_SCRIPTS=micropeak
@@ -12,8 +14,11 @@ micropeak_JAVA= \
        MicroData.java \
        MicroDataPoint.java \
        MicroDownload.java \
+       MicroExport.java \
+       MicroFile.java \
        MicroFrame.java \
        MicroGraph.java \
+       MicroRaw.java \
        MicroSave.java \
        MicroSerial.java \
        MicroStats.java \
@@ -42,7 +47,7 @@ ALTOSLIB_CLASS=\
        AltosLib.jar
 
 ALTOSUILIB_CLASS=\
-       AltosUILib.jar
+       altosuilib.jar
 
 # Icons
 ICONDIR=$(top_srcdir)/icon
@@ -65,7 +70,7 @@ ICONJAR= -C $(ICONDIR) micropeak-16.png \
 
 WINDOWS_ICON=$(ICONDIR)/micro-peak.ico
 
-all-local: micropeak-test $(JAR)
+all-local: micropeak-test micropeak-jdb $(JAR)
 
 clean-local:
        -rm -rf classes $(JAR) $(FATJAR) \
@@ -76,7 +81,7 @@ clean-local:
                micropeak micropeak-test macosx linux windows
 
 LINUX_DIST=MicroPeak-Linux-$(VERSION).tar.bz2
-MACOSX_DIST=MicroPeak-Mac-$(VERSION).zip
+MACOSX_DIST=MicroPeak-Mac-$(VERSION).dmg
 WINDOWS_DIST=MicroPeak-Windows-$(VERSION_DASH).exe
 
 FAT_FILES=$(FATJAR) $(ALTOSLIB_CLASS) $(ALTOSUILIB_CLASS) $(FREETTS_CLASS) $(JFREECHART_CLASS) $(JCOMMON_CLASS)
@@ -85,7 +90,9 @@ LINUX_FILES=$(FAT_FILES) libaltos.so $(FIRMWARE) $(DOC)
 LINUX_EXTRA=micropeak-fat
 
 MACOSX_INFO_PLIST=Info.plist
-MACOSX_FILES=$(FAT_FILES) libaltos.dylib $(MACOSX_INFO_PLIST)
+MACOSX_DRIVER=FTDI.tar.gz
+MACOSX_README=ReadMe-Mac.rtf
+MACOSX_FILES=$(FAT_FILES) libaltos.dylib $(MACOSX_INFO_PLIST) $(MACOSX_DRIVER) $(MACOSX_README)
 
 WINDOWS_FILES=$(FAT_FILES) altos.dll altos64.dll $(top_srcdir)/telemetrum.inf $(WINDOWS_ICON)
 
@@ -117,7 +124,12 @@ endif
 
 micropeak: Makefile
        echo "#!/bin/sh" > $@
-       echo 'exec java  -cp "$(JCOMMON)/jcommon.jar:$(JFREECHART)/jfreechart.jar" -Djava.library.path="$(altoslibdir)" -jar "$(micropeakdir)/micropeak.jar" "$$@"' >> $@
+       echo 'exec java  -Djava.library.path="$(altoslibdir)" -jar "$(micropeakdir)/micropeak.jar" "$$@"' >> $@
+       chmod +x $@
+
+micropeak-jdb: Makefile
+       echo "#!/bin/sh" > $@
+       echo 'exec jdb -classpath "classes:./*:../libaltos:$(JCOMMON)/jcommon.jar:$(JFREECHART)/jfreechart.jar" -Djava.library.path="../libaltos/.libs" org.altusmetrum.micropeak.MicroPeak "$$@"' >> $@
        chmod +x $@
 
 micropeak-test: Makefile
@@ -143,6 +155,8 @@ $(FATJAR): classmicropeak.stamp Manifest-fat.txt $(ALTOSLIB_CLASS) $(ALTOSUILIB_
                -C classes org \
                -C ../libaltos libaltosJNI
 
+classaltosui.stamp: $(ALTOSLIB_CLASS) $(ALTOSUILIB_CLASS)
+
 libaltos.so: build-libaltos
        -rm -f "$@"
        $(LN_S) ../libaltos/.libs/"$@" .
@@ -203,15 +217,17 @@ $(MACOSX_DIST): $(MACOSX_FILES)
        -rm -rf macosx
        mkdir macosx
        cp -a MicroPeak.app macosx/
+       cp -a $(MACOSX_README) macosx/ReadMe.rtf
        cp -p Info.plist macosx/MicroPeak.app/Contents
-       mkdir -p macosx/MicroPeak macosx/MicroPeak.app/Contents/Resources/Java
+       tar xzf $(MACOSX_DRIVER) -C macosx
+       mkdir -p macosx/MicroPeak.app/Contents/Resources/Java
        cp -p $(FATJAR) macosx/MicroPeak.app/Contents/Resources/Java/micropeak.jar
        cp -p libaltos.dylib macosx/MicroPeak.app/Contents/Resources/Java
        cp -p $(ALTOSLIB_CLASS) macosx/MicroPeak.app/Contents/Resources/Java
        cp -p $(ALTOSUILIB_CLASS) macosx/MicroPeak.app/Contents/Resources/Java
        cp -p $(JFREECHART_CLASS) macosx/MicroPeak.app/Contents/Resources/Java
        cp -p $(JCOMMON_CLASS) macosx/MicroPeak.app/Contents/Resources/Java
-       cd macosx && zip -r ../$@ MicroPeak.app MicroPeak
+       genisoimage -D -V MicroPeak-$(VERSION) -no-pad -r -apple -o $@ macosx
 
 $(WINDOWS_DIST): $(WINDOWS_FILES) micropeak-windows.nsi
        -rm -f $@
@@ -219,9 +235,9 @@ $(WINDOWS_DIST): $(WINDOWS_FILES) micropeak-windows.nsi
 
 Manifest.txt: Makefile
        echo 'Main-Class: org.altusmetrum.micropeak.MicroPeak' > $@
-       echo "Class-Path: AltosLib.jar AltosUILib.jar $(JCOMMON)/jcommon.jar $(JFREECHART)/jfreechart.jar" >> $@
+       echo "Class-Path: $(ALTOSLIB_CLASS) $(ALTOSUILIB_CLASS) $(JCOMMON)/jcommon.jar $(JFREECHART)/jfreechart.jar" >> $@
 
 Manifest-fat.txt:
        echo 'Main-Class: org.altusmetrum.micropeak.MicroPeak' > $@
-       echo "Class-Path: AltosLib.jar AltosUILib.jar jcommon.jar jfreechart.jar" >> $@
+       echo "Class-Path: $(ALTOSLIB_CLASS) $(ALTOSUILIB_CLASS) jcommon.jar jfreechart.jar" >> $@