X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=cscript;h=8d780305f20e161dec1e8a6bf4f6855b9ef7e171;hb=d540b90f5faf1051656920ccc9644ba764e5bb2b;hp=2f5f6f76bb2c13f99aa53ae8a21eabaabdde8858;hpb=71f5d09991c8c6362484075f9317e5cb9efd8e4c;p=libdcp.git diff --git a/cscript b/cscript index 2f5f6f76..8d780305 100644 --- a/cscript +++ b/cscript @@ -1,5 +1,5 @@ # -# Copyright (C) 2012-2016 Carl Hetherington +# Copyright (C) 2012-2017 Carl Hetherington # # This file is part of libdcp. # @@ -32,21 +32,31 @@ # import os +import shutil -def dependencies(target): - if target.platform == 'windows' and target.version == 'xp': - return (('libcxml', 'v0.15.4'), ('openjpeg-cdist', '5d8bffd'), ('asdcplib-cth', 'v0.1.3')) +def dependencies(target, options): + if (target.platform == 'windows' and target.version == 'xp') or (options is not None and 'jpeg' in options and options['jpeg'] == 'oj1'): + return (('libcxml', 'v0.16.1'), ('openjpeg-cdist', '4233dd7'), ('asdcplib-cth', '6648afc')) else: - return (('libcxml', 'v0.15.4'), ('openjpeg2-cdist', '94bdab1'), ('asdcplib-cth', 'v0.1.3')) + return (('libcxml', 'v0.16.1'), ('openjpeg2-cdist', '8b2ffc5'), ('asdcplib-cth', '6648afc')) def build(target, options): cmd = './waf configure --disable-examples --prefix=%s' % target.directory + if options is not None and 'jpeg' in options: + cmd += ' --jpeg=%s' % options['jpeg'] if target.platform == 'linux': cmd += ' --static' if target.distro == 'centos': cmd += ' --disable-tests' - if (target.distro == 'debian' and target.version == 'unstable' or target.distro == 'fedora' and target.version == '23'): - target.append_with_space('CXXFLAGS', '-std=c++11') + if target.version == '7': + # Centos 7 ships with glibmm 2.50.0 which requires C++11 + # but its compiler (gcc 4.8.5) defaults to C++97. Go figure. + # I worry that this will cause ABI problems but I don't have + # a better solution. + cmd += ' --force-cpp11' + if target.distro == 'mageia' and target.version == '6': + # Mageia 6 pulls the same stunt except it's libxml++ that requires C++11 + cmd += ' --force-cpp11' elif target.platform == 'windows': cmd += ' --target-windows --disable-gcov --disable-tests' if target.version == 'xp': @@ -61,6 +71,26 @@ def build(target, options): target.command(cmd) target.command('./waf build install') +def package(target, version): + if target.platform == 'windows': + d = 'build/libdcp-%s' % version + os.mkdir(d) + for f in ['asdcp-cth.dll', 'cxml-0.dll', 'dcp-1.0.dll', 'kumu-cth.dll', 'libopenjp2.dll', 'dcpinfo.exe']: + shutil.copyfile('%s/bin/%s' % (target.directory, f), os.path.join(d, f)) + + if target.bits == 32: + shutil.copyfile('%s/bin/libgcc_s_sjlj-1.dll' % target.windows_prefix, os.path.join(d, 'libgcc_s_sjlj-1.dll')) + else: + shutil.copyfile('%s/bin/libgcc_s_seh-1.dll' % target.windows_prefix, os.path.join(d, 'libgcc_s_seh-1.dll')) + + for f in ['libstdc++-6.dll', 'libboost_filesystem-mt.dll', 'libboost_system-mt.dll', 'libeay32.dll', 'libglibmm-2.4-1.dll', 'libxml++-2.6-2.dll', + 'libxml2-2.dll', 'libxmlsec1-openssl.dll', 'libxmlsec1.dll', 'zlib1.dll', 'libglib-2.0-0.dll', 'libgmodule-2.0-0.dll', 'libgobject-2.0-0.dll', + 'libsigc-2.0-0.dll', 'libiconv-2.dll', 'liblzma-5.dll', 'libxslt-1.dll', 'libintl-8.dll', 'libpcre-1.dll', 'libffi-6.dll']: + shutil.copyfile('%s/bin/%s' % (target.windows_prefix, f), os.path.join(d, f)) + zip = 'libdcp-%s-windows-%d.zip' % (version, target.bits) + target.command('cd build && zip -9 -r %s libdcp-%s' % (zip, version)) + return os.path.abspath('build/%s' % zip) + def make_doxygen(target): os.makedirs('build/doc') target.command('doxygen')