micropeak: Construct linux install script

Uses the same script as altosui, just edits the final path name

Signed-off-by: Keith Packard <keithp@keithp.com>

3 files changed, 34 insertions, 4 deletions

diff --git a/micropeak/.gitignore b/micropeak/.gitignore
index 6a6475f0..f9a61359 100644
--- a/micropeak/.gitignore
+++ b/micropeak/.gitignore
@@ -11,6 +11,7 @@ micropeak-windows.nsi
 MicroPeak-Linux-*
 MicroPeak-Mac-*
 MicroPeak-Windows-*
+micropeak.desktop
 *.dll
 *.dylib
 *.so
diff --git a/micropeak/Makefile.am b/micropeak/Makefile.am
index 1a614cbd..519fa8cf 100644
--- a/micropeak/Makefile.am
+++ b/micropeak/Makefile.am
@@ -73,6 +73,10 @@ ICONJAR= -C $(ICONDIR) micropeak-16.png \
 
 WINDOWS_ICON=$(ICONDIR)/micro-peak.ico
 
+desktopdir = $(datadir)/applications
+desktop_file = micropeak.desktop
+desktop_DATA = $(desktop_file)
+
 all-local: micropeak-test micropeak-jdb $(JAR)
 
 clean-local:
@@ -84,7 +88,13 @@ clean-local:
 		micropeak micropeak-test micropeak-jdb macosx linux windows micropeak-windows.log \
 		micropeak-windows.nsi
 
+EXTRA_DIST = $(desktop_file).in
+
+$(desktop_file): $(desktop_file).in
+	sed -e 's#%bindir%#@bindir@#' -e 's#%icondir%#$(datadir)/icons/hicolor/scalable/apps#' ${srcdir}/micropeak.desktop.in > $@
+
 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
 
@@ -94,8 +104,8 @@ 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) micropeak.desktop.in ../icon/micropeak.svg
+LINUX_EXTRA=micropeak-fat micropeak.desktop.in
 
 MACOSX_DRIVER_URL=http://www.ftdichip.com/Drivers/VCP/MacOSX/FTDIUSBSerialDriver_v2_2_18.dmg
 MACOSX_DRIVER=FTDIUSBSerialDriver_v2_2_18.dmg
@@ -119,15 +129,20 @@ 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 $< $@
@@ -137,7 +152,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
@@ -230,6 +245,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
diff --git a/micropeak/micropeak.desktop.in b/micropeak/micropeak.desktop.in
new file mode 100644
index 00000000..abdf286f
--- /dev/null
+++ b/micropeak/micropeak.desktop.in
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Type=Application
+Name=MicroPeak
+GenericName=MicroPeak download and analysis
+Comment=View and log data from MicroPeak altimeters
+Icon=%icondir%/micropeak.svg
+Exec=%bindir%/micropeak %f
+Terminal=false
+MimeType=text/plain;
+Categories=Education;Electronics;Science;