Merge branch 'master' into 1.0-seek

[dcpomatic.git] / cscript

diff --git a/cscript b/cscript
index 76dd8c60ded0eabb6b8777c2ff7cc282a8cbf832..773d7cda22c963d3f3ed2d6e8e5ecb688a30096a 100644 (file)
--- a/cscript
+++ b/cscript
@@ -16,28 +16,29 @@ build_depends = {'debhelper': '8.0.0',
 depends = dict()
 
 depends['12.04'] = {'libc6': '2.15',
-                    'libssh-4', '0.5.2',
-                    'libboost-filesystem1.46.1', '1.46.1',
-                    'libboost-thread1.46.1', '1.46.1',
-                    'libsndfile1', '1.0.25',
-                    'libmagick++4', '8:6.6.9.7',
-                    'libxml++2.6-2', '2.34.1',
-                    'libgtk2.0-0', '2.24.10',
-                    'libxmlsec1', '1.2.14-1.2build1',
-                    'libxmlsec1-openssl', '1.2.14-1.2build1',
-                    'libboost-date-time1.46.1', '1.46.1',
-                    'libcurl3', '7.22.0-3ubuntu4',
-                    'libzip2', '0.10-1ubuntu1'}
+                    'libssh-4': '0.5.2',
+                    'libboost-filesystem1.46.1': '1.46.1',
+                    'libboost-thread1.46.1': '1.46.1',
+                    'libsndfile1': '1.0.25',
+                    'libmagick++4': '8:6.6.9.7',
+                    'libxml++2.6-2': '2.34.1',
+                    'libgtk2.0-0': '2.24.10',
+                    'libxmlsec1': '1.2.14-1.2build1',
+                    'libxmlsec1-openssl': '1.2.14-1.2build1',
+                    'libboost-date-time1.46.1': '1.46.1',
+                    'libcurl3': '7.22.0-3ubuntu4',
+                    'libzip2': '0.10-1ubuntu1'}
 
 depends['12.10'] = {'libc6': '2.15',
                     'libssh-4': '0.5.2',
-                    'libboost-filesystem1.49.0', '1.49.0',
-                    'libboost-thread1.49.0', '1.49.0',
+                    'libboost-filesystem1.49.0': '1.49.0',
+                    'libboost-thread1.49.0': '1.49.0',
                     'libsndfile1': '1.0.25',
                     'libmagick++5': '8:6.7.7.10',
                     'libxml++2.6-2': '2.34.2',
                     'libgtk2.0-0': '2.24.13',
                     'libxmlsec1': '1.2.18-2',
+                    'libxmlsec1-openssl': '1.2.18-2',
                     'libboost-date-time1.49.0': '1.49.0',
                     'libcurl3': '7.27.0-1ubuntu1',
                     'libzip2': '0.10.1-1.1'}
@@ -51,7 +52,7 @@ depends['13.04'] = {'libc6': '2.15',
                     'libxml++2.6-2': '2.34.2',
                     'libgtk2.0-0': '2.24.13',
                     'libxmlsec1': '1.2.18-2',
-                    'libxmlsec1-openssl': '1.2.14-1.2build1',
+                    'libxmlsec1-openssl': '1.2.18-2',
                     'libboost-date-time1.49.0': '1.49.0',
                     'libcurl3': '7.29.0-1ubuntu3',
                     'libzip2': '0.10.1-1.1'}
@@ -65,7 +66,7 @@ depends['13.10'] = {'libc6': '2.17-93',
                     'libxml++2.6-2': '2.36.0',
                     'libgtk2.0-0': '2.24.20',
                     'libxmlsec1': '1.2.18-2',
-                    'libxmlsec1-openssl': '1.2.14-1.2build1',
+                    'libxmlsec1-openssl': '1.2.18-2',
                     'libboost-date-time1.49.0': '1.49.0',
                     'libcurl3': '7.29.0-1ubuntu3',
                     'libzip2': '0.10.1-1.1'}
@@ -112,22 +113,9 @@ def make_control(version, bits, filename):
     print >>f,'  files (such as those from DVDs or Blu-Rays) for presentation on DCI-compliant'
     print >>f,'  digital projectors.'
 
-    print >>f,''
-    print >>f,'Package: dcpomatic-dbg'
-    if bits == 32:
-        print >>f,'Architecture: i386'
-    else:
-        print >>f,'Architecture: amd64'
-    print >>f,'Section: debug'
-    print >>f,'Priority: extra'
-    print >>f,'Depends: ${dcpomatic:Depends}, ${misc:Depends}'
-    print >>f,'Description: debugging symbols for dcpomatic'
-    print >>f,'  This package contains the debugging symbols for dcpomatic.'
-    print >>f,''
-
 def dependencies(target):
-    return (('ffmpeg-cdist', '0b7ef017aca8b572914518c759db1e234d8fc505'),
-            ('libdcp', 'v0.85'))
+    return (('ffmpeg-cdist', 'a629ea68a20d990b4e61c16067e91563d8d08f50'),
+            ('libdcp', 'v0.91'))
 
 def build(target):
     cmd = './waf configure --prefix=%s' % target.work_dir_cscript()
@@ -195,3 +183,8 @@ def make_manual(target):
     target.command('make')
     target.command('pdflatex colour.tex')
     return [os.path.abspath('pdf'), os.path.abspath('html'), os.path.abspath('colour.pdf')]
+
+def test(target):
+    if target.platform != 'windows':
+        target.set('LC_ALL', 'C')
+        target.command('run/tests')