Try to sign .apps. Here Apple, just take my money.

[dcpomatic.git] / platform / osx / make_dmg.sh

diff --git a/platform/osx/make_dmg.sh b/platform/osx/make_dmg.sh
index 4d6cb90f11c07fd004a641071d50761785f1c34a..5b99aeb3d23bcab0cb9f095414f30f177d02699a 100644 (file)
--- a/platform/osx/make_dmg.sh
+++ b/platform/osx/make_dmg.sh
@@ -89,7 +89,6 @@ function copy_libs {
     universal_copy_lib $ENV libexpat "$dest"
     universal_copy_lib $ENV libltdl "$dest"
     universal_copy_lib $ENV libxmlsec1 "$dest"
-    universal_copy_lib $ENV libzip "$dest"
     universal_copy_lib $ENV libcurl "$dest"
     universal_copy_lib $ENV libffi "$dest"
     universal_copy_lib $ENV libpango "$dest"
@@ -113,21 +112,23 @@ function copy_libs {
 # @param #1 directory to copy to
 function copy_resources {
     local dest="$1"
-    cp $ROOT/32/src/dcpomatic/graphics/dcpomatic2.icns "$dest"
-    cp $ROOT/32/src/dcpomatic/graphics/dcpomatic2_kdm.icns "$dest"
-    cp $ROOT/32/src/dcpomatic/graphics/dcpomatic2_server.icns "$dest"
-    cp $ROOT/32/src/dcpomatic/graphics/dcpomatic2_batch.icns "$dest"
-    cp $ROOT/32/src/dcpomatic/graphics/colour_conversions.png "$dest"
-    cp $ROOT/32/src/dcpomatic/graphics/defaults.png "$dest"
-    cp $ROOT/32/src/dcpomatic/graphics/kdm_email.png "$dest"
-    cp $ROOT/32/src/dcpomatic/graphics/servers.png "$dest"
-    cp $ROOT/32/src/dcpomatic/graphics/tms.png "$dest"
-    cp $ROOT/32/src/dcpomatic/graphics/keys.png "$dest"
+    cp $ROOT/32/src/dcpomatic/graphics/osx/dcpomatic_small.png "$dest"
+    cp $ROOT/32/src/dcpomatic/graphics/osx/dcpomatic2.icns "$dest"
+    cp $ROOT/32/src/dcpomatic/graphics/osx/dcpomatic2_kdm.icns "$dest"
+    cp $ROOT/32/src/dcpomatic/graphics/osx/dcpomatic2_server.icns "$dest"
+    cp $ROOT/32/src/dcpomatic/graphics/osx/dcpomatic2_player.icns "$dest"
+    cp $ROOT/32/src/dcpomatic/graphics/osx/dcpomatic2_batch.icns "$dest"
+    cp $ROOT/32/src/dcpomatic/graphics/osx/preferences/colour_conversions.png "$dest"
+    cp $ROOT/32/src/dcpomatic/graphics/osx/preferences/defaults.png "$dest"
+    cp $ROOT/32/src/dcpomatic/graphics/osx/preferences/kdm_email.png "$dest"
+    cp $ROOT/32/src/dcpomatic/graphics/osx/preferences/servers.png "$dest"
+    cp $ROOT/32/src/dcpomatic/graphics/osx/preferences/tms.png "$dest"
+    cp $ROOT/32/src/dcpomatic/graphics/osx/preferences/keys.png "$dest"
+    cp $ROOT/32/src/dcpomatic/graphics/osx/preferences/cover_sheet.png "$dest"
     cp $ROOT/32/src/dcpomatic/fonts/LiberationSans-Regular.ttf "$dest"
     cp $ROOT/32/src/dcpomatic/fonts/LiberationSans-Italic.ttf "$dest"
     cp $ROOT/32/src/dcpomatic/fonts/LiberationSans-Bold.ttf "$dest"
     cp $ROOT/32/src/dcpomatic/graphics/splash.png "$dest"
-    cp $ROOT/32/src/dcpomatic/graphics/dcpomatic2_server_small.png "$dest"
 
     # i18n: DCP-o-matic .mo files
     for lang in de_DE es_ES fr_FR it_IT sv_SE nl_NL ru_RU pl_PL da_DK pt_PT pt_BR sk_SK cs_CZ uk_UA zh_CN; do
@@ -173,6 +174,8 @@ function make_dmg {
     dmg="$full_name $version.dmg"
     vol_name=DCP-o-matic-$version
 
+    codesign --deep --force --verify --verbose --sign "3rd Party Mac Developer Application: Carl Hetherington (R82DXSR997)" $appdir
+
     mkdir -p $vol_name
     cp -a "$appdir" $vol_name
     ln -s /Applications "$vol_name/Applications"
@@ -245,8 +248,9 @@ make_dmg "$appdir" "DCP-o-matic"
 # DCP-o-matic KDM Creator
 setup "DCP-o-matic 2 KDM Creator.app"
 universal_copy $ROOT src/dcpomatic/build/src/tools/dcpomatic2_kdm "$approot/MacOS"
+universal_copy $ROOT src/dcpomatic/build/src/tools/dcpomatic2_kdm_cli "$approot/MacOS"
 cp $ROOT/32/src/dcpomatic/build/platform/osx/dcpomatic2_kdm.Info.plist "$approot/Info.plist"
-rl=("$approot/MacOS/dcpomatic2_kdm" "$approot/lib/"*.dylib)
+rl=("$approot/MacOS/dcpomatic2_kdm" "$approot/MacOS/dcpomatic2_kdm_cli" "$approot/lib/"*.dylib)
 relink "${rl[@]}"
 make_dmg "$appdir" "DCP-o-matic KDM Creator"
 
@@ -266,3 +270,11 @@ cp $ROOT/32/src/dcpomatic/build/platform/osx/dcpomatic2_batch.Info.plist "$appro
 rl=("$approot/MacOS/dcpomatic2_batch" "$approot/lib/"*.dylib)
 relink "${rl[@]}"
 make_dmg "$appdir" "DCP-o-matic Batch Converter"
+
+# DCP-o-matic Player
+setup "DCP-o-matic 2 Player.app"
+universal_copy $ROOT src/dcpomatic/build/src/tools/dcpomatic2_player "$approot/MacOS"
+cp $ROOT/32/src/dcpomatic/build/platform/osx/dcpomatic2_player.Info.plist "$approot/Info.plist"
+rl=("$approot/MacOS/dcpomatic2_player" "$approot/lib/"*.dylib)
+relink "${rl[@]}"
+make_dmg "$appdir" "DCP-o-matic Player"