X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=cscript;h=04ade29247640c3aee35adb77f8f5895f938f64d;hb=d12cf77f25e6e39fbfd4b249690149309a21646e;hp=e36c5b8904a184b952c9fa4763551424652103f6;hpb=5672fad5907943970c994738b9c2409902d09015;p=dcpomatic.git diff --git a/cscript b/cscript index e36c5b890..04ade2924 100644 --- a/cscript +++ b/cscript @@ -1,6 +1,6 @@ # -*- mode: python -*- # -# Copyright (C) 2012-2016 Carl Hetherington +# Copyright (C) 2012-2017 Carl Hetherington # # This file is part of DCP-o-matic. # @@ -24,21 +24,31 @@ import shutil import os import copy -deb_build_depends = {'debhelper', 'python', 'g++', 'pkg-config', 'libssh-dev', 'libsndfile1-dev', 'libgtk2.0-dev'} +deb_build_depends = dict() + +deb_build_depends_base = ['debhelper', 'python', 'g++', 'pkg-config', 'libsndfile1-dev', 'libgtk2.0-dev', 'libx264-dev'] + +deb_build_depends['12.04'] = copy.deepcopy(deb_build_depends_base) +deb_build_depends['12.04'].extend(['libssh-dev']) +deb_build_depends['14.04'] = copy.deepcopy(deb_build_depends_base) +deb_build_depends['14.04'].extend(['libssh-dev']) +deb_build_depends['16.04'] = copy.deepcopy(deb_build_depends_base) +deb_build_depends['16.04'].extend(['libssh-dev']) +deb_build_depends['16.10'] = copy.deepcopy(deb_build_depends_base) +deb_build_depends['16.10'].extend(['libssh-dev']) +deb_build_depends['17.04'] = copy.deepcopy(deb_build_depends_base) +deb_build_depends['17.04'].extend(['libssh-dev']) +deb_build_depends['7'] = copy.deepcopy(deb_build_depends_base) +deb_build_depends['7'].extend(['libssh-dev']) +deb_build_depends['8'] = copy.deepcopy(deb_build_depends_base) +deb_build_depends['8'].extend(['libssh-gcrypt-dev']) +deb_build_depends['9'] = copy.deepcopy(deb_build_depends_base) +deb_build_depends['9'].extend(['libssh-gcrypt-dev']) +deb_build_depends['unstable'] = copy.deepcopy(deb_build_depends_base) deb_depends = dict() -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_base = ['libc6', 'libsndfile1', 'libsamplerate0', 'libxmlsec1', 'libxmlsec1-openssl', 'libcurl3', 'libgtk2.0-0'] deb_depends['14.04'] = copy.deepcopy(deb_depends_base) deb_depends['14.04'].extend(['libboost-filesystem1.54.0', @@ -49,30 +59,55 @@ deb_depends['14.04'].extend(['libboost-filesystem1.54.0', 'libboost-date-time1.54.0', 'libzip2', 'libcairomm-1.0-1', - 'libpangomm-1.4-1', - 'libicu52']) + 'libpangomm-1.4-1,' + 'libicu52', + 'libnettle4', + 'libssh-4', + 'libx264-142']) -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(['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', + 'libcairomm-1.0-1v5', + 'libpangomm-1.4-1v5', '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', + 'libssh-4', + 'libx264-148']) + +deb_depends['16.10'] = copy.deepcopy(deb_depends_base) +deb_depends['16.10'].extend(['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', + 'libicu57', + 'libnettle6', + 'libssh-4', + 'libx264-148']) + +deb_depends['17.04'] = copy.deepcopy(deb_depends_base) +deb_depends['17.04'].extend(['libboost-filesystem1.62.0', + 'libboost-thread1.62.0', + 'libboost-regex1.62.0', + 'libmagick++-6.q16-7', + 'libxml++2.6-2v5', + 'libboost-date-time1.62.0', 'libzip4', 'libwxgtk3.0-0v5', - 'libicu55']) + 'libicu57', + 'libnettle6', + 'libssh-4', + 'libx264-148']) deb_depends['7'] = copy.deepcopy(deb_depends_base) deb_depends['7'].extend(['libboost-filesystem1.49.0', @@ -84,7 +119,10 @@ deb_depends['7'].extend(['libboost-filesystem1.49.0', 'libzip2', 'libcairomm-1.0-1', 'libpangomm-1.4-1', - 'libicu48']) + 'libicu48', + 'libnettle4', + 'libnotify4', + 'libx264-123']) deb_depends['8'] = copy.deepcopy(deb_depends_base) deb_depends['8'].extend(['libboost-filesystem1.55.0', @@ -94,21 +132,41 @@ deb_depends['8'].extend(['libboost-filesystem1.55.0', 'libmagick++-6.q16-5', 'libxml++2.6-2', 'libzip2', + 'libcairomm-1.0-1', + 'libpangomm-1.4-1', 'libwxgtk3.0-0', 'libxcb-xfixes0', 'libxcb-shape0', - 'libicu52']) + 'libicu52', + 'libnettle4', + 'libssh-4', + 'libx264-142']) + +deb_depends['9'] = copy.deepcopy(deb_depends_base) +deb_depends['9'].extend(['libboost-filesystem1.62.0', + 'libboost-thread1.62.0', + 'libboost-regex1.62.0', + 'libboost-date-time1.62.0', + 'libmagick++-6.q16-7', + 'libxml++2.6-2v5', + 'libgtk2.0-0', + 'libzip4', + 'libicu57', + 'libnettle6', + 'libx264-148']) 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', +deb_depends['unstable'].extend(['libboost-filesystem1.62.0', + 'libboost-thread1.62.0', + 'libboost-regex1.62.0', + 'libboost-date-time1.62.0', + 'libmagick++-6.q16-7', 'libxml++2.6-2v5', 'libgtk2.0-0', - 'libboost-date-time1.58.0', - 'libzip2', - 'libicu52']) + 'libzip4', + 'libicu57', + 'libnettle6', + 'libx264-148']) def packages(name, packages, f): s = '%s: ' % name @@ -122,7 +180,7 @@ def make_control(debian_version, bits, filename, debug): print('Section: video', file=f) print('Priority: extra', file=f) print('Maintainer: Carl Hetherington ', file=f) - packages('Build-Depends', deb_build_depends, f) + packages('Build-Depends', deb_build_depends[debian_version], f) print('Standards-Version: 3.9.3', file=f) print('Homepage: http://dcpomatic.com/', file=f) print('', file=f) @@ -179,6 +237,7 @@ def make_spec(filename, version, target): print('%{_bindir}/dcpomatic2_server', file=f) print('%{_bindir}/dcpomatic2_server_cli', file=f) print('%{_bindir}/dcpomatic2_kdm_cli', file=f) + print('%{_bindir}/dcpomatic2_player', 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) @@ -193,6 +252,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) + print('%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_player.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) @@ -203,15 +263,10 @@ 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) - - if target.distro == 'centos' and target.version == '5': - prefix = 'BUILDROOT/usr' - else: - prefix = '%{buildroot}/usr' + 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) - 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('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('./waf', file=f) print('%install', file=f) print('cd dcpomatic-%s' % version, file=f) @@ -236,9 +291,10 @@ def dependencies(target): else: ffmpeg_options = {} - return (('ffmpeg-cdist', 'cd922b8', ffmpeg_options), - ('libdcp', 'f028e8a'), - ('libsub', '3d8c3bc')) + return (('ffmpeg-cdist', '5fce90f', ffmpeg_options), + ('libdcp', '047d8ff'), + ('libsub', '678962c'), + ('rtaudio-cdist', None)) def configure_options(target): opt = '' @@ -249,11 +305,15 @@ def configure_options(target): elif target.platform == 'linux': opt += ' --static-dcpomatic --static-wxwidgets --static-ffmpeg --static-dcp --static-sub --static-cxml' if target.distro == 'centos': - opt += ' --static-xmlsec --static-ssh --disable-tests' + opt += ' --disable-tests' if target.version == '6.5': opt += ' --static-boost --static-xmlpp' elif target.version == '7': - opt += ' --workaround-gssapi --static-xmlpp' + opt += ' --workaround-gssapi' + + # 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 @@ -265,15 +325,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): @@ -296,10 +360,10 @@ 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']: - target.set('CDIST_LOCALE_PREFIX', '/usr/share/locale') - else: + if target.version in ['7', '14.04']: target.set('CDIST_LOCALE_PREFIX', '/usr/local/share/locale') + else: + target.set('CDIST_LOCALE_PREFIX', '/usr/share/locale') target.command('dpkg-buildpackage -uc -us') @@ -310,6 +374,7 @@ def package_debian(target, cpu, version): return debs def package_rpm(target, cpu, version): + print('package_rpm %s %s %s' % (target, cpu, version)) topdir = os.path.realpath('build/rpmbuild') os.makedirs('%s/BUILD' % topdir) os.makedirs('%s/RPMS' % topdir) @@ -324,9 +389,7 @@ def package_rpm(target, cpu, version): ) make_spec('build/platform/linux/dcpomatic2.spec', version, target) - 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) + cmd = 'rpmbuild --define "_topdir %s" -bb build/platform/linux/dcpomatic2.spec' % topdir target.command(cmd) rpms = [] @@ -357,7 +420,22 @@ 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')] + elif target.platform == 'docker': + shutil.copyfile(target.deb, 'build/platform/docker') + f = open('build/platform/docker/Dockerfile', 'w') + print('FROM debian:jessie', file=f) + print('MAINTAINER carl@dcpomatic.com', file=f) + print('ADD build/platform/docker/dcpomatic_%s-1_amd64.deb /tmp' % (version, version), file=f) + print('RUN apt-get -o Acquire:http::Timeout="5" update; exit 0', file=f) + print('RUN dpkg -i /tmp/dcpomatic_*.deb; exit 0', file=f) + print('RUN apt-get -y -f install', file=f) + print('RUN apt-get clean', file=f) + print('EXPOSE 6192', file=f) + print('CMD ["/usr/bin/dcpomatic2_server_cli", "--verbose"]', file=f) + f.close() + target.command('docker build build/platform/docker -t dcpomatic-server:%s' % version) + target.command('docker save dcpomatic-server:%s -o dcpomatic-server-%s-docker.tar' % (version, version)) def make_pot(target): target.command('./waf pot') @@ -371,7 +449,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)