X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=cscript;h=56a555fa0bed00e389179a5270b5f8a29aa5d8a8;hb=fe8f27d177a93fa51f91e27a2b11c064f03a570b;hp=4bae748e0e376b3139c5c821a7757d60c262862b;hpb=c62b274078d341b3d137da1c9d57d72bfa722e1f;p=dcpomatic.git diff --git a/cscript b/cscript index 4bae748e0..56a555fa0 100644 --- a/cscript +++ b/cscript @@ -1,275 +1,233 @@ # -*- mode: python -*- # -# Copyright (C) 2012-2015 Carl Hetherington +# Copyright (C) 2012-2016 Carl Hetherington # -# This program is free software; you can redistribute it and/or modify +# This file is part of DCP-o-matic. +# +# DCP-o-matic is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. # -# This program is distributed in the hope that it will be useful, +# DCP-o-matic is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# along with DCP-o-matic. If not, see . # +from __future__ import print_function import glob import shutil import os +import copy -deb_build_depends = {'debhelper': '8.0.0', - 'python': '2.7.3', - 'g++': '4:4.6.3', - 'pkg-config': '0.26', - 'libssh-dev': '0.5.2', - 'libsndfile1-dev': '1.0.25', - 'libgtk2.0-dev': '2.24.10'} +deb_build_depends = {'debhelper', 'python', 'g++', 'pkg-config', 'libssh-dev', 'libsndfile1-dev', 'libgtk2.0-dev'} deb_depends = dict() -deb_depends['12.04'] = {'libc6': '2.15', - 'libssh-4': '0.5.2', - 'libboost-filesystem1.48.0': '1.48.0-3', - 'libboost-thread1.48.0': '1.48.0-3', - 'libboost-regex1.48.0': '1.48.0-3', - '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.48.0': '1.48.0-3', - 'libcurl3': '7.22.0-3ubuntu4', - 'libzip2': '0.10-1ubuntu1', - 'libsamplerate0': '0.1.8-4', - 'libicu48': '4.8.1.1-3'} - -deb_depends['14.04'] = {'libc6': '2.19-0ubuntu6', - 'libssh-4': '0.6.1-0ubuntu3', - 'libboost-filesystem1.54.0': '1.54.0-4ubuntu3', - 'libboost-thread1.54.0': '1.54.0-4ubuntu3', - 'libboost-regex1.54.0': '1.54.0-4ubuntu3', - 'libsndfile1': '1.0.25-7ubuntu2', - 'libmagick++5': '8:6.7.7.10-6ubuntu3', - 'libxml++2.6-2': '2.36.0-2ubuntu1', - 'libgtk2.0-0': '2.24.23-0ubuntu1', - 'libxmlsec1': '1.2.18-2ubuntu1', - 'libxmlsec1-openssl': '1.2.18-2ubuntu1', - 'libboost-date-time1.54.0': '1.54.0-4ubuntu3', - 'libcurl3': '7.35.0-1ubuntu2', - 'libzip2': '0.10.1-1.2', - 'libsamplerate0': '0.1.8-7', - 'libcairomm-1.0-1': '1.10.0-1ubuntu3', - 'libpangomm-1.4-1': '2.34.0-1ubuntu1', - 'libicu52': '52.1-3'} - -deb_depends['15.04'] = {'libc6': '2.21-0ubuntu4', - 'libssh-4': '0.6.3-3ubuntu3', - 'libboost-filesystem1.55.0': '1.55.0+dfsg-3ubuntu2', - 'libboost-thread1.55.0': '1.55.0+dfsg-3ubuntu2', - 'libboost-regex1.55.0': '1.55.0+dfsg-3ubuntu2', - 'libsndfile1': '1.0.25-9.1', - 'libmagick++-6.q16-5': '8:6.8.9.9-5', - 'libxml++2.6-2': '2.36.0-2.1', - 'libgtk2.0-0': '2.24.27-0ubuntu1', - 'libxmlsec1': '1.2.20-2ubuntu2', - 'libxmlsec1-openssl': '1.2.20-2ubuntu2', - 'libboost-date-time1.55.0': '1.55.0+dfsg-3ubuntu2', - 'libcurl3': '7.38.0-3ubuntu2', - 'libzip2': '0.11.2-1.2', - 'libwxgtk3.0-0': '3.0.2-1', - 'libsamplerate0': '0.1.8-8', - 'libicu52': '52.1-8'} - -deb_depends['15.10'] = {'libc6': '2.21-0ubuntu4', - 'libssh-4': '0.6.3-3ubuntu3', - 'libboost-filesystem1.58.0': '1.58.0+dfsg-3.1ubuntu1', - 'libboost-thread1.58.0': '1.58.0+dfsg-3.1ubuntu1', - 'libboost-regex1.58.0': '1.58.0+dfsg-3.1ubuntu1', - 'libsndfile1': '1.0.25-9.1', - 'libmagick++-6.q16-5v5': '8:6.8.9.9-5ubuntu2', - 'libxml++2.6-2v5': '2.38.1-2', - 'libgtk2.0-0': '2.24.28-1ubuntu1', - 'libxmlsec1': '1.2.20-2ubuntu3', - 'libxmlsec1-openssl': '1.2.20-2ubuntu3', - 'libboost-date-time1.58.0': '1.58.0+dfsg-3.1ubuntu1', - 'libcurl3': '7.43.0-1ubuntu2', - 'libzip4': '1.0.1-0ubuntu1', - 'libwxgtk3.0-0v5': '3.0.2+dfsg-1.2', - 'libsamplerate0': '0.1.8-8', - 'libicu55': '55.1-4ubuntu1'} - -deb_depends['7'] = {'libc6': '2.13', - 'libssh-4': '0.5.4', - 'libboost-filesystem1.49.0': '1.49.0', - 'libboost-thread1.49.0': '1.49.0', - 'libboost-regex1.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.10', - 'libxmlsec1': '1.2.18', - 'libboost-date-time1.49.0': '1.49.0', - 'libxmlsec1-openssl': '1.2.18', - 'libcurl3': '7.26.0', - 'libzip2': '0.10.1', - 'libcairomm-1.0-1': '1.10.0-1', - 'libpangomm-1.4-1': '2.28.4-1', - 'libsamplerate0': '0.1.8-5', - 'libicu48': '4.8.1.1-12+deb7u3'} - -deb_depends['8'] = {'libc6': '2.19-18', - 'libssh-4': '0.6.3-4', - 'libboost-filesystem1.55.0': '1.55.0', - 'libboost-thread1.55.0': '1.55.0', - 'libboost-date-time1.55.0': '1.55.0', - 'libboost-regex1.55.0': '1.55.0', - 'libsndfile1': '1.0.25-9.1', - 'libmagick++-6.q16-5': '8:6.8.9.9-5', - 'libxml++2.6-2': '2.36.0', - 'libgtk2.0-0': '2.24.25', - 'libxmlsec1': '1.2.20', - 'libxmlsec1-openssl': '1.2.20', - 'libcurl3': '7.38.0', - 'libzip2': '0.11.2', - 'libwxgtk3.0-0': '3.0.2', - 'libxcb-xfixes0': '1.10', - 'libxcb-shape0': '1.10', - 'libsamplerate0': '0.1.8-8', - 'libicu52': '52.1-8+deb8u2'} - -deb_depends['unstable'] = {'libc6': '2.19-22', - 'libssh-4': '0.6.3-4.1+b1', - 'libboost-filesystem1.58.0': '1.58.0+dfsg-4', - 'libboost-thread1.58.0': '1.58.0+dfsg-4', - 'libboost-regex1.58.0': '1.58.0+dfsg-4', - 'libsndfile1': '1.0.25-9.1', - 'libmagick++-6.q16-5v5': '8:6.8.9.9-6', - 'libxml++2.6-2v5': '2.40.1-1', - 'libgtk2.0-0': '2.24.28-1', - 'libxmlsec1': '1.2.20-2+b2', - 'libboost-date-time1.58.0': '1.58.0+dfsg-4', - 'libxmlsec1-openssl': '1.2.20-2+b2', - 'libcurl3': '7.45.0-1+b1', - 'libzip2': '0.11.2-1.2', - 'libsamplerate0': '0.1.8-8', - 'libicu52': '52.1-10'} +deb_depends_base = ['libc6', 'libssh-4', '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', + 'libboost-thread1.48.0', + 'libboost-regex1.48.0', + 'libmagick++4', + 'libxml++2.6-2', + 'libboost-date-time1.48.0', + 'libzip2', + 'libicu48']) + +deb_depends['14.04'] = copy.deepcopy(deb_depends_base) +deb_depends['14.04'].extend(['libboost-filesystem1.54.0', + 'libboost-thread1.54.0', + 'libboost-regex1.54.0', + 'libmagick++5', + 'libxml++2.6-2', + 'libboost-date-time1.54.0', + 'libzip2', + 'libcairomm-1.0-1', + 'libpangomm-1.4-1', + 'libicu52']) + +deb_depends['15.10'] = copy.deepcopy(deb_depends_base) +deb_depends['15.10'].extend(['libboost-filesystem1.58.0', + 'libboost-thread1.58.0', + 'libboost-regex1.58.0', + 'libmagick++-6.q16-5v5', + 'libxml++2.6-2v5', + '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', + 'libmagick++-6.q16-5v5', + 'libxml++2.6-2v5', + 'libboost-date-time1.58.0', + 'libzip4', + 'libwxgtk3.0-0v5', + 'libicu55']) + +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['8'] = copy.deepcopy(deb_depends_base) +deb_depends['8'].extend(['libboost-filesystem1.55.0', + 'libboost-thread1.55.0', + 'libboost-date-time1.55.0', + 'libboost-regex1.55.0', + 'libmagick++-6.q16-5', + 'libxml++2.6-2', + 'libzip2', + 'libwxgtk3.0-0', + 'libxcb-xfixes0', + 'libxcb-shape0', + 'libicu52']) + +deb_depends['unstable'] = copy.deepcopy(deb_depends_base) +deb_depends['unstable'].extend(['libboost-filesystem1.58.0', + 'libboost-thread1.58.0', + 'libboost-regex1.58.0', + 'libmagick++-6.q16-5v5', + 'libxml++2.6-2v5', + 'libgtk2.0-0', + 'libboost-date-time1.58.0', + 'libzip2', + 'libicu52']) def packages(name, packages, f): s = '%s: ' % name for p in packages: s += str(p) + ', ' - print >>f,s[:-2] + print(s[:-2], file=f) def make_control(debian_version, bits, filename, debug): f = open(filename, 'w') - print >>f,'Source: dcpomatic' - print >>f,'Section: video' - print >>f,'Priority: extra' - print >>f,'Maintainer: Carl Hetherington ' + print('Source: dcpomatic', file=f) + print('Section: video', file=f) + print('Priority: extra', file=f) + print('Maintainer: Carl Hetherington ', file=f) packages('Build-Depends', deb_build_depends, f) - print >>f,'Standards-Version: 3.9.3' - print >>f,'Homepage: http://dcpomatic.com/' - print >>f,'' - print >>f,'Package: dcpomatic' + print('Standards-Version: 3.9.3', file=f) + print('Homepage: http://dcpomatic.com/', file=f) + print('', file=f) + print('Package: dcpomatic', file=f) if bits == 32: - print >>f,'Architecture: i386' + print('Architecture: i386', file=f) else: - print >>f,'Architecture: amd64' + print('Architecture: amd64', file=f) packages('Depends', deb_depends[debian_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('Description: Generator of Digital Cinema Packages (DCPs)', file=f) + print(' DCP-o-matic generates Digital Cinema Packages (DCPs) from video and audio', file=f) + print(' files (such as those from DVDs or Blu-Rays) for presentation on DCI-compliant', file=f) + print(' digital projectors.', file=f) if debug: - print >>f,'' - print >>f,'Package: dcpomatic-dbg' + print('', file=f) + print('Package: dcpomatic-dbg', file=f) if bits == 32: - print >>f,'Architecture: i386' + print('Architecture: i386', file=f) else: - print >>f,'Architecture: amd64' - print >>f,'Section: debug' - print >>f,'Priority: extra' + print('Architecture: amd64', file=f) + print('Section: debug', file=f) + print('Priority: extra', file=f) packages('Depends', deb_depends[debian_version], f) - print >>f,'Description: debugging symbols for dcpomatic' - print >>f,' This package contains the debugging symbols for dcpomatic.' - print >>f,'' + print('Description: debugging symbols for dcpomatic', file=f) + print(' This package contains the debugging symbols for dcpomatic.', file=f) + print('', file=f) def make_spec(filename, version, target): """Make a .spec file for a RPM build""" f = open(filename, 'w') - print >>f,'Summary:A program that generates Digital Cinema Packages (DCPs) from video and audio files' - print >>f,'Name:dcpomatic2' - print >>f,'Version:%s' % version - print >>f,'Release:1%{?dist}' - print >>f,'License:GPL' - print >>f,'Group:Applications/Multimedia' - print >>f,'URL:http://dcpomatic.com/' - print >>f,'Requires: ImageMagick-c++, glibmm24, libzip' - print >>f,'' - print >>f,'%description' - 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,'%files' - print >>f,'%{_bindir}/dcpomatic2' - print >>f,'%{_bindir}/dcpomatic2_batch' - print >>f,'%{_bindir}/dcpomatic2_cli' - print >>f,'%{_bindir}/dcpomatic2_create' - print >>f,'%{_bindir}/dcpomatic2_kdm' - print >>f,'%{_bindir}/dcpomatic2_server' - print >>f,'%{_bindir}/dcpomatic2_server_cli' - print >>f,'%{_bindir}/dcpomatic2_kdm_cli' - print >>f,'%{_datadir}/applications/dcpomatic2.desktop' - print >>f,'%{_datadir}/applications/dcpomatic2_batch.desktop' - print >>f,'%{_datadir}/applications/dcpomatic2_server.desktop' - print >>f,'%{_datadir}/applications/dcpomatic2_kdm.desktop' - print >>f,'%{_datadir}/dcpomatic2/dcpomatic2_server_small.png' - print >>f,'%{_datadir}/dcpomatic2/LiberationSans-Regular.ttf' - print >>f,'%{_datadir}/dcpomatic2/LiberationSans-Italic.ttf' - print >>f,'%{_datadir}/dcpomatic2/LiberationSans-Bold.ttf' - print >>f,'%{_datadir}/dcpomatic2/splash.png' + print('Summary:A program that generates Digital Cinema Packages (DCPs) from video and audio files', file=f) + print('Name:dcpomatic2', file=f) + print('Version:%s' % version, file=f) + print('Release:1%{?dist}', file=f) + print('License:GPL', file=f) + print('Group:Applications/Multimedia', file=f) + print('URL:http://dcpomatic.com/', file=f) + print('Requires: ImageMagick-c++, glibmm24, libzip', file=f) + print('', file=f) + print('%description', file=f) + print('DCP-o-matic generates Digital Cinema Packages (DCPs) from video and audio ', file=f) + print('files (such as those from DVDs or Blu-Rays) for presentation on DCI-compliant ', file=f) + print('digital projectors.', file=f) + print('', file=f) + print('%files', file=f) + print('%{_bindir}/dcpomatic2', file=f) + print('%{_bindir}/dcpomatic2_batch', file=f) + print('%{_bindir}/dcpomatic2_cli', file=f) + print('%{_bindir}/dcpomatic2_create', file=f) + print('%{_bindir}/dcpomatic2_kdm', file=f) + print('%{_bindir}/dcpomatic2_server', file=f) + print('%{_bindir}/dcpomatic2_server_cli', file=f) + print('%{_bindir}/dcpomatic2_kdm_cli', file=f) + print('%{_datadir}/applications/dcpomatic2.desktop', file=f) + print('%{_datadir}/applications/dcpomatic2_batch.desktop', file=f) + print('%{_datadir}/applications/dcpomatic2_server.desktop', file=f) + print('%{_datadir}/applications/dcpomatic2_kdm.desktop', file=f) + print('%{_datadir}/dcpomatic2/dcpomatic2_server_small.png', file=f) + print('%{_datadir}/dcpomatic2/LiberationSans-Regular.ttf', file=f) + print('%{_datadir}/dcpomatic2/LiberationSans-Italic.ttf', file=f) + print('%{_datadir}/dcpomatic2/LiberationSans-Bold.ttf', file=f) + print('%{_datadir}/dcpomatic2/splash.png', file=f) for r in ['128x128', '16x16', '22x22', '256x256', '32x32', '48x48', '512x512', '64x64']: - print >>f,'%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2.png' % r - print >>f,'%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_batch.png' % r - print >>f,'%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_kdm.png' % r - print >>f,'%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_server.png' % r - for l in ['de_DE', 'es_ES', 'fr_FR', 'it_IT', 'sv_SE', 'nl_NL', 'ru_RU', 'pl_PL', 'da_DK', 'pt_PT']: - print >>f,'%%{_datadir}/locale/%s/LC_MESSAGES/dcpomatic2.mo' % l - print >>f,'%%{_datadir}/locale/%s/LC_MESSAGES/libdcpomatic2-wx.mo' % l - print >>f,'%%{_datadir}/locale/%s/LC_MESSAGES/libdcpomatic2.mo' % l - print >>f,'' - print >>f,'%prep' - print >>f,'rm -rf $RPM_BUILD_DIR/dcpomatic-%s' % version - print >>f,'tar xjf $RPM_SOURCE_DIR/dcpomatic-%s.tar.bz2' % version - print >>f,'%build' - print >>f,'cd dcpomatic-%s' % version - print >>f,'export PKG_CONFIG_PATH=%s/lib/pkgconfig:/usr/local/lib/pkgconfig' % target.directory - print >>f,'CXXFLAGS="-I%s/include" LDFLAGS="-L%s/lib" ./waf configure --prefix=%%{buildroot}/usr --install-prefix=/usr %s' % (target.directory, target.directory, configure_options(target)) - print >>f,'./waf' - print >>f,'%install' - print >>f,'cd dcpomatic-%s' % version - print >>f,'./waf install' - print >>f,'' - print >>f,'%post' - print >>f,'/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :' - print >>f,'' - print >>f,'%postun' - print >>f,'if [ $1 -eq 0 ] ; then' - print >>f,' /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null' - print >>f,' /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :' - print >>f,'fi' - print >>f,'' - print >>f,'%posttrans' - print >>f,'/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :' + print('%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2.png' % r, file=f) + print('%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_batch.png' % r, file=f) + print('%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_kdm.png' % r, file=f) + print('%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_server.png' % r, file=f) + for l in ['de_DE', 'es_ES', 'fr_FR', 'it_IT', 'sv_SE', 'nl_NL', 'ru_RU', 'pl_PL', 'da_DK', 'pt_PT', 'pt_BR', 'sk_SK', 'cs_CZ', 'uk_UA', 'zh_CN']: + print('%%{_datadir}/locale/%s/LC_MESSAGES/dcpomatic2.mo' % l, file=f) + print('%%{_datadir}/locale/%s/LC_MESSAGES/libdcpomatic2-wx.mo' % l, file=f) + print('%%{_datadir}/locale/%s/LC_MESSAGES/libdcpomatic2.mo' % l, file=f) + print('', file=f) + print('%prep', file=f) + print('rm -rf $RPM_BUILD_DIR/dcpomatic-%s' % version, file=f) + print('tar xjf $RPM_SOURCE_DIR/dcpomatic-%s.tar.bz2' % version, file=f) + print('%build', file=f) + print('cd dcpomatic-%s' % version, file=f) + print('export PKG_CONFIG_PATH=%s/lib/pkgconfig:%s/lib64/pkgconfig:/usr/local/lib/pkgconfig' % (target.directory, target.directory), file=f) + + if target.distro == 'centos' and target.version == '5': + prefix = 'BUILDROOT/usr' + else: + prefix = '%{buildroot}/usr' + + print('CXXFLAGS="-I%s/include" LDFLAGS="-L%s/lib" ./waf configure --prefix=%s --install-prefix=/usr %s' % + (target.directory, target.directory, prefix, configure_options(target)), file=f) + print('./waf', file=f) + print('%install', file=f) + print('cd dcpomatic-%s' % version, file=f) + print('./waf install', file=f) + print('', file=f) + print('%post', file=f) + print('/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :', file=f) + print('', file=f) + print('%postun', file=f) + print('if [ $1 -eq 0 ] ; then', file=f) + print(' /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null', file=f) + print(' /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :', file=f) + print('fi', file=f) + print('', file=f) + print('%posttrans', file=f) + print('/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :', file=f) def dependencies(target): @@ -278,9 +236,9 @@ def dependencies(target): else: ffmpeg_options = {} - return (('ffmpeg-cdist', '938d9af', ffmpeg_options), - ('libdcp', '257b936'), - ('libsub', 'e281262')) + return (('ffmpeg-cdist', 'aab2fb1', ffmpeg_options), + ('libdcp', '702a013'), + ('libsub', 'f0b58ee')) def configure_options(target): opt = '' @@ -289,7 +247,7 @@ def configure_options(target): if target.platform == 'windows': opt += ' --target-windows' elif target.platform == 'linux': - opt += ' --static-dcpomatic --static-openjpeg --static-wxwidgets --static-ffmpeg --static-dcp --static-sub --static-cxml' + opt += ' --static-dcpomatic --static-wxwidgets --static-ffmpeg --static-dcp --static-sub --static-cxml' if target.distro == 'centos': opt += ' --static-xmlsec --static-ssh --disable-tests' if target.version == '6.5': @@ -322,7 +280,7 @@ def package_debian(target, cpu, version): 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) + print('dcpomatic_%s-1_%s.deb video extra' % (version, cpu), file=f) shutil.rmtree('build/deb', ignore_errors=True) os.makedirs('build/deb') @@ -338,7 +296,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', '8']: + if target.version in ['15.04', '15.10', '16.04', '8']: target.set('CDIST_LOCALE_PREFIX', '/usr/share/locale') else: target.set('CDIST_LOCALE_PREFIX', '/usr/local/share/locale') @@ -366,7 +324,10 @@ def package_rpm(target, cpu, version): ) make_spec('build/platform/linux/dcpomatic2.spec', version, target) - target.command('rpmbuild --define \'_topdir %s\' -bb build/platform/linux/dcpomatic2.spec' % topdir) + cmd = 'rpmbuild --define \'_topdir %s\' -bb build/platform/linux/dcpomatic2.spec' % topdir + if target.distro == 'centos' and target.version == '5': + cmd += ' --buildroot %s/BUILD/dcpomatic-%s/BUILDROOT' % (topdir, version) + target.command(cmd) rpms = [] if cpu == "amd64": @@ -374,9 +335,9 @@ def package_rpm(target, cpu, version): else: cpu = "i686" - print 'Looking in %s/RPMS/%s/*.rpm' % (topdir, cpu) + print('Looking in %s/RPMS/%s/*.rpm' % (topdir, cpu)) for p in glob.glob('%s/RPMS/%s/*.rpm' % (topdir, cpu)): - print 'found %s' % p + print('found %s' % p) rpms.append(os.path.abspath(p)) return rpms @@ -386,11 +347,11 @@ def package(target, version): return package_windows(target) elif target.platform == 'linux': if target.bits == 32: - cpu = 'i386' + cpu = 'i386' else: - cpu = 'amd64' + cpu = 'amd64' - if target.distro == 'debian' or target.distro == 'ubuntu': + if target.distro == 'debian' or target.distro == 'ubuntu': return package_debian(target, cpu, version) elif target.distro == 'centos' or target.distro == 'fedora': return package_rpm(target, cpu, version) @@ -402,7 +363,7 @@ def make_pot(target): target.command('./waf pot') return [os.path.abspath('build/src/lib/libdcpomatic.pot'), os.path.abspath('build/src/wx/libdcpomatic-wx.pot'), - os.path.abspath('build/src/tools/dcpomatic.pot')] + os.path.abspath('build/src/tools/dcpomatic.pot')] def make_manual(target): os.chdir('doc/manual')