From 5a3e836da9480bca0c3ef3384fa2010f358ccc7e Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 11 Sep 2020 01:07:46 +0200 Subject: Add dcpomatic_combine tool (#1245). --- platform/linux/dcpomatic_combiner.desktop.in | 10 +++++++ platform/linux/wscript | 7 +++++ platform/osx/dcpomatic2_combiner.Info.plist.in | 36 ++++++++++++++++++++++++++ platform/osx/make_dmg.sh | 10 +++++++ platform/osx/wscript | 1 + platform/windows/dcpomatic2_combiner_debug.bat | 1 + platform/windows/dcpomatic_combiner.rc | 2 ++ platform/windows/wscript | 3 ++- 8 files changed, 69 insertions(+), 1 deletion(-) create mode 100644 platform/linux/dcpomatic_combiner.desktop.in create mode 100644 platform/osx/dcpomatic2_combiner.Info.plist.in create mode 100644 platform/windows/dcpomatic2_combiner_debug.bat create mode 100644 platform/windows/dcpomatic_combiner.rc (limited to 'platform') diff --git a/platform/linux/dcpomatic_combiner.desktop.in b/platform/linux/dcpomatic_combiner.desktop.in new file mode 100644 index 000000000..2b875ee99 --- /dev/null +++ b/platform/linux/dcpomatic_combiner.desktop.in @@ -0,0 +1,10 @@ +[Desktop Entry] +Encoding=UTF-8 +Version=1.0 +Type=Application +Terminal=false +Exec=@INSTALL_PREFIX@/bin/dcpomatic2_combiner +Name=DCP-o-matic 2 Combiner +Icon=dcpomatic2_combiner +Comment=DCP combiner +Categories=AudioVideo;Video diff --git a/platform/linux/wscript b/platform/linux/wscript index 0fc593f56..dad5778a6 100644 --- a/platform/linux/wscript +++ b/platform/linux/wscript @@ -51,4 +51,11 @@ def build(bld): obj.VERSION = bld.env.VERSION desktops.append(obj.target) + obj = bld(features='subst') + obj.source = 'dcpomatic_combiner.desktop.in' + obj.target = 'dcpomatic2_combiner.desktop' + obj.INSTALL_PREFIX = bld.env.INSTALL_PREFIX + obj.VERSION = bld.env.VERSION + desktops.append(obj.target) + bld.install_files('${PREFIX}/share/applications', desktops) diff --git a/platform/osx/dcpomatic2_combiner.Info.plist.in b/platform/osx/dcpomatic2_combiner.Info.plist.in new file mode 100644 index 000000000..a9ab61968 --- /dev/null +++ b/platform/osx/dcpomatic2_combiner.Info.plist.in @@ -0,0 +1,36 @@ + + + + + CFBundleDevelopmentRegion + English + CFBundleExecutable + dcpomatic2_combiner + CFBundleGetInfoString + DCP-o-matic 2 Combiner + CFBundleIconFile + dcpomatic2_combiner.icns + CFBundleIdentifier + com.dcpomatic.combiner + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + DCP-o-matic 2 Combiner + CFBundlePackageType + APPL + CFBundleShortVersions + @VERSION@ + CFBundleSignature + DOMC + CFBundleVersion + @VERSION@ + CFBundleAllowMixedLocalizations + + LSUIElement + 0 + NSMainNibFile + MainMenu + NSPrincipalClass + NSApplication + + diff --git a/platform/osx/make_dmg.sh b/platform/osx/make_dmg.sh index f55a0e8b1..643e6af33 100644 --- a/platform/osx/make_dmg.sh +++ b/platform/osx/make_dmg.sh @@ -191,6 +191,7 @@ 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/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" @@ -522,6 +523,15 @@ 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 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" com.dcpomatic.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" diff --git a/platform/osx/wscript b/platform/osx/wscript index da20065f5..c0b3d9d10 100644 --- a/platform/osx/wscript +++ b/platform/osx/wscript @@ -6,3 +6,4 @@ def build(bld): obj = bld(features='subst', source='dcpomatic2_player.Info.plist.in', target='dcpomatic2_player.Info.plist', version=bld.env.VERSION) obj = bld(features='subst', source='dcpomatic2_playlist.Info.plist.in', target='dcpomatic2_playlist.Info.plist', version=bld.env.VERSION) obj = bld(features='subst', source='dcpomatic2_disk.Info.plist.in', target='dcpomatic2_disk.Info.plist', version=bld.env.VERSION) + obj = bld(features='subst', source='dcpomatic2_combiner.Info.plist.in', target='dcpomatic2_combiner.Info.plist', version=bld.env.VERSION) diff --git a/platform/windows/dcpomatic2_combiner_debug.bat b/platform/windows/dcpomatic2_combiner_debug.bat new file mode 100644 index 000000000..a4aae9f0c --- /dev/null +++ b/platform/windows/dcpomatic2_combiner_debug.bat @@ -0,0 +1 @@ +gdb.exe -x gdb_script dcpomatic2_combiner.exe > %HOMEPATH%/Documents/dcpomatic_debug_log.txt diff --git a/platform/windows/dcpomatic_combiner.rc b/platform/windows/dcpomatic_combiner.rc new file mode 100644 index 000000000..1b72bf58a --- /dev/null +++ b/platform/windows/dcpomatic_combiner.rc @@ -0,0 +1,2 @@ +id ICON "../../graphics/windows/dcpomatic2_combiner.ico" +#include "wx-3.0/wx/msw/wx.rc" diff --git a/platform/windows/wscript b/platform/windows/wscript index 64f0a57cf..e46038087 100644 --- a/platform/windows/wscript +++ b/platform/windows/wscript @@ -10,7 +10,8 @@ def write_installer(bits, dcpomatic_version, debug, variant, disk): ('player', 'Player'), ('cli', 'CLI'), ('create', 'Creator'), - ('playlist', 'Playlist Editor') + ('playlist', 'Playlist Editor'), + ('combiner', 'Combiner'), ] if disk: -- cgit v1.2.3