From 02c41355007dd507dc9da99bb98639626500f30f Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Thu, 8 Oct 2015 17:57:08 +0100
Subject: OS X fixes.

---
 platform/osx/Info.plist.in                | 34 -------------------------------
 platform/osx/dcpomatic2.Info.plist.in     | 34 +++++++++++++++++++++++++++++++
 platform/osx/dcpomatic2_kdm.Info.plist.in | 34 +++++++++++++++++++++++++++++++
 platform/osx/make_dmg.sh                  |  5 +++--
 platform/osx/wscript                      |  3 ++-
 5 files changed, 73 insertions(+), 37 deletions(-)
 delete mode 100644 platform/osx/Info.plist.in
 create mode 100644 platform/osx/dcpomatic2.Info.plist.in
 create mode 100644 platform/osx/dcpomatic2_kdm.Info.plist.in

(limited to 'platform')

diff --git a/platform/osx/Info.plist.in b/platform/osx/Info.plist.in
deleted file mode 100644
index e420d3620..000000000
--- a/platform/osx/Info.plist.in
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>English</string>
-	<key>CFBundleExecutable</key>
-	<string>dcpomatic2</string>
-	<key>CFBundleGetInfoString</key>
-	<string>DCP generator</string>
-	<key>CFBundleIconFile</key>
-	<string>DCP-o-matic.icns</string>
-	<key>CFBundleIdentifier</key>
-	<string>net.carlh.dcpomatic</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>DCP-o-matic 2</string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleShortVersions</key>
-	<string>@VERSION@</string>
-	<key>CFBundleSignature</key>
-	<string>DOMC</string>
-	<key>CFBundleVersion</key>
-	<string>@VERSION@</string>
-	<key>LSUIElement</key>
-	<string>0</string>
-	<key>NSMainNibFile</key>
-	<string>MainMenu</string>
-	<key>NSPrincipalClass</key>
-	<string>NSApplication</string>
-</dict>
-</plist>
diff --git a/platform/osx/dcpomatic2.Info.plist.in b/platform/osx/dcpomatic2.Info.plist.in
new file mode 100644
index 000000000..c8c1378a9
--- /dev/null
+++ b/platform/osx/dcpomatic2.Info.plist.in
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleExecutable</key>
+	<string>dcpomatic2</string>
+	<key>CFBundleGetInfoString</key>
+	<string>DCP generator</string>
+	<key>CFBundleIconFile</key>
+	<string>DCP-o-matic.icns</string>
+	<key>CFBundleIdentifier</key>
+	<string>com.dcpomatic</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>DCP-o-matic 2</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleShortVersions</key>
+	<string>@VERSION@</string>
+	<key>CFBundleSignature</key>
+	<string>DOMC</string>
+	<key>CFBundleVersion</key>
+	<string>@VERSION@</string>
+	<key>LSUIElement</key>
+	<string>0</string>
+	<key>NSMainNibFile</key>
+	<string>MainMenu</string>
+	<key>NSPrincipalClass</key>
+	<string>NSApplication</string>
+</dict>
+</plist>
diff --git a/platform/osx/dcpomatic2_kdm.Info.plist.in b/platform/osx/dcpomatic2_kdm.Info.plist.in
new file mode 100644
index 000000000..5a585a1ae
--- /dev/null
+++ b/platform/osx/dcpomatic2_kdm.Info.plist.in
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleExecutable</key>
+	<string>dcpomatic2_kdm</string>
+	<key>CFBundleGetInfoString</key>
+	<string>DCP KDM creator</string>
+	<key>CFBundleIconFile</key>
+	<string>DCP-o-matic.icns</string>
+	<key>CFBundleIdentifier</key>
+	<string>com.dcpomatic.kdm</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>DCP-o-matic 2 KDM Creator</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleShortVersions</key>
+	<string>@VERSION@</string>
+	<key>CFBundleSignature</key>
+	<string>DOMC</string>
+	<key>CFBundleVersion</key>
+	<string>@VERSION@</string>
+	<key>LSUIElement</key>
+	<string>0</string>
+	<key>NSMainNibFile</key>
+	<string>MainMenu</string>
+	<key>NSPrincipalClass</key>
+	<string>NSApplication</string>
+</dict>
+</plist>
diff --git a/platform/osx/make_dmg.sh b/platform/osx/make_dmg.sh
index 034df9fb4..bbecd4fa1 100644
--- a/platform/osx/make_dmg.sh
+++ b/platform/osx/make_dmg.sh
@@ -123,7 +123,7 @@ universal_copy_lib $ENV libicuuc "$WORK/$libs"
 
 relink=`echo $relink | sed -e "s/\+//g"`
 
-for obj in "$WORK/$macos/dcpomatic2" "$WORK/$macos/dcpomatic2_batch" "$WORK/$macos/dcpomatic2_cli" "$WORK/$macos/dcpomatic2_server_cli" "$WORK/$macos/ffprobe" "$WORK/$libs/"*.dylib; do
+for obj in "$WORK/$macos/dcpomatic2" "$WORK/$macos/dcpomatic2_batch" "$WORK/$macos/dcpomatic2_server" "$WORK/$macos/dcpomatic2_kdm" "$WORK/$macos/dcpomatic2_cli" "$WORK/$macos/dcpomatic2_server_cli" "$WORK/$macos/ffprobe" "$WORK/$libs/"*.dylib; do
   deps=`otool -L "$obj" | awk '{print $1}' | egrep "($relink)" | egrep "($ENV|$ROOT|boost|libicu)"`
   changes=""
   for dep in $deps; do
@@ -138,7 +138,7 @@ for obj in "$WORK/$macos/dcpomatic2" "$WORK/$macos/dcpomatic2_batch" "$WORK/$mac
   fi
 done
 
-cp $ROOT/32/src/dcpomatic/build/platform/osx/Info.plist "$WORK/$approot"
+cp $ROOT/32/src/dcpomatic/build/platform/osx/dcpomatic2.Info.plist "$WORK/$approot/Info.plist"
 cp $ROOT/32/src/dcpomatic/graphics/dcpomatic.icns "$WORK/$resources/DCP-o-matic.icns"
 cp $ROOT/32/src/dcpomatic/graphics/colour_conversions.png "$WORK/$resources"
 cp $ROOT/32/src/dcpomatic/graphics/defaults.png "$WORK/$resources"
@@ -182,6 +182,7 @@ mkdir -p "$WORK/$macos_kdm"
 ln -s "../../../DCP-o-matic 2.app/Contents/lib" "$WORK/$libs_kdm"
 ln -s "../../../DCP-o-matic 2.app/Contents/Resources" "$WORK/$resources_kdm"
 universal_copy $ROOT src/dcpomatic/build/src/tools/dcpomatic2_kdm "$WORK/$macos_kdm"
+cp $ROOT/32/src/dcpomatic/build/platform/osx/dcpomatic2_kdm.Info.plist "$WORK/$approot/Info.plist"
 cp -a "$WORK/$appdir_kdm" $WORK/$vol_name
 
 rm -f $tmp_dmg "$dmg"
diff --git a/platform/osx/wscript b/platform/osx/wscript
index aae1be921..c1f2351dd 100644
--- a/platform/osx/wscript
+++ b/platform/osx/wscript
@@ -1,2 +1,3 @@
 def build(bld):
-    obj = bld(features='subst', source='Info.plist.in', target='Info.plist', version=bld.env.VERSION)
+    obj = bld(features='subst', source='dcpomatic2.Info.plist.in', target='dcpomatic2.Info.plist', version=bld.env.VERSION)
+    obj = bld(features='subst', source='dcpomatic2_kdm.Info.plist.in', target='dcpomatic2_kdm.Info.plist', version=bld.env.VERSION)
-- 
cgit v1.2.3