X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=wscript;h=2047a797b61e1a6338fca95b250894e0d059cdaf;hb=046ce2e8d22ea384dc7e1e4545bede6fd859d9c3;hp=7477a3d57762163110583be3a6d8977598e89cf4;hpb=e7b5945f03b297bf909d2bd28f1533137cf8f409;p=libsub.git diff --git a/wscript b/wscript index 7477a3d..2047a79 100644 --- a/wscript +++ b/wscript @@ -1,9 +1,36 @@ +# +# Copyright (C) 2012-2018 Carl Hetherington +# +# This file is part of libsub. +# +# libsub is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# libsub is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with libsub. If not, see . + import subprocess import os +import shlex from waflib import Context APPNAME = 'libsub' -VERSION = '1.2.4devel' + +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' try: @@ -48,16 +75,14 @@ except ImportError: def options(opt): opt.load('compiler_cxx') opt.add_option('--enable-debug', action='store_true', default=False, help='build with debugging information and without optimisation') - opt.add_option('--static', action='store_true', default=False, help='build libsub statically and link statically to cxml and dcp') + opt.add_option('--static', action='store_true', default=False, help='build libsub statically and link statically to dcp') opt.add_option('--target-windows', action='store_true', default=False, help='set up to do a cross-compile to make a Windows package') opt.add_option('--disable-tests', action='store_true', default=False, help='disable building of tests') - opt.add_option('--force-cpp11', action='store_true', default=False, help='force use of C++11') def configure(conf): conf.load('compiler_cxx') - 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']) + conf.load('clang_compilation_database', tooldir=['waf-tools']) + conf.env.append_value('CXXFLAGS', ['-Wall', '-Wextra', '-D_FILE_OFFSET_BITS=64', '-D__STDC_FORMAT_MACROS', '-std=c++11', '-DBOOST_NO_CXX11_SCOPED_ENUMS']) conf.env.append_value('CXXFLAGS', ['-DLIBSUB_VERSION="%s"' % VERSION]) conf.env.ENABLE_DEBUG = conf.options.enable_debug @@ -66,28 +91,31 @@ def configure(conf): conf.env.DISABLE_TESTS = conf.options.disable_tests conf.env.API_VERSION = API_VERSION + if conf.options.target_windows: + conf.env.append_value('CXXFLAGS', '-DLIBSUB_WINDOWS') + else: + conf.env.append_value('CXXFLAGS', '-DLIBSUB_POSIX') + if conf.options.enable_debug: conf.env.append_value('CXXFLAGS', '-g') else: conf.env.append_value('CXXFLAGS', '-O3') + if not conf.env.TARGET_WINDOWS: + conf.env.append_value('LINKFLAGS', '-pthread') + # Disable libxml++ deprecation warnings for now conf.env.append_value('CXXFLAGS', ['-Wno-deprecated-declarations']) conf.check_cfg(package='openssl', args='--cflags --libs', uselib_store='OPENSSL', mandatory=True) if conf.options.static: - conf.check_cfg(package='libcxml', atleast_version='0.14.0', args='--cflags', uselib_store='CXML', mandatory=True) - conf.env.HAVE_CXML = 1 - conf.env.LIB_CXML = ['glibmm-2.4', 'glib-2.0', 'pcre', 'sigc-2.0', 'rt', 'xml++-2.6', 'xml2', 'pthread', 'lzma', 'dl', 'z'] - conf.env.STLIB_CXML = ['cxml'] - conf.check_cfg(package='libdcp-1.0', atleast_version='1.4.4', args='--cflags', uselib_store='DCP', mandatory=True) + conf.check_cfg(package='libdcp-1.0', atleast_version='1.6.2', args='--cflags', uselib_store='DCP', mandatory=True) conf.env.HAVE_DCP = 1 - conf.env.STLIB_DCP = ['dcp-1.0', 'asdcp-cth', 'kumu-cth', 'openjp2'] - conf.env.LIB_DCP = ['ssl', 'crypto', 'xmlsec1-openssl', 'xmlsec1'] + conf.env.STLIB_DCP = ['dcp-1.0', 'asdcp-carl', 'kumu-carl', 'openjp2', 'cxml'] + conf.env.LIB_DCP = ['ssl', 'crypto', 'xmlsec1-openssl', 'xmlsec1', 'glibmm-2.4', 'xml++-2.6', 'xml2', 'dl'] else: - conf.check_cfg(package='libcxml', atleast_version='0.15.2', args='--cflags --libs', uselib_store='CXML', mandatory=True) - conf.check_cfg(package='libdcp-1.0', atleast_version='1.4.4', args='--cflags --libs', uselib_store='DCP', mandatory=True) + conf.check_cfg(package='libdcp-1.0', atleast_version='1.6.2', args='--cflags --libs', uselib_store='DCP', mandatory=True) conf.env.DEFINES_DCP = [f.replace('\\', '') for f in conf.env.DEFINES_DCP] @@ -119,11 +147,12 @@ def configure(conf): # Find the icu- libraries on the system as we need to link to them when we look for boost locale. locale_libs = ['boost_locale%s' % boost_lib_suffix, 'boost_system%s' % boost_lib_suffix] for pkg in subprocess.check_output(['pkg-config', '--list-all']).splitlines(): - if pkg.startswith(b"icu"): + pkg = pkg.decode('utf-8') + if pkg.startswith("icu"): for lib in subprocess.check_output(['pkg-config', '--libs-only-l', pkg.split()[0]]).split(): name = lib[2:] if not name in locale_libs: - locale_libs.append(name) + locale_libs.append(name.decode('utf-8')) conf.check_cxx(fragment=""" #include \n