From b1a1376f3baf78ceca49b47c7b39d58983f4f984 Mon Sep 17 00:00:00 2001 From: Henrik Brautaset Aronsen Date: Sun, 30 Oct 2011 22:27:33 +0100 Subject: [PATCH] Use the new packaging directory for MacOSX specific files, and provide shell script workaround to make the svg icon reachable. - Make use of the new packaging directory. - Set a current directory for subsurface to find the svg icon. There might be a pretter solution to this. - Somehow subsurface doesn't behave properly in the Dock. Running it in the background without Dock integration until we figure out why. Signed-Off-By: Henrik Brautaset Aronsen --- Makefile | 12 ++++++------ {macosx => packaging/macosx}/Info.plist | 2 +- {macosx => packaging/macosx}/PkgInfo | 0 {macosx => packaging/macosx}/Subsurface.icns | Bin packaging/macosx/subsurface.sh | 5 +++++ 5 files changed, 12 insertions(+), 7 deletions(-) rename {macosx => packaging/macosx}/Info.plist (94%) rename {macosx => packaging/macosx}/PkgInfo (100%) rename {macosx => packaging/macosx}/Subsurface.icns (100%) create mode 100755 packaging/macosx/subsurface.sh diff --git a/Makefile b/Makefile index 3fa77c3..638758c 100644 --- a/Makefile +++ b/Makefile @@ -23,9 +23,7 @@ DESKTOPFILE = $(NAME).desktop MANFILES = $(NAME).1 MACOSXINSTALL = /Applications/Subsurface.app -MACOSXICONFILE = macosx/Subsurface.icns -MACOSXINFOFILE = macosx/Info.plist -MACOSXPKGFILE = macosx/PkgInfo +MACOSXFILES = packaging/macosx # find libdivecomputer # First deal with the cross compile environment. @@ -109,9 +107,11 @@ install-macosx: $(NAME) $(INSTALL) -d -m 755 $(MACOSXINSTALL)/Contents/Resources $(INSTALL) -d -m 755 $(MACOSXINSTALL)/Contents/MacOS $(INSTALL) $(NAME) $(MACOSXINSTALL)/Contents/MacOS/ - $(INSTALL) $(MACOSXINFOFILE) $(MACOSXINSTALL)/Contents/ - $(INSTALL) $(MACOSXPKGFILE) $(MACOSXINSTALL)/Contents/ - $(INSTALL) $(MACOSXICONFILE) $(MACOSXINSTALL)/Contents/Resources/ + $(INSTALL) $(MACOSXFILES)/subsurface.sh $(MACOSXINSTALL)/Contents/MacOS/ + $(INSTALL) $(MACOSXFILES)/PkgInfo $(MACOSXINSTALL)/Contents/ + $(INSTALL) $(MACOSXFILES)/Info.plist $(MACOSXINSTALL)/Contents/ + $(INSTALL) $(ICONFILE) $(MACOSXINSTALL)/Contents/Resources/ + $(INSTALL) $(MACOSXFILES)/Subsurface.icns $(MACOSXINSTALL)/Contents/Resources/ parse-xml.o: parse-xml.c dive.h $(CC) $(CFLAGS) $(GLIB2CFLAGS) -c $(XML2CFLAGS) parse-xml.c diff --git a/macosx/Info.plist b/packaging/macosx/Info.plist similarity index 94% rename from macosx/Info.plist rename to packaging/macosx/Info.plist index 62d92b1..4ee1243 100644 --- a/macosx/Info.plist +++ b/packaging/macosx/Info.plist @@ -13,7 +13,7 @@ CFBundleSignature ???? CFBundleExecutable - subsurface + subsurface.sh CFBundleIdentifier torvalds.subsurface diff --git a/macosx/PkgInfo b/packaging/macosx/PkgInfo similarity index 100% rename from macosx/PkgInfo rename to packaging/macosx/PkgInfo diff --git a/macosx/Subsurface.icns b/packaging/macosx/Subsurface.icns similarity index 100% rename from macosx/Subsurface.icns rename to packaging/macosx/Subsurface.icns diff --git a/packaging/macosx/subsurface.sh b/packaging/macosx/subsurface.sh new file mode 100755 index 0000000..ee9427c --- /dev/null +++ b/packaging/macosx/subsurface.sh @@ -0,0 +1,5 @@ +#!/bin/sh + +cd `dirname $0`/../Resources +../MacOS/subsurface & +exit 0 -- 2.45.2