X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=cscript;h=bdf7dffa44d4eb1ee2578c0a07f6125fc7c59094;hb=26181a802f9e87dc7a22c67c6202e40be25e4c0d;hp=405780ae19c3f46ecec2461bb916865b36096c36;hpb=a81037803e637a8b592635b8b973aecdb67ca0ce;p=dcpomatic.git diff --git a/cscript b/cscript index 405780ae1..bdf7dffa4 100644 --- a/cscript +++ b/cscript @@ -2,88 +2,115 @@ 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'} +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', + '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.48.0': '1.48.0-3', + 'libboost-thread1.48.0': '1.48.0-3', + '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.48.0': '1.48.0-3', + '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'} -depends['13.04'] = {'libc6': '2.15', - 'libssh-4': '0.5.2', +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', + 'libsndfile1': '1.0.25-7ubuntu2', + 'libmagick++5': '8:6.7.7.10-6ubuntu3', + 'libxml++2.6-2': '2.36.0-2ubuntu1', + 'libgtk2.0-0': '2.24.23-0ubuntu1', + 'libxmlsec1': '1.2.18-2ubuntu1', + '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'} + +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', + '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'} + 'libxmlsec1-openssl': '1.2.18', + 'libcurl3': '7.26.0', + 'libzip2': '0.10.1'} -depends['13.10'] = {'libc6': '2.17-93', +deb_depends['unstable'] = {'libc6': '2.13', 'libssh-4': '0.5.4', - 'libboost-filesystem1.53.0': '1.53.0', - 'libboost-thread1.53.0': '1.53.0', + '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.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'} - -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'} + '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'} + def packages(name, packages, f): s = '%s: ' % name @@ -91,13 +118,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 +134,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,24 +150,29 @@ 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', '8e663fa')) + return (('ffmpeg-cdist', '7e95caa'), + ('libdcp', '1.0')) def build(target, options): - cmd = './waf configure --prefix=%s' % target.work_dir_cscript() + cmd = './waf configure --prefix=%s' % target.directory if target.platform == 'windows': cmd += ' --target-windows' elif target.platform == 'linux': if target.distro == 'debian' or target.distro == 'ubuntu': cmd += ' --target-debian' + if target.version == 'unstable': + cmd += ' --debian-unstable' elif target.distro == 'centos': - cmd += ' --target-centos' + if target.version == '6.5': + cmd += ' --target-centos-6 --disable-tests' + elif target.version == '7': + cmd += ' --target-centos-7' target.command(cmd) target.command('./waf') @@ -152,14 +184,14 @@ 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~%%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.work_dir_cscript(), 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~%%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) 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) @@ -174,6 +206,8 @@ def package_debian(target, cpu): target.set('CDIST_LINKFLAGS', target.get('LINKFLAGS')) target.set('CDIST_CXXFLAGS', target.get('CXXFLAGS')) target.set('CDIST_PKG_CONFIG_PATH', target.get('PKG_CONFIG_PATH')) + if target.version == 'unstable': + target.set('CDIST_EXTRA_CONFIGURE', '--debian-unstable') target.command('dpkg-buildpackage') debs = [] @@ -183,11 +217,11 @@ def package_debian(target, cpu): return debs def package_centos(target, cpu, version): - os.makedirs('%s/rpmbuild/BUILD' % target.work_dir_cdist()) - os.makedirs('%s/rpmbuild/RPMS' % target.work_dir_cdist()) - os.makedirs('%s/rpmbuild/SOURCES' % target.work_dir_cdist()) - os.makedirs('%s/rpmbuild/SPECS' % target.work_dir_cdist()) - os.makedirs('%s/rpmbuild/SRPMS' % target.work_dir_cdist()) + os.makedirs('%s/rpmbuild/BUILD' % target.directory) + os.makedirs('%s/rpmbuild/RPMS' % target.directory) + os.makedirs('%s/rpmbuild/SOURCES' % target.directory) + os.makedirs('%s/rpmbuild/SPECS' % target.directory) + os.makedirs('%s/rpmbuild/SRPMS' % target.directory) f = open('%s/.rpmmacros' % target.dir_in_chroot, 'w') print >>f,"%%_topdir %srpmbuild" % target.dir_in_chroot @@ -195,32 +229,36 @@ def package_centos(target, cpu, version): target.command('./waf dist') shutil.copyfile( - "%s/src/dcpomatic/dcpomatic-%s.tar.bz2" % (target.work_dir_cdist(), version), - "%s/rpmbuild/SOURCES/dcpomatic-%s.tar.bz2" % (target.work_dir_cdist(), version) + "%s/src/dcpomatic/dcpomatic-%s.tar.bz2" % (target.directory, version), + "%s/rpmbuild/SOURCES/dcpomatic-%s.tar.bz2" % (target.directory, 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.directory, 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': - target.command('bash platform/osx/make_dmg.sh %s' % target.work_dir_cscript()) + 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]) def make_pot(target):