X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=wscript;h=eb9c7e4616167c555c3344dd14d29e430ceb7039;hp=63fc6a5cc06f80388cfde58d04f8d89797699ddd;hb=c0a609b31bbf69d1fafcc734ac4f825933703d23;hpb=4d986a4f08cf5f13be6d3756f303276163bfe4a2 diff --git a/wscript b/wscript index 63fc6a5cc..eb9c7e461 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. # @@ -17,6 +17,8 @@ # along with DCP-o-matic. If not, see . # +from __future__ import print_function + import subprocess import os import shlex @@ -64,7 +66,7 @@ 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']) + opt.add_option('--variant', help='build variant (swaroop-studio, swaroop-theater)', choices=['swaroop-studio', 'swaroop-theater']) def configure(conf): conf.load('compiler_cxx') @@ -93,12 +95,12 @@ def configure(conf): '-msse', '-fno-strict-aliasing', '-Wall', - '-Wcast-align', '-Wextra', '-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: @@ -116,7 +118,8 @@ def configure(conf): if conf.options.variant is not None: conf.env.VARIANT = conf.options.variant - conf.env.append_value('CXXFLAGS', '-DDCPOMATIC_VARIANT_%s' % conf.options.variant.upper()) + if conf.options.variant.startswith('swaroop-'): + conf.env.append_value('CXXFLAGS', '-DDCPOMATIC_VARIANT_SWAROOP') # # Windows/Linux/OS X specific @@ -131,6 +134,7 @@ def configure(conf): conf.env.append_value('CXXFLAGS', '-DBOOST_THREAD_PROVIDES_GENERIC_SHARED_MUTEX_ON_WIN') conf.env.append_value('CXXFLAGS', '-mfpmath=sse') conf.env.append_value('CXXFLAGS', '-std=c++11') + conf.env.append_value('CXXFLAGS', '-Wcast-align') wxrc = os.popen('wx-config --rescomp').read().split()[1:] conf.env.append_value('WINRCFLAGS', wxrc) if conf.options.enable_debug: @@ -168,7 +172,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']) + conf.env.append_value('CXXFLAGS', ['-Wlogical-op', '-Wcast-align']) if not conf.env.DISABLE_GUI: conf.check_cfg(package='gtk+-2.0', args='--cflags --libs', uselib_store='GTK', mandatory=True) @@ -176,6 +180,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. @@ -276,10 +283,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: @@ -301,21 +308,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++ @@ -381,9 +388,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 avcodec avformat', - includes=conf.env['INCLUDES_AVFORMAT'], + uselib='AVCODEC AVFILTER', define_name='DCPOMATIC_HAVE_EBUR128_PATCHED_FFMPEG', mandatory=False) @@ -397,9 +402,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) @@ -413,9 +416,7 @@ 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) @@ -543,11 +544,19 @@ def configure(conf): 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 -s -f https://dcpomatic.com/supporters.cc?%s > src/wx/supporters.cc' % urlencode({"until": last_date.strip()})) + 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") + if (r >> 8) != 0: + if can_fail: + raise Exception("Could not download supporters lists (%d)" % (r >> 8)) + else: + f = open('src/wx/supporters.cc', 'w') + print('supported_by.Add(wxT("Debug build - no supporters lists available"));', file=f) + f.close() + f = open('src/wx/subscribers.cc', 'w') + print('subscribers.Add(wxT("Debug build - no subscribers lists available"));', file=f) + f.close() def build(bld): create_version_cc(VERSION, bld.env.CXXFLAGS) @@ -625,8 +634,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')