X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=platform%2Fosx%2Fmake_dmg.sh;h=dfac33d4618f18f3b37d91d68c34b13a479b2329;hp=587cacbf8b80e95c49ee25032947926463cca398;hb=50fa6e1802dbc8f6fd6406a93f86ec262a55ba1f;hpb=21b2e5d0e658cfc664a70a41ef9c4c2970f01f28 diff --git a/platform/osx/make_dmg.sh b/platform/osx/make_dmg.sh index 587cacbf8..dfac33d46 100644 --- a/platform/osx/make_dmg.sh +++ b/platform/osx/make_dmg.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# Syntax: make_dmg.sh +SYNTAX="make_dmg.sh " # where is universal or thin # # e.g. make_dmg.sh /Users/carl/osx-environment /Users/carl/cdist universal foo@bar.net opensesame @@ -19,7 +19,7 @@ APPLE_ID=$4 APPLE_PASSWORD=$5 if [ "$TYPE" != "universal" -a "$TYPE" != "thin" ]; then - echo "Syntax: $0 " + echo $SYNTAX echo "where is universal or thin" exit 1 fi @@ -110,8 +110,8 @@ function copy_libs { local dest="$1" copy_lib_root libcxml "$dest" copy_lib_root libdcp-1.0 "$dest" - copy_lib_root libasdcp-cth "$dest" - copy_lib_root libkumu-cth "$dest" + copy_lib_root libasdcp-carl "$dest" + copy_lib_root libkumu-carl "$dest" copy_lib_root libsub "$dest" copy_lib_root libopenjp2 "$dest" copy_lib_root libavdevice "$dest" @@ -122,6 +122,9 @@ function copy_libs { copy_lib_root libswscale "$dest" copy_lib_root libpostproc "$dest" 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" @@ -166,6 +169,7 @@ function copy_libs { copy_lib_env libFLAC "$dest" copy_lib_env libvorbis "$dest" copy_lib_env libogg "$dest" + copy_lib_env libxerces-c "$dest" } # @param #1 directory to copy to @@ -185,6 +189,8 @@ function copy_resources { cp $prefix/src/dcpomatic/graphics/osx/dcpomatic2_server.icns "$dest" cp $prefix/src/dcpomatic/graphics/osx/dcpomatic2_player.icns "$dest" 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/preferences/defaults.png "$dest" cp $prefix/src/dcpomatic/graphics/osx/preferences/kdm_email.png "$dest" @@ -194,8 +200,8 @@ function copy_resources { cp $prefix/src/dcpomatic/graphics/osx/preferences/keys.png "$dest" cp $prefix/src/dcpomatic/graphics/osx/preferences/cover_sheet.png "$dest" cp $prefix/src/dcpomatic/graphics/osx/preferences/notifications.png "$dest" - cp $prefix/src/dcpomatic/graphics/osx/preferences/accounts.png "$dest" cp $prefix/src/dcpomatic/graphics/osx/preferences/locations.png "$dest" + cp $prefix/src/dcpomatic/graphics/osx/preferences/sound.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" @@ -207,6 +213,7 @@ 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 -r $prefix/share/libdcp/xsd "$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 @@ -224,7 +231,7 @@ function copy_resources { } # param $1 list of things that link to other things -function relink { +function relink_relative { to_relink=`echo $to_relink | sed -e "s/\+//g"` local linkers=("$@") @@ -247,25 +254,61 @@ function relink { done } +# param $1 directory things should be relinked into +# $2 list of things that link to other things +function relink_absolute { + to_relink=`echo $to_relink | sed -e "s/\+//g"` + target=$1 + shift + local linkers=("$@") + + for obj in "${linkers[@]}"; do + deps=`otool -L "$obj" | awk '{print $1}' | egrep "($to_relink)" | egrep "($ENV|$ROOT|boost|libicu)"` + for dep in $deps; do + base=`basename $dep` + install_name_tool -change "$dep" "$target"/$base -id `basename "$obj"` "$obj" + done + done +} + +function sign { + codesign --deep --force --verify --verbose --options runtime --sign "Developer ID Application: Carl Hetherington (R82DXSR997)" "$1" + if [ "$?" != "0" ]; then + echo "Failed to sign $1" + exit 1 + fi +} + + # @param #1 .app directory -# @param #2 full name e.g. DCP-o-matic Batch Converter -# @param #3 bundle id e.g. com.dcpomatic.batch +# @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 full_name="$2" - local bundle_id="$3" + 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 - codesign --deep --force --verify --verbose --sign "Developer ID Application: Carl Hetherington (R82DXSR997)" "$appdir" - if [ "$?" != "0" ]; then - echo "Failed to sign .app" - exit 1 + sign "$appdir" + + if [ "$pkg" != "" ]; then + productsign --sign "Developer ID Installer: Carl Hetherington (R82DXSR997)" "$pkg" "signed_temp.pkg" + if [ "$?" != "0" ]; then + echo "Failed to sign .pkg" + exit 1 + fi + mv signed_temp.pkg "$pkg" fi mkdir -p $vol_name cp -a "$appdir" $vol_name + if [ "$pkg" != "" ]; then + cp -a "$pkg" $vol_name + fi ln -s /Applications "$vol_name/Applications" cat< "$vol_name/READ ME.txt" Welcome to DCP-o-matic! The first time you run the program there may be @@ -282,6 +325,22 @@ DCP-o-matic Anwendungen ab, bei weiteren Programmstarts wird sie nicht mehr auftreten. EOF + if [ "$pkg" != "" ]; then + cat< "$vol_name/READ ME.txt" + +To run this software successfully you must install $pkg before running +the .app +EOF + fi + + if [ "$pkg" != "" ]; then + cat< "$vol_name/READ ME.de_DE.txt" + +To run this software successfully you must install $pkg before running +the .app +EOF + + fi rm -f $tmp_dmg "$dmg" hdiutil create -srcfolder $vol_name -volname $vol_name -fs HFS+ -fsargs "-c c=64,a=16,e=16" -format UDRW -size $DMG_SIZE $tmp_dmg attach=$(hdiutil attach -readwrite -noverify -noautoopen $tmp_dmg) @@ -295,7 +354,9 @@ EOF set current view of container window to icon view set toolbar visible of container window to false set statusbar visible of container window to false - set the bounds of container window to {400, 200, 940, 300} + set the bounds of container window to {400, 200, 1160, 600} + set the bounds of container window to {400, 200, 1160, 600} + set the bounds of container window to {400, 200, 1160, 600} set theViewOptions to the icon view options of container window set arrangement of theViewOptions to not arranged set icon size of theViewOptions to 64 @@ -303,6 +364,7 @@ EOF set position of item "Applications" of container window to {265, 80} set position of item "READ ME.txt" of container window to {430, 80} set position of item "READ ME.de_DE.txt" of container window to {595, 80} + set position of item "DCP-o-matic Disk Writer.pkg" of container window to {90, 255} close open update without registering applications @@ -323,7 +385,7 @@ EOF xattr -c "$dmg" set -e - codesign --verify --verbose --sign "Developer ID Application: Carl Hetherington (R82DXSR997)" "$dmg" + 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 @@ -333,23 +395,28 @@ EOF 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 | grep -C1 "Status" | tail -n 1 | sed -e "s/ .//g") - echo "Got $status" - if [ "$status" == "success" ]; then + 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" == "10" ]; then + if [ "$N" == "30" ]; then echo "Timed out waiting for notarization" exit 1 fi done xcrun stapler staple "$dmg" - set +e - fi + set +e rm $tmp_dmg rm -rf $vol_name @@ -384,41 +451,132 @@ copy $ROOT src/dcpomatic/build/src/tools/dcpomatic2 "$approot/MacOS" copy $ROOT src/dcpomatic/build/src/tools/dcpomatic2_cli "$approot/MacOS" copy $ROOT src/dcpomatic/build/src/tools/dcpomatic2_create "$approot/MacOS" copy $ROOT bin/ffprobe "$approot/MacOS" +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 "${rl[@]}" -make_dmg "$appdir" "DCP-o-matic" com.dcpomatic +relink_relative "${rl[@]}" +make_dmg "$appdir" "" "DCP-o-matic" com.dcpomatic # DCP-o-matic KDM Creator setup "DCP-o-matic 2 KDM Creator.app" copy $ROOT src/dcpomatic/build/src/tools/dcpomatic2_kdm "$approot/MacOS" copy $ROOT src/dcpomatic/build/src/tools/dcpomatic2_kdm_cli "$approot/MacOS" +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 "${rl[@]}" -make_dmg "$appdir" "DCP-o-matic KDM Creator" com.dcpomatic.kdm +relink_relative "${rl[@]}" +make_dmg "$appdir" "" "DCP-o-matic KDM Creator" com.dcpomatic.kdm # DCP-o-matic Encode Server setup "DCP-o-matic 2 Encode Server.app" copy $ROOT src/dcpomatic/build/src/tools/dcpomatic2_server "$approot/MacOS" copy $ROOT src/dcpomatic/build/src/tools/dcpomatic2_server_cli "$approot/MacOS" +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 "${rl[@]}" -make_dmg "$appdir" "DCP-o-matic Encode Server" com.dcpomatic.server +relink_relative "${rl[@]}" +make_dmg "$appdir" "" "DCP-o-matic Encode Server" com.dcpomatic.server # DCP-o-matic Batch Converter setup "DCP-o-matic 2 Batch converter.app" copy $ROOT src/dcpomatic/build/src/tools/dcpomatic2_batch "$approot/MacOS" +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 "${rl[@]}" -make_dmg "$appdir" "DCP-o-matic Batch Converter" com.dcpomatic.batch +relink_relative "${rl[@]}" +make_dmg "$appdir" "" "DCP-o-matic Batch Converter" com.dcpomatic.batch # DCP-o-matic Player setup "DCP-o-matic 2 Player.app" copy $ROOT src/dcpomatic/build/src/tools/dcpomatic2_player "$approot/MacOS" +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 "${rl[@]}" -make_dmg "$appdir" "DCP-o-matic Player" com.dcpomatic.player +relink_relative "${rl[@]}" +make_dmg "$appdir" "" "DCP-o-matic Player" com.dcpomatic.player + +# DCP-o-matic Playlist Editor +setup "DCP-o-matic 2 Playlist Editor.app" +copy $ROOT src/dcpomatic/build/src/tools/dcpomatic2_playlist "$approot/MacOS" +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 + +# 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/build/platform/osx/dcpomatic2_disk.Info.plist "$approot/Info.plist" +rl=("$approot/MacOS/dcpomatic2_disk" "$approot/Frameworks/"*.dylib) +relink_relative "${rl[@]}" + +# DCP-o-matic Disk Writer daemon .pkg + +pkgbase=tmp-disk-writer +rm -rf $pkgbase +mkdir $pkgbase +pkgbin=$pkgbase/bin +pkgroot=$pkgbase/root + +mkdir -p $pkgroot/Library/LaunchDaemons +cat > $pkgroot/Library/LaunchDaemons/com.dcpomatic.disk.writer.plist < + + + + Label + com.dcpomatic.disk.writer + ProgramArguments + + /Library/Application Support/com.dcpomatic/dcpomatic2_disk_writer + + EnvironmentVariables + + DYLD_LIBRARY_PATH + + + KeepAlive + + RunAtLoad + + Debug + + StandardOutPath + /var/log/dcpomatic_disk_writer_out.log + StandardErrorPath + /var/log/dcpomatic_disk_writer_err.log + + +EOF + +# Get the binaries together in $pkgbin then move them to the +# place with spaces in the filename to avoid some of the pain of escaping + +mkdir $pkgbin +copy $ROOT src/dcpomatic/build/src/tools/dcpomatic2_disk_writer "$pkgbin" +copy_libs "$pkgbin" + +rl=("$pkgbin/dcpomatic2_disk_writer" "$pkgbin/"*.dylib) +relink_absolute "/Library/Application Support/com.dcpomatic" "${rl[@]}" + +mkdir $pkgbase/scripts +cat > $pkgbase/scripts/postinstall <