X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=cscript;h=b46a024bb6cbff1631d4d4513d403c71a9f192c8;hb=2034a89f30e4a976e44eb8d0a6b4ad6e3100cd4b;hp=17835912ba521f239b1848dbec01c895c5d07a95;hpb=be6ef36430fdbb4299ab45ded46526483f03f590;p=dcpomatic.git diff --git a/cscript b/cscript index 17835912b..b46a024bb 100644 --- a/cscript +++ b/cscript @@ -35,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', @@ -43,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', @@ -57,12 +61,15 @@ 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', + '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', @@ -71,12 +78,16 @@ 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['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', @@ -85,13 +96,18 @@ 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'} + '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', @@ -102,12 +118,15 @@ deb_depends['8'] = {'libc6': '2.19-18', 'libzip2': '0.11.2', 'libwxgtk3.0-0': '3.0.2', 'libxcb-xfixes0': '1.10', - 'libxcb-shape0': '1.10'} + 'libxcb-shape0': '1.10', + 'libsamplerate0': '0.1.8-8', + 'libicu52': '52.1-8+deb8u2'} deb_depends['unstable'] = {'libc6': '2.13', 'libssh-4': '0.5.4', 'libboost-filesystem1.55.0': '1.55.0', 'libboost-thread1.55.0': '1.55.0', + 'libboost-regex1.55.0': '1.55.0', 'libsndfile1': '1.0.25', 'libmagick++5': '8:6.7.7.10', 'libxml++2.6-2': '2.34.2', @@ -116,8 +135,9 @@ deb_depends['unstable'] = {'libc6': '2.13', 'libboost-date-time1.55.0': '1.55.0', 'libxmlsec1-openssl': '1.2.18', 'libcurl3': '7.26.0', - 'libzip2': '0.10.1'} - + 'libzip2': '0.10.1', + 'libsamplerate0': '0.1.8-8', + 'libicu52': '52.1-9'} def packages(name, packages, f): s = '%s: ' % name @@ -187,13 +207,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}/dcpomatic2/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 @@ -223,9 +252,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', '0492ad2'), - ('libdcp', '1.0'), - ('libsub', '1.0')) + + if target.platform == 'linux': + ffmpeg_options = { 'shared': False } + else: + ffmpeg_options = {} + + return (('ffmpeg-cdist', 'd0986a9', ffmpeg_options), + ('libdcp', 'c7cbd39'), + ('libsub', '72d5eb7')) def configure_options(target): opt = '' @@ -240,7 +275,7 @@ 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 @@ -254,6 +289,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)) @@ -295,7 +331,7 @@ def package_debian(target, cpu, version): 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) @@ -305,7 +341,7 @@ def package_centos(target, cpu, version): target.command('./waf dist') shutil.copyfile( - "%s/src/dcpomatic2/dcpomatic-%s.tar.bz2" % (target.directory, version), + "%s/src/dcpomatic/dcpomatic-%s.tar.bz2" % (target.directory, version), "%s/SOURCES/dcpomatic-%s.tar.bz2" % (topdir, version) ) @@ -315,8 +351,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 @@ -332,8 +372,8 @@ def package(target, version): 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])