X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=cscript;h=4bae748e0e376b3139c5c821a7757d60c262862b;hb=1fc799244c2caa6fbfea255708a7bb9f865ba134;hp=e2a0053179683c8ca39819c581eeedd6d79079b9;hpb=b8517e0e865812af91790a4b6a0adaab8f3ddae3;p=dcpomatic.git diff --git a/cscript b/cscript index e2a005317..4bae748e0 100644 --- a/cscript +++ b/cscript @@ -1,3 +1,4 @@ +# -*- mode: python -*- # # Copyright (C) 2012-2015 Carl Hetherington # @@ -34,6 +35,7 @@ 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', @@ -42,12 +44,15 @@ deb_depends['12.04'] = {'libc6': '2.15', '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'} + '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', @@ -56,12 +61,17 @@ deb_depends['14.04'] = {'libc6': '2.19-0ubuntu6', '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'} + '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', @@ -70,12 +80,34 @@ deb_depends['15.04'] = {'libc6': '2.21-0ubuntu4', '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'} + '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', @@ -84,22 +116,48 @@ deb_depends['7'] = {'libc6': '2.13', 'libboost-date-time1.49.0': '1.49.0', 'libxmlsec1-openssl': '1.2.18', 'libcurl3': '7.26.0', - 'libzip2': '0.10.1'} - -deb_depends['unstable'] = {'libc6': '2.13', - 'libssh-4': '0.5.4', + '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', - '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.55.0': '1.55.0', - 'libxmlsec1-openssl': '1.2.18', - 'libcurl3': '7.26.0', - 'libzip2': '0.10.1'} - + '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'} def packages(name, packages, f): s = '%s: ' % name @@ -169,13 +227,22 @@ def make_spec(filename, version, target): 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}/dcpomatic/taskbar_icon.png' - for r in ['128x128', '22x22', '32x32', '48x48', '64x64']: + 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' + for r in ['128x128', '16x16', '22x22', '256x256', '32x32', '48x48', '512x512', '64x64']: print >>f,'%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2.png' % r - for l in ['de_DE', 'es_ES', 'fr_FR', 'it_IT', 'sv_SE', 'nl_NL', 'ru_RU']: + 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 @@ -205,9 +272,15 @@ def make_spec(filename, version, target): print >>f,'/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :' def dependencies(target): - return (('ffmpeg-cdist', 'f69bb08'), - ('libdcp', '8e7f9e4'), - ('libsub', 'f66b11f')) + + if target.platform == 'linux': + ffmpeg_options = { 'shared': False } + else: + ffmpeg_options = {} + + return (('ffmpeg-cdist', '938d9af', ffmpeg_options), + ('libdcp', '257b936'), + ('libsub', 'e281262')) def configure_options(target): opt = '' @@ -222,70 +295,10 @@ def configure_options(target): if target.version == '6.5': opt += ' --static-boost --static-xmlpp' elif target.version == '7': - opt += ' --workaround-gssapi' + opt += ' --workaround-gssapi --static-xmlpp' return opt -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:dcpomatic' - 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,'%{_datadir}/applications/dcpomatic2.desktop' - print >>f,'%{_datadir}/applications/dcpomatic2_batch.desktop' - print >>f,'%{_datadir}/applications/dcpomatic2_server.desktop' - print >>f,'%{_datadir}/dcpomatic2/taskbar_icon.png' - for r in ['128x128', '22x22', '32x32', '48x48', '64x64']: - print >>f,'%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2.png' % r - for l in ['de_DE', 'es_ES', 'fr_FR', 'it_IT', 'sv_SE', 'nl_NL', 'ru_RU']: - 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 || :' - def build(target, options): target.command('./waf configure --prefix=%s %s' % (target.directory, configure_options(target))) target.command('./waf') @@ -296,6 +309,7 @@ def build(target, options): 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)) @@ -310,7 +324,7 @@ def package_debian(target, cpu, version): f = open('debian/files', 'w') print >>f,'dcpomatic_%s-1_%s.deb video extra' % (version, cpu) shutil.rmtree('build/deb', ignore_errors=True) - + os.makedirs('build/deb') os.chdir('build/deb') shutil.move('../../dcpomatic-%s.tar.bz2' % version, 'dcpomatic_%s.orig.tar.bz2' % version) @@ -324,20 +338,20 @@ 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 == '15.04': + if target.version in ['15.04', '15.10', '8']: target.set('CDIST_LOCALE_PREFIX', '/usr/share/locale') else: target.set('CDIST_LOCALE_PREFIX', '/usr/local/share/locale') target.command('dpkg-buildpackage -uc -us') - + debs = [] for p in glob.glob('../*.deb'): debs.append(os.path.abspath(p)) - + return debs -def package_centos(target, cpu, version): +def package_rpm(target, cpu, version): topdir = os.path.realpath('build/rpmbuild') os.makedirs('%s/BUILD' % topdir) os.makedirs('%s/RPMS' % topdir) @@ -357,8 +371,12 @@ def package_centos(target, cpu, version): if cpu == "amd64": cpu = "x86_64" + else: + cpu = "i686" + print 'Looking in %s/RPMS/%s/*.rpm' % (topdir, cpu) for p in glob.glob('%s/RPMS/%s/*.rpm' % (topdir, cpu)): + print 'found %s' % p rpms.append(os.path.abspath(p)) return rpms @@ -369,13 +387,13 @@ def package(target, version): elif target.platform == 'linux': if target.bits == 32: cpu = 'i386' - else: + else: cpu = 'amd64' if target.distro == 'debian' or target.distro == 'ubuntu': return package_debian(target, cpu, version) - elif target.distro == 'centos': - return package_centos(target, cpu, version) + elif target.distro == 'centos' or target.distro == 'fedora': + 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])