X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=cscript;h=2338b0ab96bc5bff6b8cc4ab59eeef1020b00d23;hb=refs%2Ftags%2Fv2.10.7;hp=1377813986330e2511d82af0e94c3a4d54d5d735;hpb=a03e9a98ed667eb44c9dfbbeaf6da57f44992914;p=dcpomatic.git diff --git a/cscript b/cscript index 137781398..2338b0ab9 100644 --- a/cscript +++ b/cscript @@ -24,24 +24,27 @@ import shutil import os import copy -deb_build_depends = {'debhelper', 'python', 'g++', 'pkg-config', 'libssh-dev', 'libsndfile1-dev', 'libgtk2.0-dev'} +deb_build_depends = {'debhelper', 'python', 'g++', 'pkg-config', 'libsndfile1-dev', 'libgtk2.0-dev'} deb_depends = dict() -deb_depends_base = ['libc6', 'libssh-4', 'libsndfile1', 'libsamplerate0', 'libxmlsec1', 'libxmlsec1-openssl', 'libcurl3', 'libgtk2.0-0'] +deb_depends_base = ['libc6', 'libsndfile1', 'libsamplerate0', 'libxmlsec1', 'libxmlsec1-openssl', 'libcurl3', 'libgtk2.0-0'] deb_depends['12.04'] = copy.deepcopy(deb_depends_base) -deb_depends['12.04'].extend(['libboost-filesystem1.48.0', +deb_depends['12.04'].extend(['libssh-4', + 'libboost-filesystem1.48.0', 'libboost-thread1.48.0', 'libboost-regex1.48.0', 'libmagick++4', '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', +deb_depends['14.04'].extend(['libssh-4', + 'libboost-filesystem1.54.0', 'libboost-thread1.54.0', 'libboost-regex1.54.0', 'libmagick++5', @@ -50,10 +53,12 @@ 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(['libssh-4', + 'libboost-filesystem1.58.0', 'libboost-thread1.58.0', 'libboost-regex1.58.0', 'libmagick++-6.q16-5v5', @@ -61,33 +66,40 @@ deb_depends['15.10'].extend(['libboost-filesystem1.58.0', 'libboost-date-time1.58.0', 'libzip4', 'libwxgtk3.0-0v5', - 'libicu55']) - -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', + 'libicu55', + 'libnettle6']) + +deb_depends['16.10'] = copy.deepcopy(deb_depends_base) +deb_depends['16.10'].extend(['libssh-4', + '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', - 'libboost-thread1.49.0', - 'libboost-regex1.49.0', - 'libmagick++5', - 'libxml++2.6-2', - 'libboost-date-time1.49.0', - 'libzip2', - 'libcairomm-1.0-1', - 'libpangomm-1.4-1', - 'libicu48']) +deb_depends['7'].extend(['libssh-4', + 'libboost-filesystem1.49.0', + 'libboost-thread1.49.0', + 'libboost-regex1.49.0', + 'libmagick++5', + 'libxml++2.6-2', + 'libboost-date-time1.49.0', + 'libzip2', + 'libcairomm-1.0-1', + 'libpangomm-1.4-1', + 'libicu48', + 'libnettle4', + 'libnotify4']) deb_depends['8'] = copy.deepcopy(deb_depends_base) -deb_depends['8'].extend(['libboost-filesystem1.55.0', +deb_depends['8'].extend(['libssh-4', + 'libboost-filesystem1.55.0', 'libboost-thread1.55.0', 'libboost-date-time1.55.0', 'libboost-regex1.55.0', @@ -97,7 +109,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 +121,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 @@ -237,8 +251,8 @@ def dependencies(target): ffmpeg_options = {} return (('ffmpeg-cdist', '1d4a1a4', ffmpeg_options), - ('libdcp', '04def4c'), - ('libsub', '067c21c')) + ('libdcp', 'v1.4.4'), + ('libsub', 'v1.2.4')) def configure_options(target): opt = '' @@ -255,6 +269,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 +318,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', 'unstable']: target.set('CDIST_LOCALE_PREFIX', '/usr/share/locale') else: target.set('CDIST_LOCALE_PREFIX', '/usr/local/share/locale') @@ -364,7 +382,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')