Separate GUI verifier with basic reporting (#1823).

8 files changed, 67 insertions, 1 deletions

diff --git a/platform/linux/dcpomatic_verifier.desktop.in b/platform/linux/dcpomatic_verifier.desktop.in
new file mode 100644
index 000000000..b52a6fc3d
--- /dev/null
+++ b/platform/linux/dcpomatic_verifier.desktop.in
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Encoding=UTF-8
+Version=1.0
+Type=Application
+Terminal=false
+Exec=@INSTALL_PREFIX@/bin/dcpomatic2_verifier
+Name=DCP-o-matic 2 Verifier
+Icon=dcpomatic2_verifier
+Comment=DCP generator
+Categories=AudioVideo;Video
diff --git a/platform/linux/wscript b/platform/linux/wscript
index 98aff905d..4a3516fd0 100644
--- a/platform/linux/wscript
+++ b/platform/linux/wscript
@@ -16,6 +16,7 @@ def build(bld):
             desktop(bld, '_playlist'),
             desktop(bld, '_combiner'),
             desktop(bld, '_editor'),
+            desktop(bld, '_verifier'),
         ]
 
     if bld.env.ENABLE_DISK:
diff --git a/platform/osx/dcpomatic2_verifier.Info.plist.in b/platform/osx/dcpomatic2_verifier.Info.plist.in
new file mode 100644
index 000000000..d88a8ce50
--- /dev/null
+++ b/platform/osx/dcpomatic2_verifier.Info.plist.in
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleExecutable</key>
+	<string>dcpomatic2_verifier</string>
+	<key>CFBundleGetInfoString</key>
+	<string>DCP-o-matic 2 Verifier</string>
+	<key>CFBundleIconFile</key>
+	<string>dcpomatic2_verifier.icns</string>
+	<key>CFBundleIdentifier</key>
+	<string>com.dcpomatic.verifier</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>DCP-o-matic 2 Verifier</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleShortVersions</key>
+	<string>@VERSION@</string>
+	<key>CFBundleSignature</key>
+	<string>DOMC</string>
+	<key>CFBundleVersion</key>
+	<string>@VERSION@</string>
+	<key>CFBundleAllowMixedLocalizations</key>
+	<true/>
+	<key>LSUIElement</key>
+	<string>0</string>
+	<key>NSMainNibFile</key>
+	<string>MainMenu</string>
+	<key>NSPrincipalClass</key>
+	<string>NSApplication</string>
+</dict>
+</plist>
diff --git a/platform/osx/make_dmg.sh b/platform/osx/make_dmg.sh
index be4394649..a223556af 100644
--- a/platform/osx/make_dmg.sh
+++ b/platform/osx/make_dmg.sh
@@ -7,7 +7,7 @@ SYNTAX="make_dmg.sh -e <environment> -r <builddir> -i <apple-id> -p <apple-passw
 # Don't set -e here as egrep (used a few times) returns 1 if no matches
 # were found.
 
-BUILD="main kdm server batch player playlist combiner editor disk"
+BUILD="main kdm server batch player playlist combiner editor disk verifier"
 while getopts "e:r:i:p:a:b:" o; do
 	case "${o}" in
 		e)
@@ -227,6 +227,7 @@ function copy_resources {
     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/dcpomatic2_editor.icns "$dest"
+    cp $prefix/src/dcpomatic/graphics/osx/dcpomatic2_verifier.icns "$dest"
     cp $prefix/src/dcpomatic/graphics/osx/preferences/defaults*.png "$dest"
     cp $prefix/src/dcpomatic/graphics/osx/preferences/kdm_email*.png "$dest"
     cp $prefix/src/dcpomatic/graphics/osx/preferences/email*.png "$dest"
@@ -592,6 +593,19 @@ if [[ "$BUILD" == *editor* ]]; then
 	make_dmg "$appdir" "" "DCP-o-matic Editor" "dcpomatic2_verify_cli dcpomatic2_kdm_inspect openssl dcpomatic2_editor"
 fi
 
+if [[ "$BUILD" == *verifier* ]]; then
+	# DCP-o-matic Verifier
+	setup "DCP-o-matic 2 Verifier.app"
+	copy $ROOT src/dcpomatic/build/src/tools/dcpomatic2_verifier "$approot/MacOS"
+	copy $ROOT src/openssl/apps/openssl "$approot/MacOS"
+	copy_verify
+	copy_kdm
+	cp $prefix/src/dcpomatic/build/platform/osx/dcpomatic2_verifier.Info.plist "$approot/Info.plist"
+	rl=("$approot/MacOS/dcpomatic2_verifier" "$approot/Frameworks/"*.dylib)
+	relink_relative "${rl[@]}"
+	make_dmg "$appdir" "" "DCP-o-matic Verifier" "dcpomatic2_verify_cli dcpomatic2_kdm_inspect openssl dcpomatic2_verifier"
+fi
+
 if [[ "$BUILD" == *disk* ]]; then 
 	# DCP-o-matic Disk Writer .app
 	setup "DCP-o-matic 2 Disk Writer.app"
diff --git a/platform/osx/wscript b/platform/osx/wscript
index fd6733a66..cdb018473 100644
--- a/platform/osx/wscript
+++ b/platform/osx/wscript
@@ -8,3 +8,4 @@ def build(bld):
     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)
     obj = bld(features='subst', source='dcpomatic2_editor.Info.plist.in', target='dcpomatic2_editor.Info.plist', version=bld.env.VERSION)
+    obj = bld(features='subst', source='dcpomatic2_verifier.Info.plist.in', target='dcpomatic2_verifier.Info.plist', version=bld.env.VERSION)
diff --git a/platform/windows/dcpomatic2_verifier.bat b/platform/windows/dcpomatic2_verifier.bat
new file mode 100644
index 000000000..d8850d9fe
--- /dev/null
+++ b/platform/windows/dcpomatic2_verifier.bat
@@ -0,0 +1 @@
+gdb.exe -x gdb_script dcpomatic2_verifier.exe > %HOMEPATH%/Documents/dcpomatic_debug_log.txt
diff --git a/platform/windows/dcpomatic_verifier.rc b/platform/windows/dcpomatic_verifier.rc
new file mode 100644
index 000000000..8f1ba073f
--- /dev/null
+++ b/platform/windows/dcpomatic_verifier.rc
@@ -0,0 +1,2 @@
+id ICON "../../graphics/windows/dcpomatic2_verifier.ico"
+#include "wx-3.1/wx/msw/wx.rc"
diff --git a/platform/windows/wscript b/platform/windows/wscript
index 13927f170..c6718db41 100644
--- a/platform/windows/wscript
+++ b/platform/windows/wscript
@@ -22,6 +22,7 @@ def write_installer(bits, dcpomatic_version, debug, disk):
         ('combiner', 'Combiner'),
         ('editor', 'Editor'),
         ('map', 'Map'),
+        ('verifier', 'Verifier'),
     ]
 
     if disk: