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',
'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',
'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',
'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',
'libgtk2.0-0',
'libboost-date-time1.58.0',
'libzip2',
- 'libicu52'])
+ 'libicu52',
+ 'libnettle6'])
def packages(name, packages, f):
s = '%s: ' % name
else:
ffmpeg_options = {}
- return (('ffmpeg-cdist', 'aab2fb1', ffmpeg_options),
- ('libdcp', 'fe3bb91'),
- ('libsub', 'd848eed'))
+ return (('ffmpeg-cdist', '1d4a1a4', ffmpeg_options),
+ ('libdcp', 'v1.4.4'),
+ ('libsub', 'v1.2.4'))
def configure_options(target):
opt = ''
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):
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')
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)):
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')
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)
projects / dcpomatic.git / blobdiff