X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=wscript;h=e4e0f84b4c90b4ae140e1352cd0b5084327a992b;hp=dce57b29b1b64c271970c56ce7051771da29012f;hb=7604c15ff19411bf5a84e4b569399a3595006908;hpb=6bd774341aadd4ffbe508d6512d2a2d250909a0a diff --git a/wscript b/wscript index dce57b29b..e4e0f84b4 100644 --- a/wscript +++ b/wscript @@ -1,5 +1,5 @@ # -# Copyright (C) 2012-2017 Carl Hetherington +# Copyright (C) 2012-2019 Carl Hetherington # # This file is part of DCP-o-matic. # @@ -24,20 +24,24 @@ import sys import glob import distutils import distutils.spawn +try: + # python 2 + from urllib import urlencode +except ImportError: + # python 3 + from urllib.parse import urlencode from waflib import Logs, Context APPNAME = 'dcpomatic' 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 --abbrev=0'), 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() -print('Version: %s' % VERSION) - def options(opt): opt.load('compiler_cxx') opt.load('winres') @@ -60,9 +64,11 @@ def options(opt): opt.add_option('--static-curl', action='store_true', default=False, help='link statically to libcurl') opt.add_option('--workaround-gssapi', action='store_true', default=False, help='link to gssapi_krb5') opt.add_option('--force-cpp11', action='store_true', default=False, help='force use of C++11') + opt.add_option('--variant', help='build variant', choices=['swaroop-studio', 'swaroop-theater']) def configure(conf): conf.load('compiler_cxx') + conf.load('clang_compilation_database', tooldir=['waf-tools']) if conf.options.target_windows: conf.load('winres') @@ -92,6 +98,8 @@ def configure(conf): '-Wwrite-strings', # Remove auto_ptr warnings from libxml++-2.6 '-Wno-deprecated-declarations', + '-Wno-ignored-qualifiers', + '-Wno-parentheses', '-D_FILE_OFFSET_BITS=64']) if conf.options.force_cpp11: @@ -107,6 +115,11 @@ def configure(conf): else: conf.env.append_value('CXXFLAGS', '-O2') + if conf.options.variant is not None: + conf.env.VARIANT = conf.options.variant + if conf.options.variant.startswith('swaroop-'): + conf.env.append_value('CXXFLAGS', '-DDCPOMATIC_VARIANT_SWAROOP') + # # Windows/Linux/OS X specific # @@ -147,7 +160,6 @@ def configure(conf): # POSIX if conf.env.TARGET_LINUX or conf.env.TARGET_OSX: conf.env.append_value('CXXFLAGS', '-DDCPOMATIC_POSIX') - conf.env.append_value('CXXFLAGS', ['-Wunsafe-loop-optimizations', '-Wlogical-op']) boost_lib_suffix = '' boost_thread = 'boost_thread' conf.env.append_value('LINKFLAGS', '-pthread') @@ -158,6 +170,7 @@ def configure(conf): conf.env.append_value('CXXFLAGS', '-DLINUX_LOCALE_PREFIX="%s/share/locale"' % conf.env['INSTALL_PREFIX']) conf.env.append_value('CXXFLAGS', '-DLINUX_SHARE_PREFIX="%s/share/dcpomatic2"' % conf.env['INSTALL_PREFIX']) conf.env.append_value('CXXFLAGS', '-DDCPOMATIC_LINUX') + conf.env.append_value('CXXFLAGS', ['-Wlogical-op']) if not conf.env.DISABLE_GUI: conf.check_cfg(package='gtk+-2.0', args='--cflags --libs', uselib_store='GTK', mandatory=True) @@ -165,6 +178,9 @@ def configure(conf): if conf.env.TARGET_OSX: conf.env.append_value('CXXFLAGS', ['-DDCPOMATIC_OSX', '-Wno-unused-function', '-Wno-unused-parameter', '-Wno-unused-local-typedef', '-Wno-potentially-evaluated-expression']) conf.env.append_value('LINKFLAGS', '-headerpad_max_install_names') + else: + # Avoid the endless warnings about _t uninitialized in optional<> + conf.env.append_value('CXXFLAGS', '-Wno-maybe-uninitialized') # # Dependencies. @@ -205,79 +221,6 @@ def configure(conf): # glib conf.check_cfg(package='glib-2.0', args='--cflags --libs', uselib_store='GLIB', mandatory=True) - # ImageMagick / GraphicsMagick - if distutils.spawn.find_executable('Magick++-config'): - conf.check_cfg(package='', path='Magick++-config', args='--cppflags --cxxflags --libs', uselib_store='MAGICK', mandatory=True) - conf.env.append_value('CXXFLAGS', '-DDCPOMATIC_IMAGE_MAGICK') - else: - image = conf.check_cfg(package='ImageMagick++', args='--cflags --libs', uselib_store='MAGICK', mandatory=False) - graphics = None - if image is None: - 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') - if image is not None: - conf.env.append_value('CXXFLAGS', '-DDCPOMATIC_IMAGE_MAGICK') - if graphics is not None: - conf.env.append_value('CXXFLAGS', '-DDCPOMATIC_GRAPHICS_MAGICK') - - # See if we are using the MagickCore or MagickLib namespaces - conf.check_cxx(fragment=""" - #include \n - using namespace MagickCore;\n - int main () { return 0; }\n - """, - mandatory=False, - msg='Checking for MagickCore namespace', - okmsg='yes', - includes=conf.env['INCLUDES_MAGICK'], - define_name='DCPOMATIC_HAVE_MAGICKCORE_NAMESPACE') - - conf.check_cxx(fragment=""" - #include \n - using namespace MagickLib;\n - int main () { return 0; }\n - """, - mandatory=False, - msg='Checking for MagickLib namespace', - okmsg='yes', - includes=conf.env['INCLUDES_MAGICK'], - define_name='DCPOMATIC_HAVE_MAGICKLIB_NAMESPACE') - - # See where MagickCore.h is - conf.check_cxx(fragment=""" - #include \n - int main() { return 0; }\n - """, - mandatory=False, - msg='Checking for MagickCore.h location', - okmsg='magick', - errmsg='not magick', - includes=conf.env['INCLUDES_MAGICK'], - define_name='DCPOMATIC_MAGICKCORE_MAGICK') - - conf.check_cxx(fragment=""" - #include \n - int main() { return 0; }\n - """, - mandatory=False, - msg='Checking for MagickCore.h location', - okmsg='MagickCore', - errmsg='not MagickCore', - includes=conf.env['INCLUDES_MAGICK'], - define_name='DCPOMATIC_MAGICKCORE_MAGICKCORE') - - # See if we have advanced compare() methods in Magick - conf.check_cxx(fragment=""" - #include \n - int main() { Magick::Image a; Magick::Image b; a.compare(b, Magick::RootMeanSquaredErrorMetric); } - """, - mandatory=False, - msg='Checking for advanced compare() method in {Image/Graphics}Magick', - uselib='MAGICK', - define_name='DCPOMATIC_ADVANCED_MAGICK_COMPARE' - ) - # libzip conf.check_cfg(package='libzip', args='--cflags --libs', uselib_store='ZIP', mandatory=True) conf.check_cxx(fragment=""" @@ -338,10 +281,10 @@ def configure(conf): # libcxml if conf.options.static_cxml: - conf.check_cfg(package='libcxml', atleast_version='0.15.5', args='--cflags', uselib_store='CXML', mandatory=True) + conf.check_cfg(package='libcxml', atleast_version='0.16.0', args='--cflags', uselib_store='CXML', mandatory=True) conf.env.STLIB_CXML = ['cxml'] else: - conf.check_cfg(package='libcxml', atleast_version='0.15.5', args='--cflags --libs', uselib_store='CXML', mandatory=True) + conf.check_cfg(package='libcxml', atleast_version='0.16.0', args='--cflags --libs', uselib_store='CXML', mandatory=True) # libssh if conf.options.static_ssh: @@ -363,21 +306,21 @@ def configure(conf): # libdcp if conf.options.static_dcp: - conf.check_cfg(package='libdcp-1.0', atleast_version='1.5.1', args='--cflags', uselib_store='DCP', mandatory=True) + conf.check_cfg(package='libdcp-1.0', atleast_version='1.6.7', args='--cflags', uselib_store='DCP', mandatory=True) conf.env.DEFINES_DCP = [f.replace('\\', '') for f in conf.env.DEFINES_DCP] conf.env.STLIB_DCP = ['dcp-1.0', 'asdcp-cth', 'kumu-cth', 'openjp2'] conf.env.LIB_DCP = ['glibmm-2.4', 'ssl', 'crypto', 'bz2', 'xslt'] else: - conf.check_cfg(package='libdcp-1.0', atleast_version='1.5.1', args='--cflags --libs', uselib_store='DCP', mandatory=True) + conf.check_cfg(package='libdcp-1.0', atleast_version='1.6.7', args='--cflags --libs', uselib_store='DCP', mandatory=True) conf.env.DEFINES_DCP = [f.replace('\\', '') for f in conf.env.DEFINES_DCP] # libsub if conf.options.static_sub: - conf.check_cfg(package='libsub-1.0', atleast_version='1.3.0', args='--cflags', uselib_store='SUB', mandatory=True) + conf.check_cfg(package='libsub-1.0', atleast_version='1.4.7', args='--cflags', uselib_store='SUB', mandatory=True) conf.env.DEFINES_SUB = [f.replace('\\', '') for f in conf.env.DEFINES_SUB] conf.env.STLIB_SUB = ['sub-1.0'] else: - conf.check_cfg(package='libsub-1.0', atleast_version='1.3.0', args='--cflags --libs', uselib_store='SUB', mandatory=True) + conf.check_cfg(package='libsub-1.0', atleast_version='1.4.7', args='--cflags --libs', uselib_store='SUB', mandatory=True) conf.env.DEFINES_SUB = [f.replace('\\', '') for f in conf.env.DEFINES_SUB] # libxml++ @@ -399,6 +342,9 @@ def configure(conf): # nettle conf.check_cfg(package="nettle", args='--cflags --libs', uselib_store='NETTLE', mandatory=True) + # libpng + conf.check_cfg(package='libpng', args='--cflags --libs', uselib_store='PNG', mandatory=True) + # FFmpeg if conf.options.static_ffmpeg: names = ['avformat', 'avfilter', 'avcodec', 'avutil', 'swscale', 'postproc', 'swresample'] @@ -440,9 +386,7 @@ def configure(conf): int main () { av_ebur128_get_true_peaks (0); }\n """, msg='Checking for EBUR128-patched FFmpeg', - libpath=conf.env['LIBPATH_AVFORMAT'], - lib='avfilter avutil swresample', - includes=conf.env['INCLUDES_AVFORMAT'], + uselib='AVCODEC AVFILTER', define_name='DCPOMATIC_HAVE_EBUR128_PATCHED_FFMPEG', mandatory=False) @@ -456,9 +400,7 @@ def configure(conf): """, msg='Checking for AVSubtitleRect::pict', cxxflags='-Wno-unused-result -Wno-unused-value -Wdeprecated-declarations -Werror', - libpath=conf.env['LIBPATH_AVCODEC'], - lib='avcodec', - includes=conf.env['INCLUDES_AVCODEC'], + uselib='AVCODEC', define_name='DCPOMATIC_HAVE_AVSUBTITLERECT_PICT', mandatory=False) @@ -472,14 +414,12 @@ def configure(conf): """, msg='Checking for AVComponentDescriptor::depth_minus1', cxxflags='-Wno-unused-result -Wno-unused-value -Wdeprecated-declarations -Werror', - libpath=conf.env['LIBPATH_AVUTIL'], - lib='avutil', - includes=conf.env['INCLUDES_AVUTIL'], + uselib='AVUTIL', define_name='DCPOMATIC_HAVE_AVCOMPONENTDESCRIPTOR_DEPTH_MINUS1', mandatory=False) # Hack: the previous two check_cxx calls end up copying their (necessary) cxxflags - # to these variables. We don't want to use these for the actual build, so clearn them out. + # to these variables. We don't want to use these for the actual build, so clean them out. conf.env['CXXFLAGS_AVCODEC'] = [] conf.env['CXXFLAGS_AVUTIL'] = [] @@ -558,6 +498,7 @@ def configure(conf): # Other stuff conf.find_program('msgfmt', var='MSGFMT') + conf.check(header_name='valgrind/memcheck.h', mandatory=False) datadir = conf.env.DATADIR if not datadir: @@ -599,12 +540,17 @@ def configure(conf): Logs.pprint('YELLOW', '') -def download_supporters(): - os.system('curl https://dcpomatic.com/supporters.cc > build/supporters.cc') +def download_supporters(can_fail): + last_date = subprocess.Popen(shlex.split('git log -1 --format=%%ai %s' % last_version), stdout=subprocess.PIPE).communicate()[0] + r = os.system('curl -m 2 -s -f https://dcpomatic.com/supporters.cc?%s > src/wx/supporters.cc' % urlencode({"until": last_date.strip()})) + if (r >> 8) == 0: + r = os.system('curl -s -f https://dcpomatic.com/subscribers.cc?%s > src/wx/subscribers.cc' % urlencode({"until": last_date.strip()})) + if (r >> 8) != 0 and can_fail: + raise Exception("Could not download supporters lists") def build(bld): create_version_cc(VERSION, bld.env.CXXFLAGS) - download_supporters() + download_supporters(not bld.env.DEBUG) bld.recurse('src') bld.recurse('graphics') @@ -646,7 +592,7 @@ def dist(ctx): ctx.excl = """ TODO core *~ src/wx/*~ src/lib/*~ builds/*~ doc/manual/*~ src/tools/*~ *.pyc .waf* build .git deps alignment hacks sync *.tar.bz2 *.exe .lock* *build-windows doc/manual/pdf doc/manual/html - GRSYMS GRTAGS GSYMS GTAGS + GRSYMS GRTAGS GSYMS GTAGS compile_commands.json """ def create_version_cc(version, cxx_flags): @@ -678,8 +624,16 @@ def create_version_cc(version, cxx_flags): sys.exit(-1) def post(ctx): - if ctx.cmd == 'install': + if ctx.cmd == 'install' and ctx.env.TARGET_LINUX: ctx.exec_command('/sbin/ldconfig') + # I can't find anything which tells me where things have been installed to, + # so here's some nasty hacks to guess. + debian = os.path.join(ctx.out_dir, '../debian/dcpomatic/usr/bin/dcpomatic2_uuid') + prefix = os.path.join(ctx.env['INSTALL_PREFIX'], 'bin/dcpomatic2_uuid') + if os.path.exists(debian): + os.chmod(debian, 0o4755) + if os.path.exists(prefix): + os.chmod(prefix, 0o4755) def pot(bld): bld.recurse('src')