X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=platform%2Fosx%2Fmake_dmg.sh;h=a6755e918a6613273b88d81a83009471b258cb45;hb=bed96d486f85a9fa5171e2cdaa3858581d631b3a;hp=5e44fc56d773503e3b599111dcc7e9535b274180;hpb=90b78d5477e4ca51b96cd22e7e81de50da486132;p=dcpomatic.git diff --git a/platform/osx/make_dmg.sh b/platform/osx/make_dmg.sh index 5e44fc56d..a6755e918 100644 --- a/platform/osx/make_dmg.sh +++ b/platform/osx/make_dmg.sh @@ -28,6 +28,17 @@ fi mkdir -p build/platform/osx cd build/platform/osx +cat < entitlements.plist + + + + + com.apple.security.cs.disable-library-validation + + + +EOF + function copy { case $TYPE in universal) @@ -124,6 +135,7 @@ function copy_libs { copy_lib_root libswresample "$dest" copy_lib_root liblwext4 "$dest" copy_lib_root libblockdev "$dest" + copy_lib_root libleqm_nrt "$dest" copy $ROOT src/dcpomatic/build/src/lib/libdcpomatic2.dylib "$dest" copy $ROOT src/dcpomatic/build/src/wx/libdcpomatic2-wx.dylib "$dest" copy_lib_env libboost_system "$dest" @@ -190,17 +202,33 @@ function copy_resources { cp $prefix/src/dcpomatic/graphics/osx/dcpomatic2_batch.icns "$dest" cp $prefix/src/dcpomatic/graphics/osx/dcpomatic2_playlist.icns "$dest" cp $prefix/src/dcpomatic/graphics/osx/dcpomatic2_disk.icns "$dest" - cp $prefix/src/dcpomatic/graphics/osx/preferences/colour_conversions.png "$dest" + cp $prefix/src/dcpomatic/graphics/osx/dcpomatic2_combiner.icns "$dest" cp $prefix/src/dcpomatic/graphics/osx/preferences/defaults.png "$dest" + cp $prefix/src/dcpomatic/graphics/osx/preferences/defaults@2x.png "$dest" cp $prefix/src/dcpomatic/graphics/osx/preferences/kdm_email.png "$dest" + cp $prefix/src/dcpomatic/graphics/osx/preferences/kdm_email@2x.png "$dest" cp $prefix/src/dcpomatic/graphics/osx/preferences/email.png "$dest" + cp $prefix/src/dcpomatic/graphics/osx/preferences/email@2x.png "$dest" cp $prefix/src/dcpomatic/graphics/osx/preferences/servers.png "$dest" + cp $prefix/src/dcpomatic/graphics/osx/preferences/servers@2x.png "$dest" cp $prefix/src/dcpomatic/graphics/osx/preferences/tms.png "$dest" + cp $prefix/src/dcpomatic/graphics/osx/preferences/tms@2x.png "$dest" cp $prefix/src/dcpomatic/graphics/osx/preferences/keys.png "$dest" + cp $prefix/src/dcpomatic/graphics/osx/preferences/keys@2x.png "$dest" cp $prefix/src/dcpomatic/graphics/osx/preferences/cover_sheet.png "$dest" + cp $prefix/src/dcpomatic/graphics/osx/preferences/cover_sheet@2x.png "$dest" cp $prefix/src/dcpomatic/graphics/osx/preferences/notifications.png "$dest" - cp $prefix/src/dcpomatic/graphics/osx/preferences/locations.png "$dest" + cp $prefix/src/dcpomatic/graphics/osx/preferences/notifications@2x.png "$dest" cp $prefix/src/dcpomatic/graphics/osx/preferences/sound.png "$dest" + cp $prefix/src/dcpomatic/graphics/osx/preferences/sound@2x.png "$dest" + cp $prefix/src/dcpomatic/graphics/osx/preferences/identifiers.png "$dest" + cp $prefix/src/dcpomatic/graphics/osx/preferences/identifiers@2x.png "$dest" + cp $prefix/src/dcpomatic/graphics/osx/preferences/general.png "$dest" + cp $prefix/src/dcpomatic/graphics/osx/preferences/general@2x.png "$dest" + cp $prefix/src/dcpomatic/graphics/osx/preferences/advanced.png "$dest" + cp $prefix/src/dcpomatic/graphics/osx/preferences/advanced@2x.png "$dest" + cp $prefix/src/dcpomatic/graphics/osx/preferences/locations.png "$dest" + cp $prefix/src/dcpomatic/graphics/osx/preferences/locations@2x.png "$dest" cp $prefix/src/dcpomatic/fonts/LiberationSans-Regular.ttf "$dest" cp $prefix/src/dcpomatic/fonts/LiberationSans-Italic.ttf "$dest" cp $prefix/src/dcpomatic/fonts/LiberationSans-Bold.ttf "$dest" @@ -212,7 +240,11 @@ function copy_resources { cp $prefix/src/dcpomatic/graphics/snap.png "$dest" cp $prefix/src/dcpomatic/graphics/sequence.png "$dest" cp $prefix/src/dcpomatic/graphics/me.jpg "$dest" + cp $prefix/src/dcpomatic/graphics/link.png "$dest" + cp $prefix/src/dcpomatic/graphics/tick.png "$dest" + cp $prefix/src/dcpomatic/graphics/no_tick.png "$dest" cp -r $prefix/share/libdcp/xsd "$dest" + cp -r $prefix/share/libdcp/tags "$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 tr_TR; do @@ -271,7 +303,7 @@ function relink_absolute { } function sign { - codesign --deep --force --verify --verbose --options runtime --sign "Developer ID Application: Carl Hetherington (R82DXSR997)" "$1" + codesign --deep --force --verify --verbose --options runtime --entitlements entitlements.plist --sign "Developer ID Application: Carl Hetherington (R82DXSR997)" "$1" if [ "$?" != "0" ]; then echo "Failed to sign $1" exit 1 @@ -282,12 +314,10 @@ function sign { # @param #1 .app directory # @param #2 .pkg or "" # @param #3 full name e.g. DCP-o-matic Batch Converter -# @param #4 bundle id e.g. com.dcpomatic.batch function make_dmg { local appdir="$1" local pkg="$2" local full_name="$3" - local bundle_id="$4" tmp_dmg=dcpomatic_tmp.dmg dmg="$full_name $version.dmg" vol_name=DCP-o-matic-$version @@ -384,37 +414,7 @@ EOF xattr -c "$dmg" set -e - codesign --verify --verbose --options runtime --sign "Developer ID Application: Carl Hetherington (R82DXSR997)" "$dmg" - - # We only notarize thin builds, as if we're building universal binaries we must be on an OS - # sufficiently old that it can't notarize anyway - if [ "$TYPE" == "thin" ]; then - - id=$(xcrun altool --notarize-app -t osx -f "$dmg" --primary-bundle-id $bundle_id -u $APPLE_ID -p $APPLE_PASSWORD --output-format xml | grep -C1 RequestUUID | tail -n 1 | sed -e "s///g" | sed -e "s/<\/string>//g") - N=0 - while [ 1 ]; do - echo "Checking up on $id" - status=$(xcrun altool --notarization-info $id -u $APPLE_ID -p $APPLE_PASSWORD --output-format xml) - summary=$(echo "$status" | grep -C1 "Status" | tail -n 1 | sed -e "s/ .//g") - echo "Got $summary" - if [ "$summary" == "invalid" ]; then - echo "Notarization failed." - echo $status - exit 1 - fi - if [ "$summary" == "success" ]; then - break - fi - sleep 30 - N=$((N+1)) - if [ "$N" == "30" ]; then - echo "Timed out waiting for notarization" - exit 1 - fi - done - - xcrun stapler staple "$dmg" - fi + codesign --verify --verbose --options runtime --entitlements entitlements.plist --sign "Developer ID Application: Carl Hetherington (R82DXSR997)" "$dmg" set +e rm $tmp_dmg @@ -454,7 +454,7 @@ copy $ROOT src/openssl/apps/openssl "$approot/MacOS" cp $prefix/src/dcpomatic/build/platform/osx/dcpomatic2.Info.plist "$approot/Info.plist" rl=("$approot/MacOS/dcpomatic2" "$approot/MacOS/dcpomatic2_cli" "$approot/MacOS/dcpomatic2_create" "$approot/MacOS/ffprobe" "$approot/Frameworks/"*.dylib) relink_relative "${rl[@]}" -make_dmg "$appdir" "" "DCP-o-matic" com.dcpomatic +make_dmg "$appdir" "" "DCP-o-matic" # DCP-o-matic KDM Creator setup "DCP-o-matic 2 KDM Creator.app" @@ -464,7 +464,7 @@ copy $ROOT src/openssl/apps/openssl "$approot/MacOS" cp $prefix/src/dcpomatic/build/platform/osx/dcpomatic2_kdm.Info.plist "$approot/Info.plist" rl=("$approot/MacOS/dcpomatic2_kdm" "$approot/MacOS/dcpomatic2_kdm_cli" "$approot/Frameworks/"*.dylib) relink_relative "${rl[@]}" -make_dmg "$appdir" "" "DCP-o-matic KDM Creator" com.dcpomatic.kdm +make_dmg "$appdir" "" "DCP-o-matic KDM Creator" # DCP-o-matic Encode Server setup "DCP-o-matic 2 Encode Server.app" @@ -474,7 +474,7 @@ copy $ROOT src/openssl/apps/openssl "$approot/MacOS" cp $prefix/src/dcpomatic/build/platform/osx/dcpomatic2_server.Info.plist "$approot/Info.plist" rl=("$approot/MacOS/dcpomatic2_server" "$approot/MacOS/dcpomatic2_server_cli" "$approot/Frameworks/"*.dylib) relink_relative "${rl[@]}" -make_dmg "$appdir" "" "DCP-o-matic Encode Server" com.dcpomatic.server +make_dmg "$appdir" "" "DCP-o-matic Encode Server" # DCP-o-matic Batch Converter setup "DCP-o-matic 2 Batch converter.app" @@ -483,7 +483,7 @@ copy $ROOT src/openssl/apps/openssl "$approot/MacOS" cp $prefix/src/dcpomatic/build/platform/osx/dcpomatic2_batch.Info.plist "$approot/Info.plist" rl=("$approot/MacOS/dcpomatic2_batch" "$approot/Frameworks/"*.dylib) relink_relative "${rl[@]}" -make_dmg "$appdir" "" "DCP-o-matic Batch Converter" com.dcpomatic.batch +make_dmg "$appdir" "" "DCP-o-matic Batch Converter" # DCP-o-matic Player setup "DCP-o-matic 2 Player.app" @@ -492,7 +492,7 @@ copy $ROOT src/openssl/apps/openssl "$approot/MacOS" cp $prefix/src/dcpomatic/build/platform/osx/dcpomatic2_player.Info.plist "$approot/Info.plist" rl=("$approot/MacOS/dcpomatic2_player" "$approot/Frameworks/"*.dylib) relink_relative "${rl[@]}" -make_dmg "$appdir" "" "DCP-o-matic Player" com.dcpomatic.player +make_dmg "$appdir" "" "DCP-o-matic Player" # DCP-o-matic Playlist Editor setup "DCP-o-matic 2 Playlist Editor.app" @@ -501,11 +501,22 @@ copy $ROOT src/openssl/apps/openssl "$approot/MacOS" cp $prefix/src/dcpomatic/build/platform/osx/dcpomatic2_playlist.Info.plist "$approot/Info.plist" rl=("$approot/MacOS/dcpomatic2_playlist" "$approot/Frameworks/"*.dylib) relink_relative "${rl[@]}" -make_dmg "$appdir" "" "DCP-o-matic Playlist Editor" com.dcpomatic.playlist +make_dmg "$appdir" "" "DCP-o-matic Playlist Editor" + +# DCP-o-matic Combiner +setup "DCP-o-matic 2 Combiner.app" +copy $ROOT src/dcpomatic/build/src/tools/dcpomatic2_combiner "$approot/MacOS" +copy $ROOT src/openssl/apps/openssl "$approot/MacOS" +cp $prefix/src/dcpomatic/build/platform/osx/dcpomatic2_combiner.Info.plist "$approot/Info.plist" +rl=("$approot/MacOS/dcpomatic2_combiner" "$approot/Frameworks/"*.dylib) +relink_relative "${rl[@]}" +make_dmg "$appdir" "" "DCP-o-matic Combiner" # DCP-o-matic Disk Writer .app setup "DCP-o-matic 2 Disk Writer.app" copy $ROOT src/dcpomatic/build/src/tools/dcpomatic2_disk "$approot/MacOS" +copy $ROOT src/openssl/apps/openssl "$approot/MacOS" +cp $prefix/src/dcpomatic/platform/osx/uninstall_disk.applescript "$approot/Resources" cp $prefix/src/dcpomatic/build/platform/osx/dcpomatic2_disk.Info.plist "$approot/Info.plist" rl=("$approot/MacOS/dcpomatic2_disk" "$approot/Frameworks/"*.dylib) relink_relative "${rl[@]}" @@ -535,16 +546,21 @@ cat > $pkgroot/Library/LaunchDaemons/com.dcpomatic.disk.writer.plist <DYLD_LIBRARY_PATH - KeepAlive - - RunAtLoad - - Debug - StandardOutPath - /Users/carl/damon.out.log + /var/log/dcpomatic_disk_writer_out.log StandardErrorPath - /Users/carl/damon.err.log + /var/log/dcpomatic_disk_writer_err.log + LaunchEvents + + com.apple.notifyd.matching + + com.dcpomatic.disk.writer.start + + Notification + com.dcpomatic.disk.writer.start + + + EOF @@ -562,6 +578,7 @@ relink_absolute "/Library/Application Support/com.dcpomatic" "${rl[@]}" mkdir $pkgbase/scripts cat > $pkgbase/scripts/postinstall <