diff options
| author |  Henrik Brautaset Aronsen <subsurface@henrik.synth.no> | 2011-10-30 22:27:33 +0100 |
|---|---|---|
| committer |  Henrik Brautaset Aronsen <hba@conduct.no> | 2011-10-31 09:49:13 +0100 |
| commit | b1a1376f3baf78ceca49b47c7b39d58983f4f984 (patch) | |
| tree | 54014ea1ef3b868d6823bf71503da5eb4a27ffa6 | |
| parent | f231ab094351496017288ac35c64613ca0708744 (diff) | |
| download | subsurface-b1a1376f3baf78ceca49b47c7b39d58983f4f984.tar.gz | |
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 <subsurface@henrik.synth.no>
| -rw-r--r-- | Makefile | 12 | ||||
| -rw-r--r-- | packaging/macosx/Info.plist (renamed from macosx/Info.plist) | 2 | ||||
| -rw-r--r-- | packaging/macosx/PkgInfo (renamed from macosx/PkgInfo) | 0 | ||||
| -rw-r--r-- | packaging/macosx/Subsurface.icns (renamed from macosx/Subsurface.icns) | bin | 71777 -> 71777 bytes | |||
| -rwxr-xr-x | packaging/macosx/subsurface.sh | 5 |
5 files changed, 12 insertions, 7 deletions
@@ -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 index 62d92b152..4ee12438b 100644 --- a/macosx/Info.plist +++ b/packaging/macosx/Info.plist @@ -13,7 +13,7 @@ <key>CFBundleSignature</key> <string>????</string> <key>CFBundleExecutable</key> - <string>subsurface</string> + <string>subsurface.sh</string> <key>CFBundleIdentifier</key> <string>torvalds.subsurface</string> </dict> diff --git a/macosx/PkgInfo b/packaging/macosx/PkgInfo index 6f749b0f3..6f749b0f3 100644 --- a/macosx/PkgInfo +++ b/packaging/macosx/PkgInfo diff --git a/macosx/Subsurface.icns b/packaging/macosx/Subsurface.icns Binary files differindex 27c077f16..27c077f16 100644 --- a/macosx/Subsurface.icns +++ b/packaging/macosx/Subsurface.icns diff --git a/packaging/macosx/subsurface.sh b/packaging/macosx/subsurface.sh new file mode 100755 index 000000000..ee9427c37 --- /dev/null +++ b/packaging/macosx/subsurface.sh @@ -0,0 +1,5 @@ +#!/bin/sh + +cd `dirname $0`/../Resources +../MacOS/subsurface & +exit 0 |