summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2013-01-05 10:38:20 -0800
committerKeith Packard <keithp@keithp.com>2013-01-05 10:38:20 -0800
commit0c9eecfae02e8499e7c3d53a4386f026c54b04cd (patch)
treea56ce23d9108f686eed33a305a9c5f2aece31bc3
parent20d54cae1eeca6c5d05bfacbafd77c8aa72247c9 (diff)
micropeak: Create .dmg file for apple. Create micropeak-jdb script
Signed-off-by: Keith Packard <keithp@keithp.com>
-rw-r--r--micropeak/Makefile.am13
1 files changed, 9 insertions, 4 deletions
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 $@