X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=wscript;h=b7ea7de6ca054d1ea171223ddbf81db2e42008b3;hp=bee03cb0cc1d94a4f856546124940e5e5c19545b;hb=2d4e8c5f69cc694625ad95dcee554499605f823b;hpb=73f12506b092200418ce20d9ec70bf646d248f5d diff --git a/wscript b/wscript index bee03cb0c..b7ea7de6c 100644 --- a/wscript +++ b/wscript @@ -1,5 +1,5 @@ # -# Copyright (C) 2012-2019 Carl Hetherington +# Copyright (C) 2012-2021 Carl Hetherington # # This file is part of DCP-o-matic. # @@ -57,8 +57,8 @@ def options(opt): opt.add_option('--enable-debug', action='store_true', default=False, help='build with debugging information and without optimisation') opt.add_option('--disable-gui', action='store_true', default=False, help='disable building of GUI tools') opt.add_option('--disable-tests', action='store_true', default=False, help='disable building of tests') - opt.add_option('--install-prefix', default=None, help='prefix of where DCP-o-matic will be installed') - 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('--target-windows', action='store_true', default=False, help='set up to do a cross-compile for Windows') + opt.add_option('--target-macos-arm64', action='store_true', default=False, help='set up to do a cross-compile for macOS arm64') opt.add_option('--static-dcpomatic', action='store_true', default=False, help='link to components of DCP-o-matic statically') opt.add_option('--static-boost', action='store_true', default=False, help='link statically to Boost') opt.add_option('--static-wxwidgets', action='store_true', default=False, help='link statically to wxWidgets') @@ -71,10 +71,10 @@ def options(opt): opt.add_option('--static-sub', action='store_true', default=False, help='link statically to libsub') 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 (swaroop-studio, swaroop-theater)', choices=['swaroop-studio', 'swaroop-theater']) opt.add_option('--use-lld', action='store_true', default=False, help='use lld linker') opt.add_option('--enable-disk', action='store_true', default=False, help='build dcpomatic2_disk tool; requires Boost process, lwext4 and nanomsg libraries') + opt.add_option('--warnings-are-errors', action='store_true', default=False, help='build with -Werror') + opt.add_option('--wx-config', help='path to wx-config') def configure(conf): conf.load('compiler_cxx') @@ -92,36 +92,38 @@ def configure(conf): conf.env.DEBUG = conf.options.enable_debug conf.env.STATIC_DCPOMATIC = conf.options.static_dcpomatic conf.env.ENABLE_DISK = conf.options.enable_disk - if conf.options.install_prefix is None: - conf.env.INSTALL_PREFIX = conf.env.PREFIX + if conf.options.destdir == '': + conf.env.INSTALL_PREFIX = conf.options.prefix else: - conf.env.INSTALL_PREFIX = conf.options.install_prefix + conf.env.INSTALL_PREFIX = conf.options.destdir # Common CXXFLAGS conf.env.append_value('CXXFLAGS', ['-D__STDC_CONSTANT_MACROS', '-D__STDC_LIMIT_MACROS', '-D__STDC_FORMAT_MACROS', - '-msse', '-fno-strict-aliasing', '-Wall', '-Wextra', '-Wwrite-strings', - # Remove auto_ptr warnings from libxml++-2.6 - '-Wno-deprecated-declarations', + # I tried and failed to ignore these with _Pragma '-Wno-ignored-qualifiers', - '-Wno-parentheses', - '-D_FILE_OFFSET_BITS=64']) + '-D_FILE_OFFSET_BITS=64', + '-std=c++11']) - if conf.options.force_cpp11: - conf.env.append_value('CXXFLAGS', ['-std=c++11', '-DBOOST_NO_CXX11_SCOPED_ENUMS']) + if conf.options.warnings_are_errors: + conf.env.append_value('CXXFLAGS', '-Werror') + + if not conf.options.target_macos_arm64: + conf.env.append_value('CXXFLAGS', '-msse') if conf.env['CXX_NAME'] == 'gcc': gcc = conf.env['CC_VERSION'] - if int(gcc[0]) >= 4 and int(gcc[1]) > 1: - conf.env.append_value('CXXFLAGS', ['-Wno-unused-result']) - if int(gcc[0]) >= 9: - conf.env.append_value('CXXFLAGS', ['-Wno-deprecated-copy']) + if int(gcc[0]) >= 8: + # I tried and failed to ignore these with _Pragma + conf.env.append_value('CXXFLAGS', ['-Wno-cast-function-type']) have_c11 = int(gcc[0]) >= 4 and int(gcc[1]) >= 8 and int(gcc[2]) >= 1 + # Most gccs still give these warnings from boost::optional + conf.env.append_value('CXXFLAGS', ['-Wno-maybe-uninitialized']) else: have_c11 = False @@ -130,11 +132,6 @@ 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') - if conf.options.enable_disk: conf.env.append_value('CXXFLAGS', '-DDCPOMATIC_DISK') @@ -157,7 +154,6 @@ def configure(conf): conf.env.append_value('CXXFLAGS', '-DUNICODE') 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) @@ -195,20 +191,15 @@ def configure(conf): if conf.env.TARGET_LINUX: conf.env.append_value('CXXFLAGS', '-mfpmath=sse') 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', '-DLINUX_SHARE_PREFIX="%s/share"' % conf.env['INSTALL_PREFIX']) conf.env.append_value('CXXFLAGS', '-DDCPOMATIC_LINUX') conf.env.append_value('CXXFLAGS', ['-Wlogical-op', '-Wcast-align']) conf.check(lib='dl', uselib_store='DL', msg='Checking for library dl') - if not conf.env.DISABLE_GUI: - conf.check_cfg(package='gtk+-2.0', args='--cflags --libs', uselib_store='GTK', mandatory=True) # OSX 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('CXXFLAGS', ['-DDCPOMATIC_OSX', '-DGL_SILENCE_DEPRECATION']) 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. @@ -261,6 +252,18 @@ def configure(conf): define_name='DCPOMATIC_HAVE_ZIP_SOURCE_T' ) + # libbz2; must be explicitly linked on macOS for some reason + conf.check_cxx(fragment=""" + #include + int main() { BZ2_bzCompressInit(0, 0, 0, 0); } + """, + mandatory=True, + msg="Checking for libbz2", + okmsg='yes', + lib='bz2', + uselib_store="BZ2" + ) + # fontconfig conf.check_cfg(package='fontconfig', args='--cflags --libs', uselib_store='FONTCONFIG', mandatory=True) @@ -273,46 +276,9 @@ def configure(conf): # leqm_nrt conf.check_cfg(package='leqm_nrt', args='--cflags --libs', uselib_store='LEQM_NRT', mandatory=True) - test_cxxflags = '' - if have_c11: - test_cxxflags = '-std=c++11' - - # See if we have Cairo::ImageSurface::format_stride_for_width; Centos 5 does not - conf.check_cxx(fragment=""" - #include - int main(void) { - Cairo::ImageSurface::format_stride_for_width (Cairo::FORMAT_ARGB32, 1024);\n - return 0; }\n - """, - mandatory=False, - cxxflags=test_cxxflags, - msg='Checking for format_stride_for_width', - okmsg='yes', - includes=conf.env['INCLUDES_CAIROMM'], - uselib='CAIROMM', - define_name='DCPOMATIC_HAVE_FORMAT_STRIDE_FOR_WIDTH') - - # See if we have Pango::Layout::show_in_cairo_context; Centos 5 does not - conf.check_cxx(fragment=""" - #include - int main(void) { - Cairo::RefPtr context; - Glib::RefPtr layout; - layout->show_in_cairo_context (context); - return 0; }\n - """, - mandatory=False, - msg='Checking for show_in_cairo_context', - cxxflags=test_cxxflags, - okmsg='yes', - includes=conf.env['INCLUDES_PANGOMM'], - uselib='PANGOMM', - define_name='DCPOMATIC_HAVE_SHOW_IN_CAIRO_CONTEXT') - - # libcxml if conf.options.static_cxml: - conf.check_cfg(package='libcxml', atleast_version='0.16.0', args='--cflags', uselib_store='CXML', mandatory=True) + conf.check_cfg(package='libcxml', atleast_version='0.17.0', args='--cflags', uselib_store='CXML', mandatory=True) conf.env.STLIB_CXML = ['cxml'] else: conf.check_cfg(package='libcxml', atleast_version='0.16.0', args='--cflags --libs', uselib_store='CXML', mandatory=True) @@ -323,10 +289,10 @@ def configure(conf): if conf.options.workaround_gssapi: conf.env.LIB_SSH = ['gssapi_krb5'] else: - conf.check_cc(fragment=""" + conf.check_cxx(fragment=""" #include \n int main () {\n - ssh_session s = ssh_new ();\n + ssh_new ();\n return 0;\n } """, @@ -394,8 +360,9 @@ def configure(conf): if conf.options.enable_disk: if conf.check_cfg(package='nanomsg', args='--cflags --libs', uselib_store='NANOMSG', mandatory=False) is None: conf.check_cfg(package='libnanomsg', args='--cflags --libs', uselib_store='NANOMSG', mandatory=True) - # We link with nanomsg statically on Centos 8 so we need to link this as well - conf.env.LIB_NANOMSG.append('anl') + if conf.env.TARGET_LINUX: + # We link with nanomsg statically on Centos 8 so we need to link this as well + conf.env.LIB_NANOMSG.append('anl') # FFmpeg if conf.options.static_ffmpeg: @@ -478,6 +445,10 @@ def configure(conf): if conf.env.TARGET_LINUX: conf.env.LIB_X11 = ['X11'] + # We support older boosts on Linux so we can use the distribution-provided package + # on Centos 7, but it's good if we can use 1.61 for boost::dll::program_location() + boost_version = ('1.45', '104500') if conf.env.TARGET_LINUX else ('1.61', '106800') + # Boost if conf.options.static_boost: conf.env.STLIB_BOOST_THREAD = ['boost_thread'] @@ -489,19 +460,19 @@ def configure(conf): else: conf.check_cxx(fragment=""" #include \n - #if BOOST_VERSION < 104500\n + #if BOOST_VERSION < %s\n #error boost too old\n #endif\n int main(void) { return 0; }\n - """, + """ % boost_version[1], mandatory=True, - msg='Checking for boost library >= 1.45', + msg='Checking for boost library >= %s' % boost_version[0], okmsg='yes', - errmsg='too old\nPlease install boost version 1.45 or higher.') + errmsg='too old\nPlease install boost version %s or higher.' % boost_version[0]) conf.check_cxx(fragment=""" #include \n - int main() { boost::thread t (); }\n + int main() { boost::thread t; }\n """, msg='Checking for boost threading library', libpath='/usr/local/lib', @@ -550,21 +521,13 @@ def configure(conf): deps.append('boost_filesystem%s' % boost_lib_suffix) conf.check_cxx(fragment=""" #include \n - int main() { boost::process::child* c = new boost::process::child("foo"); }\n + int main() { new boost::process::child("foo"); }\n """, + cxxflags='-Wno-unused-parameter', msg='Checking for boost process library', lib=deps, uselib_store='BOOST_PROCESS') - # libxml++ requires glibmm and versions of glibmm 2.45.31 and later - # must be built with -std=c++11 as they use c++11 - # features and c++11 is not (yet) the default in gcc. - glibmm_version = conf.cmd_and_log(['pkg-config', '--modversion', 'glibmm-2.4'], output=Context.STDOUT, quiet=Context.BOTH) - s = glibmm_version.split('.') - v = (int(s[0]) << 16) | (int(s[1]) << 8) | int(s[2]) - if v >= 0x022D1F: - conf.env.append_value('CXXFLAGS', '-std=c++11') - # Other stuff conf.find_program('msgfmt', var='MSGFMT') @@ -703,16 +666,10 @@ def create_version_cc(version, cxx_flags): def post(ctx): if ctx.cmd == 'install' and ctx.env.TARGET_LINUX: ctx.exec_command('/sbin/ldconfig') - # setuid root executables - for e in ['dcpomatic2_uuid', 'dcpomatic2_disk_writer']: - # 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/%s' % e) - prefix = os.path.join(ctx.env['INSTALL_PREFIX'], 'bin/%s' % e) - if os.path.exists(debian): - os.chmod(debian, 0o4755) - if os.path.exists(prefix): - os.chmod(prefix, 0o4755) + # setuid root executable + exe = os.path.join(ctx.env['INSTALL_PREFIX'], 'bin/%s/dcpomatic2_disk_writer') + if os.path.exists(exe): + os.chmod(exe, 0o4755) def pot(bld): bld.recurse('src')