X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=cscript;h=69458900b88142d13a7b79671897324854e00840;hp=1199c69caa7a77304eebaa3973006e9177053eb6;hb=2bd3a2f185b4755c4a01ba5c34c1d3e1f78e5c97;hpb=fc487d8428b5cf7b05c5c2586341c714c8e8db32 diff --git a/cscript b/cscript index 1199c69ca..69458900b 100644 --- a/cscript +++ b/cscript @@ -2,145 +2,113 @@ # # 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.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 @@ -225,7 +193,7 @@ def make_spec(filename, version, target): 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', 'sk_SK', 'cs_CZ']: + 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) @@ -235,8 +203,15 @@ def make_spec(filename, version, target): 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) - print('CXXFLAGS="-I%s/include" LDFLAGS="-L%s/lib" ./waf configure --prefix=%%{buildroot}/usr --install-prefix=/usr %s' % (target.directory, target.directory, configure_options(target)), file=f) + print('export PKG_CONFIG_PATH=%s/lib/pkgconfig:%s/lib64/pkgconfig:/usr/local/lib/pkgconfig:/usr/local/lib64/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) @@ -261,9 +236,9 @@ def dependencies(target): else: ffmpeg_options = {} - return (('ffmpeg-cdist', '96d67de', ffmpeg_options), - ('libdcp', 'v1.3.0'), - ('libsub', 'v1.1.0')) + return (('ffmpeg-cdist', '1d4a1a4', ffmpeg_options), + ('libdcp', 'eec238a'), + ('libsub', '067c21c')) def configure_options(target): opt = '' @@ -290,15 +265,19 @@ def build(target, options): target.command('./waf install') def package_windows(target): - shutil.copyfile('build/platform/windows/installer.%s.nsi' % target.bits, 'build/platform/windows/installer2.%s.nsi' % target.bits) - target.command('sed -i "s~%%resources%%~%s/platform/windows~g" build/platform/windows/installer2.%s.nsi' % (os.getcwd(), target.bits)) - target.command('sed -i "s~%%graphics%%~%s/graphics~g" build/platform/windows/installer2.%s.nsi' % (os.getcwd(), target.bits)) - target.command('sed -i "s~%%static_deps%%~%s~g" build/platform/windows/installer2.%s.nsi' % (target.windows_prefix, target.bits)) - target.command('sed -i "s~%%cdist_deps%%~%s~g" build/platform/windows/installer2.%s.nsi' % (target.directory, target.bits)) - target.command('sed -i "s~%%mingw%%~%s~g" build/platform/windows/installer2.%s.nsi' % (target.mingw_path, target.bits)) - target.command('sed -i "s~%%binaries%%~%s/build~g" build/platform/windows/installer2.%s.nsi' % (os.getcwd(), target.bits)) - target.command('sed -i "s~%%bits%%~32~g" build/platform/windows/installer2.%s.nsi' % target.bits) - target.command('makensis build/platform/windows/installer2.%s.nsi' % target.bits) + identifier = '' + if target.version is not None: + identifier = '%s.' % target.version + identifier += '%d' % target.bits + shutil.copyfile('build/platform/windows/installer.%s.nsi' % identifier, 'build/platform/windows/installer2.%s.nsi' % identifier) + target.command('sed -i "s~%%resources%%~%s/platform/windows~g" build/platform/windows/installer2.%s.nsi' % (os.getcwd(), identifier)) + target.command('sed -i "s~%%graphics%%~%s/graphics~g" build/platform/windows/installer2.%s.nsi' % (os.getcwd(), identifier)) + target.command('sed -i "s~%%static_deps%%~%s~g" build/platform/windows/installer2.%s.nsi' % (target.windows_prefix, identifier)) + target.command('sed -i "s~%%cdist_deps%%~%s~g" build/platform/windows/installer2.%s.nsi' % (target.directory, identifier)) + target.command('sed -i "s~%%mingw%%~%s~g" build/platform/windows/installer2.%s.nsi' % (target.mingw_path, identifier)) + target.command('sed -i "s~%%binaries%%~%s/build~g" build/platform/windows/installer2.%s.nsi' % (os.getcwd(), identifier)) + target.command('sed -i "s~%%bits%%~32~g" build/platform/windows/installer2.%s.nsi' % identifier) + target.command('makensis build/platform/windows/installer2.%s.nsi' % identifier) return os.path.abspath(glob.glob('build/platform/windows/*%s*.exe' % target.bits)[0]) def package_debian(target, cpu, version): @@ -321,7 +300,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') @@ -349,13 +328,19 @@ 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": 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)): @@ -393,7 +378,12 @@ def make_manual(target): target.command('pdflatex colour.tex') return [os.path.abspath('pdf'), os.path.abspath('html'), os.path.abspath('colour.pdf')] -def test(target): +def test(target, test): if target.platform != 'windows': target.set('LC_ALL', 'C') - target.command('run/tests') + cmd = 'run/tests ' + if target.debug: + cmd += '--backtrace ' + if test is not None: + cmd += '--run_test=%s' % test + target.command(cmd)