X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=wscript;h=b10aaf28d6c593864c68c91c451cad6cfbeac2af;hb=refs%2Ftags%2Fv1.6.8;hp=f274c4952c5d06426e4ee970312066bd5e84bd76;hpb=d927e9b913606f4fc982885c7582ecaf0e3c5a1a;p=libdcp.git diff --git a/wscript b/wscript index f274c495..b10aaf28 100644 --- a/wscript +++ b/wscript @@ -1,5 +1,5 @@ # -# Copyright (C) 2012-2016 Carl Hetherington +# Copyright (C) 2012-2017 Carl Hetherington # # This file is part of libdcp. # @@ -34,11 +34,20 @@ import subprocess import os import sys +import shlex import distutils.spawn from waflib import Logs, Context APPNAME = 'libdcp' -VERSION = '1.3.3devel' + +this_version = subprocess.Popen(shlex.split('git tag -l --points-at HEAD'), stdout=subprocess.PIPE).communicate()[0] +last_version = subprocess.Popen(shlex.split('git describe --tags --abbrev=0'), stdout=subprocess.PIPE).communicate()[0] + +if this_version == '': + VERSION = '%sdevel' % last_version[1:].strip() +else: + VERSION = this_version[1:].strip() + API_VERSION = '-1.0' def options(opt): @@ -50,10 +59,15 @@ def options(opt): opt.add_option('--disable-gcov', action='store_true', default=False, help='don''t use gcov in tests') opt.add_option('--disable-examples', action='store_true', default=False, help='disable building of examples') opt.add_option('--enable-openmp', action='store_true', default=False, help='enable use of OpenMP') + opt.add_option('--jpeg', default='oj2', help='specify JPEG library to build with: oj1 or oj2 for OpenJPEG 1.5.x or OpenJPEG 2.1.x respectively') + opt.add_option('--force-cpp11', action='store_true', default=False, help='force use of C++11') def configure(conf): conf.load('compiler_cxx') + conf.load('clang_compilation_database', tooldir=['waf-tools']) conf.env.append_value('CXXFLAGS', ['-Wall', '-Wextra', '-D_FILE_OFFSET_BITS=64', '-D__STDC_FORMAT_MACROS']) + if conf.options.force_cpp11: + conf.env.append_value('CXXFLAGS', ['-std=c++11', '-DBOOST_NO_CXX11_SCOPED_ENUMS']) gcc = conf.env['CC_VERSION'] if int(gcc[0]) >= 4 and int(gcc[1]) > 1: conf.env.append_value('CXXFLAGS', ['-Wno-maybe-uninitialized']) @@ -82,6 +96,16 @@ def configure(conf): conf.env.append_value('CXXFLAGS', ['-fopenmp', '-DLIBDCP_OPENMP']) conf.env.LIB_OPENMP = ['gomp'] + if not conf.env.TARGET_WINDOWS: + conf.env.append_value('LINKFLAGS', '-pthread') + + if conf.options.jpeg == 'oj1': + conf.env.append_value('CXXFLAGS', ['-DLIBDCP_OPENJPEG1']) + elif conf.options.jpeg == 'oj2': + conf.env.append_value('CXXFLAGS', ['-DLIBDCP_OPENJPEG2']) + else: + Logs.error('Invalid --jpeg value %s' % conf.options.jpeg) + conf.check_cfg(package='openssl', args='--cflags --libs', uselib_store='OPENSSL', mandatory=True) conf.check_cfg(package='libxml++-2.6', args='--cflags --libs', uselib_store='LIBXML++', mandatory=True) conf.check_cfg(package='xmlsec1', args='--cflags --libs', uselib_store='XMLSEC1', mandatory=True) @@ -95,23 +119,30 @@ def configure(conf): image = conf.check_cfg(package='ImageMagick++', args='--cflags --libs', uselib_store='MAGICK', mandatory=False) graphics = conf.check_cfg(package='GraphicsMagick++', args='--cflags --libs', uselib_store='MAGICK', mandatory=False) if image is None and graphics is None: - Logs.pprint('RED', 'Neither ImageMagick++ nor GraphicsMagick++ found: one or the other is required') + Logs.error('Neither ImageMagick++ nor GraphicsMagick++ found: one or the other is required') conf.check_cfg(package='sndfile', args='--cflags --libs', uselib_store='SNDFILE', mandatory=False) if conf.options.static: - conf.check_cfg(package='libopenjp2', args='--cflags', atleast_version='2.1.0', uselib_store='OPENJPEG', mandatory=True) - conf.env.STLIB_OPENJPEG = ['openjp2'] + if conf.options.jpeg == 'oj2': + conf.check_cfg(package='libopenjp2', args='--cflags', atleast_version='2.1.0', uselib_store='OPENJPEG', mandatory=True) + conf.env.STLIB_OPENJPEG = ['openjp2'] + elif conf.options.jpeg == 'oj1': + conf.check_cfg(package='libopenjpeg1', args='--cflags', atleast_version='1.5.0', uselib_store='OPENJPEG', mandatory=True) + conf.env.STLIB_OPENJPEG = ['openjpeg'] + conf.check_cfg(package='libasdcp-cth', atleast_version='0.1.3', args='--cflags', uselib_store='ASDCPLIB_CTH', mandatory=True) + conf.env.HAVE_ASDCPLIB_CTH = 1 + conf.env.STLIB_ASDCPLIB_CTH = ['asdcp-cth', 'kumu-cth'] conf.env.HAVE_CXML = 1 conf.env.LIB_CXML = ['xml++-2.6', 'glibmm-2.4'] conf.env.STLIB_CXML = ['cxml'] - conf.check_cfg(package='libasdcp-cth', atleast_version='0.0.1', args='--cflags', uselib_store='ASDCPLIB_CTH', mandatory=True) - conf.env.HAVE_ASDCPLIB_CTH = 1 - conf.env.STLIB_ASDCPLIB_CTH = ['asdcp-cth', 'kumu-cth'] else: - conf.check_cfg(package='libopenjp2', args='--cflags --libs', atleast_version='2.1.0', uselib_store='OPENJPEG', mandatory=True) - conf.check_cfg(package='libcxml', atleast_version='0.15.1', args='--cflags --libs', uselib_store='CXML', mandatory=True) - conf.check_cfg(package='libasdcp-cth', atleast_version='0.1.0', args='--cflags --libs', uselib_store='ASDCPLIB_CTH', mandatory=True) + if conf.options.jpeg == 'oj2': + conf.check_cfg(package='libopenjp2', args='--cflags --libs', atleast_version='2.1.0', uselib_store='OPENJPEG', mandatory=True) + elif conf.options.jpeg == 'oj1': + conf.check_cfg(package='libopenjpeg1', args='--cflags --libs', atleast_version='1.5.0', uselib_store='OPENJPEG', mandatory=True) + conf.check_cfg(package='libasdcp-cth', atleast_version='0.1.3', args='--cflags --libs', uselib_store='ASDCPLIB_CTH', mandatory=True) + conf.check_cfg(package='libcxml', atleast_version='0.16.0', args='--cflags --libs', uselib_store='CXML', mandatory=True) if conf.options.target_windows: boost_lib_suffix = '-mt' @@ -166,13 +197,7 @@ def configure(conf): conf.recurse('test') if not conf.options.disable_gcov: conf.check(lib='gcov', define_name='HAVE_GCOV', mandatory=False) - - # libxml++ 2.39.1 and later must be built with -std=c++11 - libxmlpp_version = conf.cmd_and_log(['pkg-config', '--modversion', 'libxml++-2.6'], output=Context.STDOUT, quiet=Context.BOTH) - s = libxmlpp_version.split('.') - v = (int(s[0]) << 16) | (int(s[1]) << 8) | int(s[2]) - if v >= 0x022701: - conf.env.append_value('CXXFLAGS', '-std=c++11') + conf.env.append_value('LINKFLAGS', '-fprofile-arcs') def build(bld): create_version_cc(bld, VERSION)