X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=cscript;h=11c7728cb4e556696deca7657bf42139700f4c10;hb=00a492145a082e9ed9b02c5cab09f5d91b730ec9;hp=7f6275a6abca0366b546339f955b18a62108ea6a;hpb=76a85334b95212f095dcc08086dcb3e52d4dd127;p=dcpomatic.git

diff --git a/cscript b/cscript
index 7f6275a6a..11c7728cb 100644
--- a/cscript
+++ b/cscript
@@ -38,7 +38,8 @@ deb_depends['12.04'].extend(['libboost-filesystem1.48.0',
                              'libxml++2.6-2',
                              'libboost-date-time1.48.0',
                              'libzip2',
-                             'libicu48'])
+                             'libicu48',
+                             'libnettle4'])
 
 deb_depends['14.04'] = copy.deepcopy(deb_depends_base)
 deb_depends['14.04'].extend(['libboost-filesystem1.54.0',
@@ -50,10 +51,11 @@ deb_depends['14.04'].extend(['libboost-filesystem1.54.0',
                              'libzip2',
                              'libcairomm-1.0-1',
                              'libpangomm-1.4-1',
-                             'libicu52'])
+                             'libicu52',
+                             'libnettle4'])
 
-deb_depends['15.10'] = copy.deepcopy(deb_depends_base)
-deb_depends['15.10'].extend(['libboost-filesystem1.58.0',
+deb_depends['16.04'] = copy.deepcopy(deb_depends_base)
+deb_depends['16.04'].extend(['libboost-filesystem1.58.0',
                              'libboost-thread1.58.0',
                              'libboost-regex1.58.0',
                              'libmagick++-6.q16-5v5',
@@ -61,18 +63,20 @@ deb_depends['15.10'].extend(['libboost-filesystem1.58.0',
                              'libboost-date-time1.58.0',
                              'libzip4',
                              'libwxgtk3.0-0v5',
-                             'libicu55'])
+                             'libicu55',
+                             'libnettle6'])
 
-deb_depends['16.04'] = copy.deepcopy(deb_depends_base)
-deb_depends['16.04'].extend(['libboost-filesystem1.58.0',
-                             'libboost-thread1.58.0',
-                             'libboost-regex1.58.0',
+deb_depends['16.10'] = copy.deepcopy(deb_depends_base)
+deb_depends['16.10'].extend(['libboost-filesystem1.61.0',
+                             'libboost-thread1.61.0',
+                             'libboost-regex1.61.0',
                              'libmagick++-6.q16-5v5',
                              'libxml++2.6-2v5',
-                             'libboost-date-time1.58.0',
+                             'libboost-date-time1.61.0',
                              'libzip4',
                              'libwxgtk3.0-0v5',
-                             'libicu55'])
+                             'libicu57',
+                             'libnettle6'])
 
 deb_depends['7'] = copy.deepcopy(deb_depends_base)
 deb_depends['7'].extend(['libboost-filesystem1.49.0',
@@ -84,7 +88,9 @@ deb_depends['7'].extend(['libboost-filesystem1.49.0',
                              'libzip2',
                              'libcairomm-1.0-1',
                              'libpangomm-1.4-1',
-                             'libicu48'])
+                             'libicu48',
+                             'libnettle4',
+                             'libnotify4'])
 
 deb_depends['8'] = copy.deepcopy(deb_depends_base)
 deb_depends['8'].extend(['libboost-filesystem1.55.0',
@@ -97,7 +103,8 @@ deb_depends['8'].extend(['libboost-filesystem1.55.0',
                          'libwxgtk3.0-0',
                          'libxcb-xfixes0',
                          'libxcb-shape0',
-                         'libicu52'])
+                         'libicu52',
+                         'libnettle4'])
 
 deb_depends['unstable'] = copy.deepcopy(deb_depends_base)
 deb_depends['unstable'].extend(['libboost-filesystem1.58.0',
@@ -108,7 +115,8 @@ deb_depends['unstable'].extend(['libboost-filesystem1.58.0',
                                 'libgtk2.0-0',
                                 'libboost-date-time1.58.0',
                                 'libzip2',
-                                'libicu52'])
+                                'libicu52',
+                                'libnettle6'])
 
 def packages(name, packages, f):
     s = '%s: ' % name
@@ -236,9 +244,9 @@ def dependencies(target):
     else:
         ffmpeg_options = {}
 
-    return (('ffmpeg-cdist', 'aab2fb1', ffmpeg_options),
-            ('libdcp', 'a5bf0e4'),
-            ('libsub', '5a77646'))
+    return (('ffmpeg-cdist', '1d4a1a4', ffmpeg_options),
+            ('libdcp', 'v1.4.1'),
+            ('libsub', 'v1.2.1'))
 
 def configure_options(target):
     opt = ''
@@ -255,6 +263,10 @@ def configure_options(target):
             elif target.version == '7':
                 opt += ' --workaround-gssapi --static-xmlpp'
 
+    # Build Windows debug versions with static linking as I think gdb works better then
+    if target.debug and target.platform == 'windows':
+        opt += ' --static-dcpomatic'
+
     return opt
 
 def build(target, options):
@@ -300,7 +312,7 @@ def package_debian(target, cpu, version):
     target.set('CDIST_CONFIGURE', '"' + configure_options(target) + '"')
     if target.debug:
         target.set('CDIST_DEBUG_PACKAGE', '--dbg-package=dcpomatic-dbg')
-    if target.version in ['15.04', '15.10', '16.04', '8']:
+    if target.version in ['15.04', '15.10', '16.04', '16.10', '8']:
         target.set('CDIST_LOCALE_PREFIX', '/usr/share/locale')
     else:
         target.set('CDIST_LOCALE_PREFIX', '/usr/local/share/locale')
@@ -337,7 +349,10 @@ def package_rpm(target, cpu, version):
     if cpu == "amd64":
         cpu = "x86_64"
     else:
-        cpu = "i686"
+        if target.distro == 'centos' and target.version == '5':
+            cpu = "i386"
+        else:
+            cpu = "i686"
 
     print('Looking in %s/RPMS/%s/*.rpm' % (topdir, cpu))
     for p in glob.glob('%s/RPMS/%s/*.rpm' % (topdir, cpu)):
@@ -361,7 +376,7 @@ def package(target, version):
             return package_rpm(target, cpu, version)
     elif target.platform == 'osx':
         target.command('bash platform/osx/make_dmg.sh %s' % target.directory)
-        return os.path.abspath(glob.glob('build/platform/osx/DCP-o-matic*.dmg')[0])
+        return [os.path.abspath(x) for x in glob.glob('build/platform/osx/DCP-o-matic*.dmg')]
 
 def make_pot(target):
     target.command('./waf pot')
@@ -378,7 +393,9 @@ def make_manual(target):
 def test(target, test):
     if target.platform != 'windows':
         target.set('LC_ALL', 'C')
-        if test is None:
-            target.command('run/tests')
-        else:
-            target.command('run/tests --run_test=%s' % test)
+        cmd = 'run/tests '
+        if target.debug:
+            cmd += '--backtrace '
+        if test is not None:
+            cmd += '--run_test=%s' % test
+        target.command(cmd)