X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=micropeak%2FMakefile.am;h=158656068c963d2f7675cb0621eeee9806a96785;hp=d45ecab9371efed3c1b966d219342a388b06e0f6;hb=ec7ceb607f5ba7e1ed5cfd32b7a452a5f364b095;hpb=2120d362cefceba69e75996b6391d9558978c01d

diff --git a/micropeak/Makefile.am b/micropeak/Makefile.am
index d45ecab9..15865606 100644
--- a/micropeak/Makefile.am
+++ b/micropeak/Makefile.am
@@ -1,5 +1,7 @@
 JAVAROOT=classes
-AM_JAVACFLAGS=-encoding UTF-8 -Xlint:deprecation
+AM_JAVACFLAGS=-target 1.6 -encoding UTF-8 -Xlint:deprecation -Xlint:unchecked -source 6
+
+man_MANS=micropeak.1
 
 altoslibdir=$(libdir)/altos
 
@@ -21,6 +23,7 @@ micropeak_JAVA= \
 	MicroRaw.java \
 	MicroSave.java \
 	MicroSerial.java \
+	MicroSerialLog.java \
 	MicroStats.java \
 	MicroStatsTable.java \
 	MicroFileChooser.java \
@@ -53,22 +56,42 @@ ALTOSUILIB_CLASS=\
 ICONDIR=$(top_srcdir)/icon
 
 JAVA_ICONS=\
-	$(ICONDIR)/micropeak-16.png \
-	$(ICONDIR)/micropeak-32.png \
-	$(ICONDIR)/micropeak-48.png \
-	$(ICONDIR)/micropeak-64.png \
-	$(ICONDIR)/micropeak-128.png \
-	$(ICONDIR)/micropeak-256.png
+	$(ICONDIR)/altusmetrum-micropeak-16.png \
+	$(ICONDIR)/altusmetrum-micropeak-32.png \
+	$(ICONDIR)/altusmetrum-micropeak-48.png \
+	$(ICONDIR)/altusmetrum-micropeak-64.png \
+	$(ICONDIR)/altusmetrum-micropeak-128.png\
+	$(ICONDIR)/altusmetrum-micropeak-256.png
 
 # icon base names for jar
-ICONJAR= -C $(ICONDIR) micropeak-16.png \
-	-C $(ICONDIR) micropeak-32.png \
-	-C $(ICONDIR) micropeak-48.png \
-	-C $(ICONDIR) micropeak-64.png \
-	-C $(ICONDIR) micropeak-128.png \
-	-C $(ICONDIR) micropeak-256.png
-
-WINDOWS_ICON=$(ICONDIR)/micro-peak.ico
+ICONJAR= \
+	-C $(ICONDIR) altusmetrum-micropeak-16.png \
+	-C $(ICONDIR) altusmetrum-micropeak-32.png \
+	-C $(ICONDIR) altusmetrum-micropeak-48.png \
+	-C $(ICONDIR) altusmetrum-micropeak-64.png \
+	-C $(ICONDIR) altusmetrum-micropeak-128.png\
+	-C $(ICONDIR) altusmetrum-micropeak-256.png
+
+WINDOWS_ICONS	=\
+	../icon/altusmetrum-micropeak.ico \
+	../icon/altusmetrum-micropeak.exe
+	../icon/application-vnd.altusmetrum.micropeak.ico \
+	../icon/application-vnd.altusmetrum.micropeak.ico
+
+MACOSX_ICONS	=\
+	../icon/altusmetrum-micropeak.icns \
+	../icon/application-vnd.altusmetrum.micropeak.icns
+
+LINUX_ICONS	=\
+	$(ICONDIR)/altusmetrum-micropeak.svg \
+	$(ICONDIR)/application-vnd.altusmetrum.micropeak.svg
+
+LINUX_MIMETYPE	=\
+	$(ICONDIR)/org-altusmetrum-mimetypes.xml
+
+desktopdir = $(datadir)/applications
+desktop_file = altusmetrum-micropeak.desktop
+desktop_SCRIPTS = $(desktop_file)
 
 all-local: micropeak-test micropeak-jdb $(JAR)
 
@@ -78,9 +101,17 @@ clean-local:
 		$(ALTOSLIB_CLASS) \
 		$(ALTOSUILIB_CLASS) \
 		$(JFREECHART_CLASS) $(JCOMMON_CLASS) $(LIBALTOS) Manifest.txt Manifest-fat.txt \
-		micropeak micropeak-test micropeak-jdb macosx linux windows micropeak-windows.log
+		micropeak micropeak-test micropeak-jdb macosx linux windows micropeak-windows.log \
+		micropeak-windows.nsi *.desktop
+
+EXTRA_DIST = $(desktop_file).in
+
+$(desktop_file): $(desktop_file).in
+	sed -e 's#%bindir%#@bindir@#' -e 's#%icondir%#$(datadir)/icons/hicolor/scalable/apps#' ${srcdir}/$(desktop_file).in > $@
+	chmod +x $@
 
 LINUX_DIST=MicroPeak-Linux-$(VERSION).tar.bz2
+LINUX_SH=MicroPeak-Linux-$(VERSION).sh
 MACOSX_DIST=MicroPeak-Mac-$(VERSION).dmg
 WINDOWS_DIST=MicroPeak-Windows-$(VERSION_DASH).exe
 
@@ -90,14 +121,14 @@ DOC=$(MICROPEAK_DOC)
 
 FAT_FILES=$(FATJAR) $(ALTOSLIB_CLASS) $(ALTOSUILIB_CLASS) $(FREETTS_CLASS) $(JFREECHART_CLASS) $(JCOMMON_CLASS)
 
-LINUX_FILES=$(FAT_FILES) libaltos.so $(FIRMWARE) $(DOC)
-LINUX_EXTRA=micropeak-fat
+LINUX_FILES=$(FAT_FILES) libaltos.so $(FIRMWARE) $(DOC) $(desktop_file).in $(LINUX_ICONS) $(LINUX_MIMETYPE)
+LINUX_EXTRA=micropeak-fat $(desktop_file).in
 
 MACOSX_DRIVER_URL=http://www.ftdichip.com/Drivers/VCP/MacOSX/FTDIUSBSerialDriver_v2_2_18.dmg
 MACOSX_DRIVER=FTDIUSBSerialDriver_v2_2_18.dmg
 MACOSX_INFO_PLIST=Info.plist
 MACOSX_README=ReadMe-Mac.rtf
-MACOSX_FILES=$(FAT_FILES) libaltos.dylib $(MACOSX_INFO_PLIST) $(MACOSX_DRIVER) $(MACOSX_README) $(DOC)
+MACOSX_FILES=$(FAT_FILES) libaltos.dylib $(MACOSX_INFO_PLIST) $(MACOSX_DRIVER) $(MACOSX_README) $(DOC) $(MACOSX_ICONS)
 
 $(MACOSX_DRIVER):
 	wget $(MACOSX_DRIVER_URL)
@@ -108,22 +139,27 @@ WINDOWS_DRIVER=CDM20824_Setup.exe
 $(WINDOWS_DRIVER):
 	wget $(WINDOWS_DRIVER_URL)
 
-WINDOWS_FILES=$(FAT_FILES) altos.dll altos64.dll $(DOC) $(WINDOWS_ICON) $(WINDOWS_DRIVER)
+WINDOWS_FILES=$(FAT_FILES) altos.dll altos64.dll $(DOC) $(WINDOWS_ICONS) $(WINDOWS_DRIVER)
 
 if FATINSTALL
 
 FATTARGET=$(FATDIR)/$(VERSION)
 
 LINUX_DIST_TARGET=$(FATTARGET)/$(LINUX_DIST)
+LINUX_SH_TARGET=$(FATTARGET)/$(LINUX_SH)
 MACOSX_DIST_TARGET=$(FATTARGET)/$(MACOSX_DIST)
 WINDOWS_DIST_TARGET=$(FATTARGET)/$(WINDOWS_DIST)
 
-fat: $(LINUX_DIST_TARGET) $(MACOSX_DIST_TARGET) $(WINDOWS_DIST_TARGET)
+fat: $(LINUX_DIST_TARGET) $(LINUX_SH_TARGET) $(MACOSX_DIST_TARGET) $(WINDOWS_DIST_TARGET)
 
 $(LINUX_DIST_TARGET): $(LINUX_DIST)
 	mkdir -p $(FATTARGET)
 	cp -p $< $@
 
+$(LINUX_SH_TARGET): $(LINUX_SH)
+	mkdir -p $(FATTARGET)
+	cp -p $< $@
+
 $(MACOSX_DIST_TARGET): $(MACOSX_DIST)
 	mkdir -p $(FATTARGET)
 	cp -p $< $@
@@ -133,7 +169,7 @@ $(WINDOWS_DIST_TARGET): $(WINDOWS_DIST)
 	cp -p $< $@
 
 else
-fat: $(LINUX_DIST) $(MACOSX_DIST) $(WINDOWS_DIST)
+fat: $(LINUX_DIST) $(LINUX_SH) $(MACOSX_DIST) $(WINDOWS_DIST)
 endif
 
 micropeak: Makefile
@@ -226,6 +262,10 @@ $(LINUX_DIST): $(LINUX_FILES) $(LINUX_EXTRA)
 	chmod +x linux/MicroPeak/micropeak
 	tar cjf $@ -C linux MicroPeak
 
+$(LINUX_SH): $(LINUX_DIST) $(srcdir)/../altosui/linux-install.sh
+	sed 's/AltOS/MicroPeak/g' $(srcdir)/../altosui/linux-install.sh | cat - $(LINUX_DIST) > $@
+	chmod +x $@
+
 $(MACOSX_DIST): $(MACOSX_FILES)
 	-rm -f $@
 	-rm -rf macosx
@@ -236,6 +276,7 @@ $(MACOSX_DIST): $(MACOSX_FILES)
 	cp -p Info.plist macosx/MicroPeak.app/Contents
 	cp -p $(MACOSX_DRIVER) macosx
 	mkdir -p macosx/MicroPeak.app/Contents/Resources/Java
+	cp -p $(MACOSX_ICONS) macosx/MicroPeak.app/Contents/Resources
 	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
@@ -246,7 +287,7 @@ $(MACOSX_DIST): $(MACOSX_FILES)
 
 $(WINDOWS_DIST): $(WINDOWS_FILES) micropeak-windows.nsi
 	-rm -f $@
-	makensis -Omicropeak-windows.log "-XOutFile $@" "-DVERSION=$(VERSION)" micropeak-windows.nsi
+	makensis -Omicropeak-windows.log "-XOutFile $@" "-DVERSION=$(VERSION)" micropeak-windows.nsi || (cat micropeak-windows.log && exit 1)
 
 Manifest.txt: Makefile
 	echo 'Main-Class: org.altusmetrum.micropeak.MicroPeak' > $@