Use the new libdcp xerces stuff and install the required supporting files.

6 files changed, 17 insertions, 4 deletions

diff --git a/cscript b/cscript
index 1845cc7d0..eb7a817eb 100644
--- a/cscript
+++ b/cscript
@@ -604,6 +604,8 @@ 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('mkdir -p build/%s.AppDir/usr/share/libdcp' % nice_filename)
+    target.command('cp -r %s/share/libdcp/xsd build/%s.AppDir/usr/share/libdcp/' % (target.directory, nice_filename))
     with open('build/%s.AppDir/AppRun' % nice_filename, 'w') as f:
         print('#!/bin/bash', file=f)
         print('export APPDIR="$(dirname "$(readlink -f "$0")")"', file=f)
diff --git a/debian/rules b/debian/rules
index 6a8c156f1..84cf3ffd0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -38,6 +38,8 @@ 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
+	mkdir -p debian/dcpomatic/usr/share/libdcp
+	cp -ar $(CDIST_DIRECTORY)/share/libdcp/xsd debian/dcpomatic/usr/share/libdcp
 
 .PHONY: override_dh_strip
 override_dh_strip:
diff --git a/platform/osx/make_dmg.sh b/platform/osx/make_dmg.sh
index 95e8f8db0..3d910f8e0 100644
--- a/platform/osx/make_dmg.sh
+++ b/platform/osx/make_dmg.sh
@@ -207,6 +207,7 @@ function copy_resources {
     cp $prefix/src/dcpomatic/graphics/snap.png "$dest"
     cp $prefix/src/dcpomatic/graphics/sequence.png "$dest"
     cp $prefix/src/dcpomatic/graphics/me.jpg "$dest"
+    cp -r $prefix/share/libdcp/sdk "$dest"
 
     # i18n: DCP-o-matic .mo files
     for lang in de_DE es_ES fr_FR it_IT sv_SE nl_NL ru_RU pl_PL da_DK pt_PT pt_BR sk_SK cs_CZ uk_UA zh_CN tr_TR; do
diff --git a/platform/windows/wscript b/platform/windows/wscript
index b5dde858d..884126900 100644
--- a/platform/windows/wscript
+++ b/platform/windows/wscript
@@ -305,7 +305,14 @@ File "%graphics%/sequence.png"
 File "%graphics%/me.jpg"
 File "%graphics%/tick.png"
 File "%graphics%/no_tick.png"
-
+SetOutPath "$INSTDIR\\xsd"
+File "%cdist_deps%/shared/libdcp/xsd/SMPTE-429-7-2006-CPL.xsd"
+File "%cdist_deps%/shared/libdcp/xsd/SMPTE-429-8-2006-PKL.xsd"
+File "%cdist_deps%/shared/libdcp/xsd/SMPTE-429-9-2007-AM.xsd"
+File "%cdist_deps%/shared/libdcp/xsd/xmldsig-core-schema.xsd"
+File "%cdist_deps%/shared/libdcp/xsd/XMLSchema.dtd"
+File "%cdist_deps%/shared/libdcp/xsd/XMLSchema.xsd"
+File "%cdist_deps%/shared/libdcp/xsd/xml.xsd"
 SectionEnd
     """, file=f)
 
diff --git a/src/lib/verify_dcp_job.cc b/src/lib/verify_dcp_job.cc
index 5fb2a59c1..908cd53a7 100644
--- a/src/lib/verify_dcp_job.cc
+++ b/src/lib/verify_dcp_job.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2018 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2018-2019 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,6 +18,7 @@
 
 */
 
+#include "cross.h"
 #include "verify_dcp_job.h"
 #include "content.h"
 
@@ -59,7 +60,7 @@ VerifyDCPJob::update_stage (string s, optional<boost::filesystem::path> path)
 void
 VerifyDCPJob::run ()
 {
-	_notes = dcp::verify (_directories, bind (&VerifyDCPJob::update_stage, this, _1, _2), bind (&VerifyDCPJob::set_progress, this, _1, false));
+	_notes = dcp::verify (_directories, bind (&VerifyDCPJob::update_stage, this, _1, _2), bind (&VerifyDCPJob::set_progress, this, _1, false), shared_path() / "xsd");
 
 	bool failed = false;
 	BOOST_FOREACH (dcp::VerificationNote i, _notes) {
diff --git a/wscript b/wscript
index fd849caa6..9f45778e9 100644
--- a/wscript
+++ b/wscript
@@ -330,7 +330,7 @@ def configure(conf):
         conf.check_cfg(package='libdcp-1.0', atleast_version='1.6.7', args='--cflags', uselib_store='DCP', mandatory=True)
         conf.env.DEFINES_DCP = [f.replace('\\', '') for f in conf.env.DEFINES_DCP]
         conf.env.STLIB_DCP = ['dcp-1.0', 'asdcp-carl', 'kumu-carl', 'openjp2']
-        conf.env.LIB_DCP = ['glibmm-2.4', 'ssl', 'crypto', 'bz2', 'xslt']
+        conf.env.LIB_DCP = ['glibmm-2.4', 'ssl', 'crypto', 'bz2', 'xslt', 'xerces-c']
     else:
         conf.check_cfg(package='libdcp-1.0', atleast_version='1.6.7', args='--cflags --libs', uselib_store='DCP', mandatory=True)
         conf.env.DEFINES_DCP = [f.replace('\\', '') for f in conf.env.DEFINES_DCP]