X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=cscript;h=4103f936675791d5545496f44f1aa95902b1a9cc;hb=259486c47986e8cfe2d81462cb1a60a8d096e1fc;hp=ba99f5557a23a83db4bc6337f3433695a29480d0;hpb=58431f2de00bd5a68e474f39d987a7f7bf10340f;p=dcpomatic.git

diff --git a/cscript b/cscript
index ba99f5557..4103f9366 100644
--- a/cscript
+++ b/cscript
@@ -38,6 +38,7 @@ depends['12.10'] = {'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.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'}
@@ -90,7 +91,7 @@ def packages(name, packages, f):
         s += str(p) + ', '
     print >>f,s[:-2]
 
-def make_control(version, bits, filename):
+def make_control(version, bits, filename, debug):
     f = open(filename, 'w')
     print >>f,'Source: dcpomatic'
     print >>f,'Section: video'
@@ -107,29 +108,31 @@ def make_control(version, bits, filename):
         print >>f,'Architecture: amd64'
 
     packages('Depends', depends[version], f)
+
     print >>f,'Description: Generator of Digital Cinema Packages (DCPs)'
     print >>f,'  DCP-o-matic generates Digital Cinema Packages (DCPs) from video and audio'
     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,''
+    if debug:
+        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'
+        packages('Depends', depends[version], f)
+        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', '5ac3a6af077c10f07c31954c372a8f29e4e18e2a'),
+            ('libdcp', '054cc86'))
 
-def build(target):
+def build(target, options):
     cmd = './waf configure --prefix=%s' % target.work_dir_cscript()
     if target.platform == 'windows':
         cmd += ' --target-windows'
@@ -158,7 +161,7 @@ def package(target, version):
         else:
             cpu = 'amd64'
 
-        make_control(target.version, target.bits, 'debian/control')
+        make_control(target.version, target.bits, 'debian/control', target.debug)
         target.command('./waf dist')
         f = open('debian/files', 'w')
         print >>f,'dcpomatic_%s-1_%s.deb video extra' % (version, cpu)
@@ -195,3 +198,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')