From: Keith Packard <keithp@keithp.com>
Date: Sat, 5 Jan 2013 18:38:20 +0000 (-0800)
Subject: micropeak: Create .dmg file for apple. Create micropeak-jdb script
X-Git-Tag: 1.1.9.3~8^2~9^2~4
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=0c9eecfae02e8499e7c3d53a4386f026c54b04cd

micropeak: Create .dmg file for apple. Create micropeak-jdb script

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

diff --git a/micropeak/Makefile.am b/micropeak/Makefile.am
index c452db97..ea7385a7 100644
--- a/micropeak/Makefile.am
+++ b/micropeak/Makefile.am
@@ -67,7 +67,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) \
@@ -78,7 +78,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)
@@ -122,6 +122,11 @@ micropeak: Makefile
 	echo 'exec java  -cp "$(JCOMMON)/jcommon.jar:$(JFREECHART)/jfreechart.jar" -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
 	echo "#!/bin/sh" > $@
 	echo 'exec java -cp "./*:../libaltos/*:$(JCOMMON)/jcommon.jar:$(JFREECHART)/jfreechart.jar" -Djava.library.path="../libaltos/.libs" -jar micropeak.jar "$$@"' >> $@
@@ -206,14 +211,14 @@ $(MACOSX_DIST): $(MACOSX_FILES)
 	mkdir macosx
 	cp -a MicroPeak.app macosx/
 	cp -p Info.plist macosx/MicroPeak.app/Contents
-	mkdir -p macosx/MicroPeak macosx/MicroPeak.app/Contents/Resources/Java
+	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 $@