From: Carl Hetherington Date: Mon, 8 Mar 2021 19:09:21 +0000 (+0100) Subject: Package dcpverify{,.exe} from libdcp as dcpomatic2_verify{,.exe} (#1915). X-Git-Tag: v2.15.136~13 X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=19210abafb6e5963760951f8b115ac9ee69cfcf3 Package dcpverify{,.exe} from libdcp as dcpomatic2_verify{,.exe} (#1915). --- diff --git a/cscript b/cscript index 8e9237571..9d4eab853 100644 --- a/cscript +++ b/cscript @@ -285,6 +285,7 @@ def make_spec(filename, version, target, options, requires=None): print('%{_bindir}/dcpomatic2_playlist', file=f) print('%{_bindir}/dcpomatic2_openssl', file=f) print('%{_bindir}/dcpomatic2_combiner', file=f) + print('%{_bindir}/dcpomatic2_verify', file=f) if os.path.exists(os.path.join(tools, "dcpomatic2_disk")): print('%{_bindir}/dcpomatic2_disk', file=f) print('%{_bindir}/dcpomatic2_disk_writer', file=f) @@ -344,6 +345,7 @@ def make_spec(filename, version, target, options, requires=None): print('/bin/mkdir -p %{buildroot}/usr/share/libdcp', file=f) print('/bin/cp -r %s/src/libdcp/tags %%{buildroot}/usr/share/libdcp' % target.directory, file=f) print('/bin/cp -r %s/src/libdcp/xsd %%{buildroot}/usr/share/libdcp' % target.directory, file=f) + print('/bin/mv %s/bin/dcpverify %%{buildroot}/usr/bin/dcpomatic2_verify' % target.directory, file=f) print('', file=f) print('%post', file=f) print('/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :', file=f) @@ -630,6 +632,7 @@ def make_appimage(target, nice_name, internal_name, version): os.makedirs('build/%s.AppDir/usr/bin' % nice_filename) target.command('cp %s/bin/%s build/%s.AppDir/usr/bin' % (target.directory, internal_name, nice_filename)) target.command('cp %s/src/openssl/apps/openssl build/%s.AppDir/usr/bin/dcpomatic2_openssl' % (target.directory, nice_filename)) + target.command('cp %s/bin/dcpverify build/%s.AppDir/usr/bin/dcpomatic2_verify' % (target.directory, nice_filename)) target.command('mkdir -p build/%s.AppDir/usr/share/libdcp' % nice_filename) target.command('cp -r %s/share/dcpomatic2 build/%s.AppDir/usr/share/' % (target.directory, nice_filename)) target.command('cp -r %s/share/libdcp/xsd build/%s.AppDir/usr/share/libdcp/' % (target.directory, nice_filename)) diff --git a/debian/rules b/debian/rules index 887100128..9f39f6b00 100755 --- a/debian/rules +++ b/debian/rules @@ -38,6 +38,7 @@ override_dh_auto_install: mkdir -p debian/dcpomatic/usr/share/locale/ru/LC_MESSAGES/ cp -a /usr/share/locale/ru/LC_MESSAGES/wxstd.mo debian/dcpomatic/usr/share/locale/ru/LC_MESSAGES/dcpomatic2-wxstd.mo cp -a $(CDIST_DIRECTORY)/src/openssl/apps/openssl debian/dcpomatic/usr/bin/dcpomatic2_openssl + cp -a $(CDIST_DIRECTORY)/src/libdcp/build/tools/dcpverify debian/dcpomatic/usr/bin/dcpomatic2_verify cp -ar $(CDIST_DIRECTORY)/share/libdcp debian/dcpomatic/usr/share .PHONY: override_dh_strip diff --git a/platform/osx/make_dmg.sh b/platform/osx/make_dmg.sh index 626e746bc..97fec7525 100644 --- a/platform/osx/make_dmg.sh +++ b/platform/osx/make_dmg.sh @@ -384,6 +384,13 @@ function setup { copy_resources "$approot/Resources" } +function copy_verify { + copy $ROOT src/libdcp/build/tools/dcpverify "$approot/MacOS" + mv "$approot/MacOS/dcpverify" "$approot/MacOS/dcpomatic2_verify" + rl=("$approot/MacOS/dcpomatic2_verify" "$approot/Frameworks/"*.dylib) + relink_relative "${rl[@]}" +} + prefix=$ROOT/arm64 # DCP-o-matic main @@ -393,6 +400,7 @@ 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" +copy_verify 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[@]}" @@ -403,6 +411,7 @@ 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" +copy_verify 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[@]}" @@ -413,6 +422,7 @@ 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" +copy_verify 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[@]}" @@ -422,6 +432,7 @@ make_dmg "$appdir" "" "DCP-o-matic Encode Server" 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" +copy_verify 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[@]}" @@ -431,6 +442,7 @@ make_dmg "$appdir" "" "DCP-o-matic Batch Converter" 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" +copy_verify 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[@]}" @@ -440,6 +452,7 @@ make_dmg "$appdir" "" "DCP-o-matic Player" 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" +copy_verify 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[@]}" @@ -449,6 +462,7 @@ make_dmg "$appdir" "" "DCP-o-matic Playlist Editor" 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" +copy_verify 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[@]}" @@ -458,6 +472,7 @@ make_dmg "$appdir" "" "DCP-o-matic Combiner" 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" +copy_verify 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) diff --git a/platform/windows/wscript b/platform/windows/wscript index 47044c8dd..9357e74ef 100644 --- a/platform/windows/wscript +++ b/platform/windows/wscript @@ -174,6 +174,7 @@ File "%static_deps%/bin/libwebp-7.dll" print(""" File "%static_deps%/bin/libltdl-7.dll" File "%static_deps%/bin/libdl.dll" +File /oname=dcpomatic2_verify.exe "%cdist_deps%/bin/dcpverify.exe" File "%cdist_deps%/bin/leqm_nrt.dll" File "%cdist_deps%/bin/asdcp-carl.dll" File "%cdist_deps%/bin/kumu-carl.dll"