X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=platform%2Fosx%2Fmake_dmg.sh;h=3775508915399f525786faa2c6a63fcd5230f345;hp=3285f7d1d71641007d5d6ebe9aa6c38d7693f390;hb=3a1ddb9e182be28a22c5bbc85c06ee6629b72fe6;hpb=fecfda4c913da3f60ab4329d1f4f412bc27d19a7 diff --git a/platform/osx/make_dmg.sh b/platform/osx/make_dmg.sh index 3285f7d1d..377550891 100644 --- a/platform/osx/make_dmg.sh +++ b/platform/osx/make_dmg.sh @@ -237,20 +237,23 @@ function copy_resources { cp $prefix/src/dcpomatic/graphics/osx/preferences/general*.png "$dest" cp $prefix/src/dcpomatic/graphics/osx/preferences/advanced*.png "$dest" cp $prefix/src/dcpomatic/graphics/osx/preferences/locations*.png "$dest" + cp $prefix/src/dcpomatic/graphics/osx/preferences/non_standard*.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" cp $prefix/src/dcpomatic/fonts/fonts.conf.osx "$dest"/fonts.conf cp $prefix/src/dcpomatic/graphics/splash.png "$dest" - cp $prefix/src/dcpomatic/graphics/zoom.png "$dest" - cp $prefix/src/dcpomatic/graphics/zoom_all.png "$dest" - cp $prefix/src/dcpomatic/graphics/select.png "$dest" - cp $prefix/src/dcpomatic/graphics/snap.png "$dest" - cp $prefix/src/dcpomatic/graphics/sequence.png "$dest" + cp $prefix/src/dcpomatic/graphics/zoom*.png "$dest" + cp $prefix/src/dcpomatic/graphics/zoom_all*.png "$dest" + cp $prefix/src/dcpomatic/graphics/select*.png "$dest" + 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 $prefix/src/dcpomatic/graphics/add*.png "$dest" + cp $prefix/src/dcpomatic/graphics/pause*.png "$dest" cp -r $prefix/share/libdcp/xsd "$dest" cp -r $prefix/share/libdcp/tags "$dest" cp -r $prefix/share/libdcp/ratings "$dest" @@ -465,6 +468,13 @@ function copy_verify { relink_relative "${rl[@]}" } +function copy_kdm { + copy $ROOT src/libdcp/build/tools/dcpkdm "$approot/MacOS" + mv "$approot/MacOS/dcpkdm" "$approot/MacOS/dcpomatic2_kdm_inspect" + rl=("$approot/MacOS/dcpomatic2_kdm_inspect" "$approot/Frameworks/"*.dylib) + relink_relative "${rl[@]}" +} + if [ "$ARCH2" == "" ]; then prefix=$ROOT else @@ -477,13 +487,15 @@ if [[ "$BUILD" == *main* ]]; then 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 src/dcpomatic/build/src/tools/dcpomatic2_map "$approot/MacOS" copy $ROOT bin/ffprobe "$approot/MacOS" copy $ROOT src/openssl/apps/openssl "$approot/MacOS" copy_verify + copy_kdm 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" "dcpomatic2_verify openssl ffprobe dcpomatic2_cli dcpomatic2_create dcpomatic2" + make_dmg "$appdir" "" "DCP-o-matic" "dcpomatic2_verify dcpomatic2_kdm_inspect openssl ffprobe dcpomatic2_cli dcpomatic2_create dcpomatic2" fi if [[ "$BUILD" == *kdm* ]]; then @@ -493,10 +505,11 @@ if [[ "$BUILD" == *kdm* ]]; then copy $ROOT src/dcpomatic/build/src/tools/dcpomatic2_kdm_cli "$approot/MacOS" copy $ROOT src/openssl/apps/openssl "$approot/MacOS" copy_verify + copy_kdm 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" "dcpomatic2_verify openssl dcpomatic2_kdm_cli dcpomatic2_kdm" + make_dmg "$appdir" "" "DCP-o-matic KDM Creator" "dcpomatic2_verify dcpomatic2_kdm_inspect openssl dcpomatic2_kdm_cli dcpomatic2_kdm" fi if [[ "$BUILD" == *server* ]]; then @@ -506,10 +519,11 @@ if [[ "$BUILD" == *server* ]]; then copy $ROOT src/dcpomatic/build/src/tools/dcpomatic2_server_cli "$approot/MacOS" copy $ROOT src/openssl/apps/openssl "$approot/MacOS" copy_verify + copy_kdm 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" "dcpomatic2_verify openssl dcpomatic2_server_cli dcpomatic2_server" + make_dmg "$appdir" "" "DCP-o-matic Encode Server" "dcpomatic2_verify dcpomatic2_kdm_inspect openssl dcpomatic2_server_cli dcpomatic2_server" fi if [[ "$BUILD" == *batch* ]]; then @@ -518,10 +532,11 @@ if [[ "$BUILD" == *batch* ]]; then copy $ROOT src/dcpomatic/build/src/tools/dcpomatic2_batch "$approot/MacOS" copy $ROOT src/openssl/apps/openssl "$approot/MacOS" copy_verify + copy_kdm 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" "dcpomatic2_verify openssl dcpomatic2_batch" + make_dmg "$appdir" "" "DCP-o-matic Batch Converter" "dcpomatic2_verify dcpomatic2_kdm_inspect openssl dcpomatic2_batch" fi if [[ "$BUILD" == *player* ]]; then @@ -530,10 +545,11 @@ if [[ "$BUILD" == *player* ]]; then copy $ROOT src/dcpomatic/build/src/tools/dcpomatic2_player "$approot/MacOS" copy $ROOT src/openssl/apps/openssl "$approot/MacOS" copy_verify + copy_kdm 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" "dcpomatic2_verify openssl dcpomatic2_player" + make_dmg "$appdir" "" "DCP-o-matic Player" "dcpomatic2_verify dcpomatic2_kdm_inspect openssl dcpomatic2_player" fi if [[ "$BUILD" == *playlist* ]]; then @@ -542,10 +558,11 @@ if [[ "$BUILD" == *playlist* ]]; then copy $ROOT src/dcpomatic/build/src/tools/dcpomatic2_playlist "$approot/MacOS" copy $ROOT src/openssl/apps/openssl "$approot/MacOS" copy_verify + copy_kdm 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" "dcpomatic2_verify openssl dcpomatic2_playlist" + make_dmg "$appdir" "" "DCP-o-matic Playlist Editor" "dcpomatic2_verify dcpomatic2_kdm_inspect openssl dcpomatic2_playlist" fi if [[ "$BUILD" == *combiner* ]]; then @@ -554,10 +571,11 @@ if [[ "$BUILD" == *combiner* ]]; then copy $ROOT src/dcpomatic/build/src/tools/dcpomatic2_combiner "$approot/MacOS" copy $ROOT src/openssl/apps/openssl "$approot/MacOS" copy_verify + copy_kdm 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" "dcpomatic2_verify openssl dcpomatic2_combiner" + make_dmg "$appdir" "" "DCP-o-matic Combiner" "dcpomatic2_verify dcpomatic2_kdm_inspect openssl dcpomatic2_combiner" fi if [[ "$BUILD" == *editor* ]]; then @@ -566,10 +584,11 @@ if [[ "$BUILD" == *editor* ]]; then copy $ROOT src/dcpomatic/build/src/tools/dcpomatic2_editor "$approot/MacOS" copy $ROOT src/openssl/apps/openssl "$approot/MacOS" copy_verify + copy_kdm cp $prefix/src/dcpomatic/build/platform/osx/dcpomatic2_editor.Info.plist "$approot/Info.plist" rl=("$approot/MacOS/dcpomatic2_editor" "$approot/Frameworks/"*.dylib) relink_relative "${rl[@]}" - make_dmg "$appdir" "" "DCP-o-matic Editor" "dcpomatic2_verify openssl dcpomatic2_editor" + make_dmg "$appdir" "" "DCP-o-matic Editor" "dcpomatic2_verify dcpomatic2_kdm_inspect openssl dcpomatic2_editor" fi if [[ "$BUILD" == *disk* ]]; then @@ -578,6 +597,7 @@ if [[ "$BUILD" == *disk* ]]; then copy $ROOT src/dcpomatic/build/src/tools/dcpomatic2_disk "$approot/MacOS" copy $ROOT src/openssl/apps/openssl "$approot/MacOS" copy_verify + copy_kdm 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) @@ -655,6 +675,6 @@ EOF mv $pkgbin/* "$pkgroot/Library/Application Support/com.dcpomatic/" pkgbuild --root $pkgroot --identifier com.dcpomatic.disk.writer --scripts $pkgbase/scripts "DCP-o-matic Disk Writer.pkg" - make_dmg "$appdir" "DCP-o-matic Disk Writer.pkg" "DCP-o-matic Disk Writer" "dcpomatic2_verify openssl dcpomatic2_disk" + make_dmg "$appdir" "DCP-o-matic Disk Writer.pkg" "DCP-o-matic Disk Writer" "dcpomatic2_verify dcpomatic2_kdm_inspect openssl dcpomatic2_disk" fi