Use the new packaging directory for MacOSX specific files, and provide shell script...

- 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>

diff --git a/Makefile b/Makefile
index 3fa77c3f4e800b8791c80f71d92de2c140c57630..638758cd93aa546a62dcf142ebdf45f0252c3deb 100644 (file)
--- 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/macosx/Info.plist
deleted file mode 100644 (file)
index 62d92b1..0000000
--- a/macosx/Info.plist
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-       <key>CFBundleIconFile</key>
-       <string>Subsurface</string>
-       <key>CFBundleName</key>
-       <string>Subsurface</string>
-       <key>CFBundlePackageType</key>
-       <string>APPL</string>
-        <key>CFBundleGetInfoString</key>
-       <string>Rough divelog in C and Gtk</string>
-       <key>CFBundleSignature</key>
-       <string>????</string>
-       <key>CFBundleExecutable</key>
-       <string>subsurface</string>
-       <key>CFBundleIdentifier</key>
-       <string>torvalds.subsurface</string>
-</dict>
-</plist>

diff --git a/macosx/PkgInfo b/macosx/PkgInfo
deleted file mode 100644 (file)
index 6f749b0..0000000
--- a/macosx/PkgInfo
+++ /dev/null
@@ -1 +0,0 @@
-APPL????

diff --git a/macosx/Subsurface.icns b/macosx/Subsurface.icns
deleted file mode 100644 (file)
index 27c077f..0000000
Binary files a/macosx/Subsurface.icns and /dev/null differ

diff --git a/packaging/macosx/Info.plist b/packaging/macosx/Info.plist
new file mode 100644 (file)
index 0000000..4ee1243
--- /dev/null
+++ b/packaging/macosx/Info.plist
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+       <key>CFBundleIconFile</key>
+       <string>Subsurface</string>
+       <key>CFBundleName</key>
+       <string>Subsurface</string>
+       <key>CFBundlePackageType</key>
+       <string>APPL</string>
+        <key>CFBundleGetInfoString</key>
+       <string>Rough divelog in C and Gtk</string>
+       <key>CFBundleSignature</key>
+       <string>????</string>
+       <key>CFBundleExecutable</key>
+       <string>subsurface.sh</string>
+       <key>CFBundleIdentifier</key>
+       <string>torvalds.subsurface</string>
+</dict>
+</plist>

diff --git a/packaging/macosx/PkgInfo b/packaging/macosx/PkgInfo
new file mode 100644 (file)
index 0000000..6f749b0
--- /dev/null
+++ b/packaging/macosx/PkgInfo
@@ -0,0 +1 @@
+APPL????

diff --git a/packaging/macosx/Subsurface.icns b/packaging/macosx/Subsurface.icns
new file mode 100644 (file)
index 0000000..27c077f
Binary files /dev/null and b/packaging/macosx/Subsurface.icns differ

diff --git a/packaging/macosx/subsurface.sh b/packaging/macosx/subsurface.sh
new file mode 100755 (executable)
index 0000000..ee9427c
--- /dev/null
+++ b/packaging/macosx/subsurface.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+cd `dirname $0`/../Resources
+../MacOS/subsurface &
+exit 0