X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=cscript;h=4acc14f4fa3612b1377efebc8d1f79cd1df87eea;hb=70e3e1e04498c9777222142013b1793dd27a2442;hp=a6ebfcd5952c5177cc41f011a588f38e0f79ead4;hpb=d7b43fdea99af7b8632ce45d8c361b119b4a3e45;p=dcpomatic.git diff --git a/cscript b/cscript index a6ebfcd59..4acc14f4f 100644 --- a/cscript +++ b/cscript @@ -1,3 +1,4 @@ +# -*- mode: python -*- # # Copyright (C) 2012-2015 Carl Hetherington # @@ -86,6 +87,23 @@ deb_depends['7'] = {'libc6': '2.13', 'libcurl3': '7.26.0', 'libzip2': '0.10.1'} +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', + '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'} + deb_depends['unstable'] = {'libc6': '2.13', 'libssh-4': '0.5.4', 'libboost-filesystem1.55.0': '1.55.0', @@ -148,7 +166,7 @@ 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,'Name:dcpomatic2' print >>f,'Version:%s' % version print >>f,'Release:1%{?dist}' print >>f,'License:GPL' @@ -172,7 +190,8 @@ def make_spec(filename, version, target): 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' + print >>f,'%{_datadir}/dcpomatic2/taskbar_icon.png' + print >>f,'%{_datadir}/dcpomatic2/LiberationSans-Regular.ttf' 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']: @@ -205,9 +224,9 @@ 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')) + return (('ffmpeg-cdist', '0492ad2'), + ('libdcp', '1.0'), + ('libsub', '1.0')) def configure_options(target): opt = '' @@ -226,66 +245,6 @@ def configure_options(target): 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') @@ -310,7 +269,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,17 +283,17 @@ 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 == '15.04' or target.version == '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): @@ -347,7 +306,7 @@ def package_centos(target, cpu, version): target.command('./waf dist') shutil.copyfile( - "%s/src/dcpomatic/dcpomatic-%s.tar.bz2" % (target.directory, version), + "%s/src/dcpomatic2/dcpomatic-%s.tar.bz2" % (target.directory, version), "%s/SOURCES/dcpomatic-%s.tar.bz2" % (topdir, version) ) @@ -369,7 +328,7 @@ 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':