From 9ed2d1b024f05a016bc27011d6c7caabc1178862 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 6 Apr 2020 12:44:22 +0200 Subject: [PATCH] Renable other apps. --- platform/osx/make_dmg.sh | 96 ++++++++++++++++++++-------------------- 1 file changed, 47 insertions(+), 49 deletions(-) diff --git a/platform/osx/make_dmg.sh b/platform/osx/make_dmg.sh index 6e1332fc7..9099e5453 100644 --- a/platform/osx/make_dmg.sh +++ b/platform/osx/make_dmg.sh @@ -445,69 +445,67 @@ case $TYPE in esac # DCP-o-matic main -##setup "DCP-o-matic 2.app" -##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_relative "${rl[@]}" -##make_dmg "$appdir" "" "DCP-o-matic" com.dcpomatic +setup "DCP-o-matic 2.app" +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_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_relative "${rl[@]}" -##make_dmg "$appdir" "" "DCP-o-matic KDM Creator" com.dcpomatic.kdm +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_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_relative "${rl[@]}" -##make_dmg "$appdir" "" "DCP-o-matic Encode Server" com.dcpomatic.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_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_relative "${rl[@]}" -##make_dmg "$appdir" "" "DCP-o-matic Batch Converter" com.dcpomatic.batch +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_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_relative "${rl[@]}" -##make_dmg "$appdir" "" "DCP-o-matic Player" com.dcpomatic.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_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 +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" -# XXX: this shouldn't really be necessary -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[@]}" -- 2.30.2