Bundle dcpkdm from libdcp as dcpomatic2_kdm_inspect (#2366).

diff --git a/cscript b/cscript
index a3fcc8c53c93bbe26795303c1ecd323c7fef33e5..0d5cffbf6a6ab444373a4e5f42ba74c97742ed7b 100644 (file)
--- a/cscript
+++ b/cscript
@@ -354,6 +354,7 @@ def make_spec(filename, version, target, options, requires=None):
     print('%{_bindir}/dcpomatic2_openssl', file=f)
     print('%{_bindir}/dcpomatic2_combiner', file=f)
     print('%{_bindir}/dcpomatic2_verify', file=f)
     print('%{_bindir}/dcpomatic2_openssl', file=f)
     print('%{_bindir}/dcpomatic2_combiner', file=f)
     print('%{_bindir}/dcpomatic2_verify', file=f)

+    print('%{_bindir}/dcpomatic2_kdm_inspect', file=f)

     if can_build_disk(target):
         print('%{_bindir}/dcpomatic2_disk', file=f)
         print('%caps(cap_dac_override=ep) %{_bindir}/dcpomatic2_disk_writer', file=f)
     if can_build_disk(target):
         print('%{_bindir}/dcpomatic2_disk', file=f)
         print('%caps(cap_dac_override=ep) %{_bindir}/dcpomatic2_disk_writer', file=f)


@@ -424,6 +425,7 @@ def make_spec(filename, version, target, options, requires=None):
     print('/bin/cp -r %s/src/libdcp/xsd %%{buildroot}/usr/share/libdcp' % target.directory, file=f)
     print('/bin/cp %s/src/libdcp/ratings %%{buildroot}/usr/share/libdcp' % target.directory, file=f)
     print('/bin/mv %s/bin/dcpverify %%{buildroot}/usr/bin/dcpomatic2_verify' % target.directory, file=f)
     print('/bin/cp -r %s/src/libdcp/xsd %%{buildroot}/usr/share/libdcp' % target.directory, file=f)
     print('/bin/cp %s/src/libdcp/ratings %%{buildroot}/usr/share/libdcp' % target.directory, file=f)
     print('/bin/mv %s/bin/dcpverify %%{buildroot}/usr/bin/dcpomatic2_verify' % target.directory, file=f)

+    print('/bin/mv %s/bin/dcpkdm %%{buildroot}/usr/bin/dcpomatic2_kdm_inspect' % target.directory, file=f)

     print('', file=f)
     print('%post', file=f)
     print('/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :', file=f)
     print('', file=f)
     print('%post', file=f)
     print('/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :', file=f)


@@ -723,6 +725,7 @@ def make_appimage(target, nice_name, internal_name, version):
     target.command(f'cp {target.directory}/bin/{internal_name} {appdir}/usr/bin')
     target.command(f'cp {target.directory}/src/openssl/apps/openssl {appdir}/usr/bin/dcpomatic2_openssl')
     target.command(f'cp {target.directory}/bin/dcpverify {appdir}/usr/bin/dcpomatic2_verify')
     target.command(f'cp {target.directory}/bin/{internal_name} {appdir}/usr/bin')
     target.command(f'cp {target.directory}/src/openssl/apps/openssl {appdir}/usr/bin/dcpomatic2_openssl')
     target.command(f'cp {target.directory}/bin/dcpverify {appdir}/usr/bin/dcpomatic2_verify')

+    target.command(f'cp {target.directory}/bin/dcpkdm {appdir}/usr/bin/dcpomatic2_kdm_inspect')

     target.command(f'mkdir -p {appdir}/usr/share/libdcp')
     target.command(f'cp -r {target.directory}/share/dcpomatic2 {appdir}/usr/share/')
     target.command(f'cp -r {target.directory}/share/libdcp/xsd {appdir}/usr/share/libdcp/')
     target.command(f'mkdir -p {appdir}/usr/share/libdcp')
     target.command(f'cp -r {target.directory}/share/dcpomatic2 {appdir}/usr/share/')
     target.command(f'cp -r {target.directory}/share/libdcp/xsd {appdir}/usr/share/libdcp/')

diff --git a/debian/rules b/debian/rules
index 1d1090d7532085fa0c2ad6911c9e23519a618f8e..860b97ff7e9a5a0dfb67c8a398d1f9cbda94c781 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -39,6 +39,7 @@ override_dh_auto_install:
        cp -a /usr/share/locale/ru/LC_MESSAGES/wxstd-3.1.mo debian/$(CDIST_PACKAGE)/usr/share/locale/ru/LC_MESSAGES/dcpomatic2-wxstd.mo
        cp -a $(CDIST_DIRECTORY)/src/openssl/apps/openssl debian/$(CDIST_PACKAGE)/usr/bin/dcpomatic2_openssl
        cp -a $(CDIST_DIRECTORY)/src/libdcp/build/tools/dcpverify debian/$(CDIST_PACKAGE)/usr/bin/dcpomatic2_verify
        cp -a /usr/share/locale/ru/LC_MESSAGES/wxstd-3.1.mo debian/$(CDIST_PACKAGE)/usr/share/locale/ru/LC_MESSAGES/dcpomatic2-wxstd.mo
        cp -a $(CDIST_DIRECTORY)/src/openssl/apps/openssl debian/$(CDIST_PACKAGE)/usr/bin/dcpomatic2_openssl
        cp -a $(CDIST_DIRECTORY)/src/libdcp/build/tools/dcpverify debian/$(CDIST_PACKAGE)/usr/bin/dcpomatic2_verify

+       cp -a $(CDIST_DIRECTORY)/src/libdcp/build/tools/dcpkdm debian/$(CDIST_PACKAGE)/usr/bin/dcpomatic2_kdm_inspect

        cp -ar $(CDIST_DIRECTORY)/share/libdcp debian/$(CDIST_PACKAGE)/usr/share
 
 .PHONY: override_dh_strip
        cp -ar $(CDIST_DIRECTORY)/share/libdcp debian/$(CDIST_PACKAGE)/usr/share
 
 .PHONY: override_dh_strip

diff --git a/platform/osx/make_dmg.sh b/platform/osx/make_dmg.sh
index 40eabef1fd8a48386904a127c59de2d263d27133..5b383a5713ccdfaaeba05050ba517c1e13844f06 100644 (file)
--- a/platform/osx/make_dmg.sh
+++ b/platform/osx/make_dmg.sh
@@ -465,6 +465,13 @@ function copy_verify {
        relink_relative "${rl[@]}"
 }
 
        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
 if [ "$ARCH2" == "" ]; then
        prefix=$ROOT
 else


@@ -480,10 +487,11 @@ if [[ "$BUILD" == *main* ]]; then
        copy $ROOT bin/ffprobe "$approot/MacOS"
        copy $ROOT src/openssl/apps/openssl "$approot/MacOS"
        copy_verify
        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[@]}"
        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
 fi
 
 if [[ "$BUILD" == *kdm* ]]; then


@@ -493,10 +501,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 $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[@]}"
        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
 fi
 
 if [[ "$BUILD" == *server* ]]; then


@@ -506,10 +515,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 $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[@]}"
        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
 fi
 
 if [[ "$BUILD" == *batch* ]]; then


@@ -518,10 +528,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 $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[@]}"
        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
 fi
 
 if [[ "$BUILD" == *player* ]]; then


@@ -530,10 +541,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 $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[@]}"
        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
 fi
 
 if [[ "$BUILD" == *playlist* ]]; then


@@ -542,10 +554,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 $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[@]}"
        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
 fi
 
 if [[ "$BUILD" == *combiner* ]]; then


@@ -554,10 +567,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 $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[@]}"
        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
 fi
 
 if [[ "$BUILD" == *editor* ]]; then


@@ -566,10 +580,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 $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[@]}"
        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 
 fi
 
 if [[ "$BUILD" == *disk* ]]; then 


@@ -578,6 +593,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 $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)
        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 +671,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"
 
        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
 
 fi
 

diff --git a/platform/windows/wscript b/platform/windows/wscript
index 94b7fc3d3ce1d22af6196cf0db727752e4e31a88..5a40024d706ad271fc6205844fceeeb6060de7f4 100644 (file)
--- a/platform/windows/wscript
+++ b/platform/windows/wscript
@@ -172,6 +172,7 @@ File "%static_deps%/bin/libdav1d.dll"
 File "%static_deps%/bin/libltdl-7.dll"
 File "%static_deps%/bin/libdl.dll"
 File /oname=dcpomatic2_verify.exe "%cdist_deps%/bin/dcpverify.exe"
 File "%static_deps%/bin/libltdl-7.dll"
 File "%static_deps%/bin/libdl.dll"
 File /oname=dcpomatic2_verify.exe "%cdist_deps%/bin/dcpverify.exe"

+File /oname=dcpomatic2_kdm_inspect.exe "%cdist_deps%/bin/dcpkdm.exe"

 File "%cdist_deps%/bin/leqm_nrt.dll"
 File "%cdist_deps%/bin/asdcp-carl.dll"
 File "%cdist_deps%/bin/kumu-carl.dll"
 File "%cdist_deps%/bin/leqm_nrt.dll"
 File "%cdist_deps%/bin/asdcp-carl.dll"
 File "%cdist_deps%/bin/kumu-carl.dll"