From cd06ec145bf9617615fae7d620cf51ad5b486293 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 3 Aug 2017 16:53:43 +0100 Subject: [PATCH] Player build stuff. --- platform/osx/make_dmg.sh | 9 +++++++++ platform/osx/wscript | 1 + platform/windows/wscript | 6 ++++++ 3 files changed, 16 insertions(+) diff --git a/platform/osx/make_dmg.sh b/platform/osx/make_dmg.sh index bccecfebc..fcbc94ed7 100644 --- a/platform/osx/make_dmg.sh +++ b/platform/osx/make_dmg.sh @@ -117,6 +117,7 @@ function copy_resources { cp $ROOT/32/src/dcpomatic/graphics/osx/dcpomatic2.icns "$dest" cp $ROOT/32/src/dcpomatic/graphics/osx/dcpomatic2_kdm.icns "$dest" cp $ROOT/32/src/dcpomatic/graphics/osx/dcpomatic2_server.icns "$dest" + cp $ROOT/32/src/dcpomatic/graphics/osx/dcpomatic2_player.icns "$dest" cp $ROOT/32/src/dcpomatic/graphics/osx/dcpomatic2_batch.icns "$dest" cp $ROOT/32/src/dcpomatic/graphics/osx/preferences/colour_conversions.png "$dest" cp $ROOT/32/src/dcpomatic/graphics/osx/preferences/defaults.png "$dest" @@ -267,3 +268,11 @@ cp $ROOT/32/src/dcpomatic/build/platform/osx/dcpomatic2_batch.Info.plist "$appro rl=("$approot/MacOS/dcpomatic2_batch" "$approot/lib/"*.dylib) relink "${rl[@]}" make_dmg "$appdir" "DCP-o-matic Batch Converter" + +# DCP-o-matic Player +setup "DCP-o-matic 2 Player.app" +universal_copy $ROOT src/dcpomatic/build/src/tools/dcpomatic2_player "$approot/MacOS" +cp $ROOT/32/src/dcpomatic/build/platform/osx/dcpomatic2_player.Info.plist "$approot/Info.plist" +rl=("$approot/MacOS/dcpomatic2_player" "$approot/lib/"*.dylib) +relink "${rl[@]}" +make_dmg "$appdir" "DCP-o-matic Player" diff --git a/platform/osx/wscript b/platform/osx/wscript index f2248fcb5..a34c21e2e 100644 --- a/platform/osx/wscript +++ b/platform/osx/wscript @@ -3,3 +3,4 @@ def build(bld): obj = bld(features='subst', source='dcpomatic2_kdm.Info.plist.in', target='dcpomatic2_kdm.Info.plist', version=bld.env.VERSION) obj = bld(features='subst', source='dcpomatic2_server.Info.plist.in', target='dcpomatic2_server.Info.plist', version=bld.env.VERSION) obj = bld(features='subst', source='dcpomatic2_batch.Info.plist.in', target='dcpomatic2_batch.Info.plist', version=bld.env.VERSION) + obj = bld(features='subst', source='dcpomatic2_player.Info.plist.in', target='dcpomatic2_player.Info.plist', version=bld.env.VERSION) diff --git a/platform/windows/wscript b/platform/windows/wscript index f47d3b54f..a71e76f5b 100644 --- a/platform/windows/wscript +++ b/platform/windows/wscript @@ -190,6 +190,7 @@ File "%cdist_deps%/bin/ffprobe.exe" print('File "%resources%/dcpomatic2_debug.bat"', file=f) print('File "%resources%/dcpomatic2_batch_debug.bat"', file=f) print('File "%resources%/dcpomatic2_kdm_debug.bat"', file=f) + print('File "%resources%/dcpomatic2_player_debug.bat"', file=f) print('File "%mingw%/gdb.exe"', file=f) print('File "%mingw%/addr2line.exe"', file=f) else: @@ -297,12 +298,14 @@ File "%binaries%/src/tools/dcpomatic2_batch.exe" File "%binaries%/src/tools/dcpomatic2_cli.exe" File "%binaries%/src/tools/dcpomatic2_create.exe" File "%binaries%/src/tools/dcpomatic2_kdm.exe" +File "%binaries%/src/tools/dcpomatic2_player.exe" """, file=f) if debug: print('CreateShortCut "$SMPROGRAMS\\DCP-o-matic 2 debug\\DCP-o-matic 2 debug.lnk" "$INSTDIR\\bin\\dcpomatic2_debug.bat"', file=f) print('CreateShortCut "$SMPROGRAMS\\DCP-o-matic 2 debug\\DCP-o-matic 2 batch converter debug.lnk" "$INSTDIR\\bin\\dcpomatic2_batch_debug.bat" ""', file=f) print('CreateShortCut "$SMPROGRAMS\\DCP-o-matic 2 debug\\DCP-o-matic 2 KDM creator debug.lnk" "$INSTDIR\\bin\\dcpomatic2_kdm_debug.bat" ""', file=f) + print('CreateShortCut "$SMPROGRAMS\\DCP-o-matic 2 debug\\DCP-o-matic 2 Player debug.lnk" "$INSTDIR\\bin\\dcpomatic2_player_debug.bat" ""', file=f) print('CreateShortCut "$SMPROGRAMS\\DCP-o-matic 2 debug\\Uninstall DCP-o-matic 2 debug.lnk" "$INSTDIR\\Uninstall.exe"', file=f) print('WriteRegStr HKLM "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\DCP-o-matic 2 debug" "DisplayName" "DCP-o-matic 2 debug (remove only)"', file=f) print('WriteRegStr HKLM "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\DCP-o-matic 2 debug" "UninstallString" "$INSTDIR\\Uninstall.exe"', file=f) @@ -310,6 +313,7 @@ File "%binaries%/src/tools/dcpomatic2_kdm.exe" print('CreateShortCut "$SMPROGRAMS\\DCP-o-matic 2\\DCP-o-matic 2.lnk" "$INSTDIR\\bin\\dcpomatic2.exe"', file=f) print('CreateShortCut "$SMPROGRAMS\\DCP-o-matic 2\\DCP-o-matic 2 batch converter.lnk" "$INSTDIR\\bin\\dcpomatic2_batch.exe"', file=f) print('CreateShortCut "$SMPROGRAMS\\DCP-o-matic 2\\DCP-o-matic 2 KDM creator.lnk" "$INSTDIR\\bin\\dcpomatic2_kdm.exe"', file=f) + print('CreateShortCut "$SMPROGRAMS\\DCP-o-matic 2\\DCP-o-matic 2 Player.lnk" "$INSTDIR\\bin\\dcpomatic2_player.exe"', file=f) print('CreateShortCut "$SMPROGRAMS\\DCP-o-matic 2\\Uninstall DCP-o-matic 2.lnk" "$INSTDIR\\Uninstall.exe"', file=f) print('WriteRegStr HKLM "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\DCP-o-matic2" "DisplayName" "DCP-o-matic 2 (remove only)"', file=f) print('WriteRegStr HKLM "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\DCP-o-matic2" "UninstallString" "$INSTDIR\\Uninstall.exe"', file=f) @@ -321,11 +325,13 @@ File "%binaries%/src/tools/dcpomatic2_kdm.exe" print('CreateShortCut "$DESKTOP\\DCP-o-matic 2 debug.lnk" "$INSTDIR\\bin\\dcpomatic2_debug.bat" ""', file=f) print('CreateShortCut "$DESKTOP\\DCP-o-matic 2 batch converter debug.lnk" "$INSTDIR\\bin\\dcpomatic2_batch_debug.bat" ""', file=f) print('CreateShortCut "$DESKTOP\\DCP-o-matic 2 KDM creator debug.lnk" "$INSTDIR\\bin\\dcpomatic2_kdm_debug.bat" ""', file=f) + print('CreateShortCut "$DESKTOP\\DCP-o-matic 2 Player debug.lnk" "$INSTDIR\\bin\\dcpomatic2_player_debug.bat" ""', file=f) else: print('Section "DCP-o-matic 2 desktop shortcuts" SEC_MASTER_DESKTOP', file=f) print('CreateShortCut "$DESKTOP\\DCP-o-matic 2.lnk" "$INSTDIR\\bin\\dcpomatic2.exe" ""', file=f) print('CreateShortCut "$DESKTOP\\DCP-o-matic 2 batch converter.lnk" "$INSTDIR\\bin\\dcpomatic2_batch.exe"', file=f) print('CreateShortCut "$DESKTOP\\DCP-o-matic 2 KDM creator.lnk" "$INSTDIR\\bin\\dcpomatic2_kdm.exe"', file=f) + print('CreateShortCut "$DESKTOP\\DCP-o-matic 2 Player.lnk" "$INSTDIR\\bin\\dcpomatic2_player.exe"', file=f) print("SectionEnd", file=f) -- 2.30.2