X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=cscript;h=c07c430310a41ad3f430e1bc60ba8d0123fefe50;hb=e6f28e7cda23c1ba3c49cc1bf2dc1491c2f87160;hp=e2975ce50a489a23117ad1a2e24bc079471b3b9b;hpb=005157c20f3b3894337c82e82a1f8b9fa1dc77b9;p=dcpomatic.git diff --git a/cscript b/cscript index e2975ce50..c07c43031 100644 --- a/cscript +++ b/cscript @@ -2,88 +2,88 @@ import glob import shutil import os -build_depends = {'debhelper': '8.0.0', - 'python': '2.7.3', - 'g++': '4:4.6.3', - 'pkg-config': '0.26', - 'libssh-dev': '0.5.2', - 'libboost-filesystem-dev': '1.46.0', - 'libboost-thread-dev': '1.46.0', - 'libsndfile1-dev': '1.0.25', - 'libmagick++-dev': '8:6.6.9.7', - 'libgtk2.0-dev': '2.24.10'} - -depends = dict() - -depends['12.04'] = {'libc6': '2.15', - 'libssh-4': '0.5.2', - 'libboost-filesystem1.46.1': '1.46.1', - 'libboost-thread1.46.1': '1.46.1', - 'libsndfile1': '1.0.25', - 'libmagick++4': '8:6.6.9.7', - 'libxml++2.6-2': '2.34.1', - 'libgtk2.0-0': '2.24.10', - 'libxmlsec1': '1.2.14-1.2build1', - 'libxmlsec1-openssl': '1.2.14-1.2build1', - 'libboost-date-time1.46.1': '1.46.1', - 'libcurl3': '7.22.0-3ubuntu4', - 'libzip2': '0.10-1ubuntu1'} - -depends['12.10'] = {'libc6': '2.15', - 'libssh-4': '0.5.2', - 'libboost-filesystem1.49.0': '1.49.0', - 'libboost-thread1.49.0': '1.49.0', - 'libsndfile1': '1.0.25', - 'libmagick++5': '8:6.7.7.10', - 'libxml++2.6-2': '2.34.2', - 'libgtk2.0-0': '2.24.13', - 'libxmlsec1': '1.2.18-2', - 'libxmlsec1-openssl': '1.2.18-2', - 'libboost-date-time1.49.0': '1.49.0', - 'libcurl3': '7.27.0-1ubuntu1', - 'libzip2': '0.10.1-1.1'} - -depends['13.04'] = {'libc6': '2.15', - 'libssh-4': '0.5.2', +deb_build_depends = {'debhelper': '8.0.0', + 'python': '2.7.3', + 'g++': '4:4.6.3', + 'pkg-config': '0.26', + 'libssh-dev': '0.5.2', + 'libboost-filesystem-dev': '1.46.0', + 'libboost-thread-dev': '1.46.0', + 'libsndfile1-dev': '1.0.25', + 'libmagick++-dev': '8:6.6.9.7', + 'libgtk2.0-dev': '2.24.10'} + +deb_depends = dict() + +deb_depends['12.04'] = {'libc6': '2.15', + 'libssh-4': '0.5.2', + 'libboost-filesystem1.46.1': '1.46.1', + 'libboost-thread1.46.1': '1.46.1', + 'libsndfile1': '1.0.25', + 'libmagick++4': '8:6.6.9.7', + 'libxml++2.6-2': '2.34.1', + 'libgtk2.0-0': '2.24.10', + 'libxmlsec1': '1.2.14-1.2build1', + 'libxmlsec1-openssl': '1.2.14-1.2build1', + 'libboost-date-time1.46.1': '1.46.1', + 'libcurl3': '7.22.0-3ubuntu4', + 'libzip2': '0.10-1ubuntu1'} + +deb_depends['12.10'] = {'libc6': '2.15', + 'libssh-4': '0.5.2', + 'libboost-filesystem1.49.0': '1.49.0', + 'libboost-thread1.49.0': '1.49.0', + 'libsndfile1': '1.0.25', + 'libmagick++5': '8:6.7.7.10', + 'libxml++2.6-2': '2.34.2', + 'libgtk2.0-0': '2.24.13', + 'libxmlsec1': '1.2.18-2', + 'libxmlsec1-openssl': '1.2.18-2', + 'libboost-date-time1.49.0': '1.49.0', + 'libcurl3': '7.27.0-1ubuntu1', + 'libzip2': '0.10.1-1.1'} + +deb_depends['13.04'] = {'libc6': '2.15', + 'libssh-4': '0.5.2', + 'libboost-filesystem1.49.0': '1.49.0', + 'libboost-thread1.49.0': '1.49.0', + 'libsndfile1': '1.0.25', + 'libmagick++5': '8:6.7.7.10', + 'libxml++2.6-2': '2.34.2', + 'libgtk2.0-0': '2.24.13', + 'libxmlsec1': '1.2.18-2', + 'libxmlsec1-openssl': '1.2.18-2', + 'libboost-date-time1.49.0': '1.49.0', + 'libcurl3': '7.29.0-1ubuntu3', + 'libzip2': '0.10.1-1.1'} + +deb_depends['13.10'] = {'libc6': '2.17-93', + 'libssh-4': '0.5.4', + 'libboost-filesystem1.53.0': '1.53.0', + 'libboost-thread1.53.0': '1.53.0', + 'libsndfile1': '1.0.25', + 'libmagick++5': '8:6.7.7.10', + 'libxml++2.6-2': '2.36.0', + 'libgtk2.0-0': '2.24.20', + 'libxmlsec1': '1.2.18-2', + 'libxmlsec1-openssl': '1.2.18-2', + 'libboost-date-time1.49.0': '1.49.0', + 'libcurl3': '7.29.0-1ubuntu3', + 'libzip2': '0.10.1-1.1'} + +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', 'libsndfile1': '1.0.25', 'libmagick++5': '8:6.7.7.10', 'libxml++2.6-2': '2.34.2', - 'libgtk2.0-0': '2.24.13', - 'libxmlsec1': '1.2.18-2', - 'libxmlsec1-openssl': '1.2.18-2', - 'libboost-date-time1.49.0': '1.49.0', - 'libcurl3': '7.29.0-1ubuntu3', - 'libzip2': '0.10.1-1.1'} - -depends['13.10'] = {'libc6': '2.17-93', - 'libssh-4': '0.5.4', - 'libboost-filesystem1.53.0': '1.53.0', - 'libboost-thread1.53.0': '1.53.0', - 'libsndfile1': '1.0.25', - 'libmagick++5': '8:6.7.7.10', - 'libxml++2.6-2': '2.36.0', - 'libgtk2.0-0': '2.24.20', - 'libxmlsec1': '1.2.18-2', - 'libxmlsec1-openssl': '1.2.18-2', + 'libgtk2.0-0': '2.24.10', + 'libxmlsec1': '1.2.18', 'libboost-date-time1.49.0': '1.49.0', - 'libcurl3': '7.29.0-1ubuntu3', - 'libzip2': '0.10.1-1.1'} - -depends['7'] = {'libc6': '2.13', - 'libssh-4': '0.5.4', - 'libboost-filesystem1.49.0': '1.49.0', - 'libboost-thread1.49.0': '1.49.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.49.0': '1.49.0', - 'libxmlsec1-openssl': '1.2.18', - 'libcurl3': '7.26.0', - 'libzip2': '0.10.1'} + 'libxmlsec1-openssl': '1.2.18', + 'libcurl3': '7.26.0', + 'libzip2': '0.10.1'} def packages(name, packages, f): s = '%s: ' % name @@ -91,13 +91,13 @@ def packages(name, packages, f): s += str(p) + ', ' print >>f,s[:-2] -def make_control(version, bits, filename, debug): +def make_control(debian_version, bits, filename, debug): f = open(filename, 'w') print >>f,'Source: dcpomatic' print >>f,'Section: video' print >>f,'Priority: extra' print >>f,'Maintainer: Carl Hetherington ' - packages('Build-Depends', build_depends, f) + packages('Build-Depends', deb_build_depends, f) print >>f,'Standards-Version: 3.9.3' print >>f,'Homepage: http://dcpomatic.com/' print >>f,'' @@ -107,7 +107,7 @@ def make_control(version, bits, filename, debug): else: print >>f,'Architecture: amd64' - packages('Depends', depends[version], f) + packages('Depends', deb_depends[debian_version], f) print >>f,'Description: Generator of Digital Cinema Packages (DCPs)' print >>f,' DCP-o-matic generates Digital Cinema Packages (DCPs) from video and audio' @@ -123,14 +123,14 @@ def make_control(version, bits, filename, debug): print >>f,'Architecture: amd64' print >>f,'Section: debug' print >>f,'Priority: extra' - packages('Depends', depends[version], f) + packages('Depends', deb_depends[debian_version], f) print >>f,'Description: debugging symbols for dcpomatic' print >>f,' This package contains the debugging symbols for dcpomatic.' print >>f,'' def dependencies(target): - return (('ffmpeg-cdist', '5ac3a6af077c10f07c31954c372a8f29e4e18e2a'), - ('libdcp', 'a7dac85')) + return (('ffmpeg-cdist', 'a0db025'), + ('libdcp', '1.0')) def build(target, options): cmd = './waf configure --prefix=%s' % target.work_dir_cscript() @@ -158,8 +158,8 @@ def package_windows(target): target.command('makensis build/platform/windows/installer2.%s.nsi' % target.bits) return os.path.abspath(glob.glob('build/platform/windows/*%s*.exe' % target.bits)[0]) -def package_debian(target, cpu): - make_control(target.version, target.bits, 'debian/control') +def package_debian(target, cpu, version): + make_control(target.version, target.bits, 'debian/control', target.debug) target.command('./waf dist') f = open('debian/files', 'w') print >>f,'dcpomatic_%s-1_%s.deb video extra' % (version, cpu) @@ -201,22 +201,26 @@ def package_centos(target, cpu, version): target.command('rpmbuild -bb build/platform/linux/dcpomatic.spec') rpms = [] - for p in glob.glob('%s/rpmbuild/RPMS/x86_64/*.rpm' % target.work_dir_cdist()): + + if cpu == "amd64": + cpu = "x86_64" + + for p in glob.glob('%s/rpmbuild/RPMS/%s/*.rpm' % (target.work_dir_cdist(), cpu)): rpms.append(os.path.abspath(p)) return rpms def package(target, version): - if target.bits == 32: - cpu = 'i386' - else: - cpu = 'amd64' - if target.platform == 'windows': return package_windows(target) elif target.platform == 'linux': + if target.bits == 32: + cpu = 'i386' + else: + cpu = 'amd64' + if target.distro == 'debian' or target.distro == 'ubuntu': - return package_debian(target, cpu) + return package_debian(target, cpu, version) elif target.distro == 'centos': return package_centos(target, cpu, version) elif target.platform == 'osx':