X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=cscript;h=82c39a0f8557c3fef7a90f29be7e87700c81340c;hb=7acc2f5d8edc157c206012cb83167845ec7d09c7;hp=ec3f35f39ecf4ab802f5e1e1a164784e7676b11b;hpb=9c2bd2ca8a541b65d5a9c8501ed2e0871fb68f29;p=dcpomatic.git diff --git a/cscript b/cscript index ec3f35f39..82c39a0f8 100644 --- a/cscript +++ b/cscript @@ -2,139 +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', 'python', 'g++', 'pkg-config', 'libssh-dev', 'libsndfile1-dev', 'libgtk2.0-dev'} deb_depends = dict() -deb_depends['12.04'] = {'libc6', - 'libssh-4', - 'libboost-filesystem1.48.0', - 'libboost-thread1.48.0', - 'libboost-regex1.48.0', - 'libsndfile1', - 'libmagick++4', - 'libxml++2.6-2', - 'libgtk2.0-0', - 'libxmlsec1', - 'libxmlsec1-openssl', - 'libboost-date-time1.48.0', - 'libcurl3', - 'libzip2', - 'libsamplerate0', - 'libicu48'} - -deb_depends['14.04'] = {'libc6', - 'libssh-4', - 'libboost-filesystem1.54.0', - 'libboost-thread1.54.0', - 'libboost-regex1.54.0', - 'libsndfile1', - 'libmagick++5', - 'libxml++2.6-2', - 'libgtk2.0-0', - 'libxmlsec1', - 'libxmlsec1-openssl', - 'libboost-date-time1.54.0', - 'libcurl3', - 'libzip2', - 'libsamplerate0', - 'libcairomm-1.0-1', - 'libpangomm-1.4-1', - 'libicu52'} - -deb_depends['15.10'] = {'libc6', - 'libssh-4', - 'libboost-filesystem1.58.0', - 'libboost-thread1.58.0', - 'libboost-regex1.58.0', - 'libsndfile1', - 'libmagick++-6.q16-5v5', - 'libxml++2.6-2v5', - 'libgtk2.0-0', - 'libxmlsec1', - 'libxmlsec1-openssl', - 'libboost-date-time1.58.0', - 'libcurl3', - 'libzip4', - 'libwxgtk3.0-0v5', - 'libsamplerate0', - 'libicu55'} - -deb_depends['7'] = {'libc6', - 'libssh-4', - 'libboost-filesystem1.49.0', - 'libboost-thread1.49.0', - 'libboost-regex1.49.0', - 'libsndfile1', - 'libmagick++5', - 'libxml++2.6-2', - 'libgtk2.0-0', - 'libxmlsec1', - 'libboost-date-time1.49.0', - 'libxmlsec1-openssl', - 'libcurl3', - 'libzip2', - 'libcairomm-1.0-1', - 'libpangomm-1.4-1', - 'libsamplerate0', - 'libicu48'} - -deb_depends['8'] = {'libc6', - 'libssh-4', - 'libboost-filesystem1.55.0', - 'libboost-thread1.55.0', - 'libboost-date-time1.55.0', - 'libboost-regex1.55.0', - 'libsndfile1', - 'libmagick++-6.q16-5', - 'libxml++2.6-2', - 'libgtk2.0-0', - 'libxmlsec1', - 'libxmlsec1-openssl', - 'libcurl3', - 'libzip2', - 'libwxgtk3.0-0', - 'libxcb-xfixes0', - 'libxcb-shape0', - 'libsamplerate0', - 'libicu52'} - -deb_depends['unstable'] = {'libc6', - 'libssh-4', - 'libboost-filesystem1.58.0', - 'libboost-thread1.58.0', - 'libboost-regex1.58.0', - 'libsndfile1', - 'libmagick++-6.q16-5v5', - 'libxml++2.6-2v5', - 'libgtk2.0-0', - 'libxmlsec1', - 'libboost-date-time1.58.0', - 'libxmlsec1-openssl', - 'libcurl3', - 'libzip2', - 'libsamplerate0', - 'libicu52'} +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 @@ -230,7 +204,14 @@ def make_spec(filename, version, target): 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) + + 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) @@ -255,9 +236,9 @@ def dependencies(target): else: ffmpeg_options = {} - return (('ffmpeg-cdist', 'f2952f3', ffmpeg_options), - ('libdcp', 'v1.3.2'), - ('libsub', 'b9fb00d')) + return (('ffmpeg-cdist', 'aab2fb1', ffmpeg_options), + ('libdcp', '937e435'), + ('libsub', '3e299e5')) def configure_options(target): opt = '' @@ -315,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') @@ -343,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": @@ -387,7 +371,10 @@ 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') + if test is None: + target.command('run/tests') + else: + target.command('run/tests --run_test=%s' % test)