X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=wscript;h=00665bbacfdf7469a3276360bec21c4bb6b3f4ae;hp=fe14313160623cc5f167b0aebd30d3c2c1ca7580;hb=b5a88d757874fc7b7fecb15447c52fb40930e2ca;hpb=5eb8b5c3a1566aef638e9d9df03b88d320735092 diff --git a/wscript b/wscript index fe1431316..00665bbac 100644 --- a/wscript +++ b/wscript @@ -74,6 +74,8 @@ def options(opt): 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') def configure(conf): conf.load('compiler_cxx') @@ -90,6 +92,7 @@ def configure(conf): conf.env.VERSION = VERSION 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 else: @@ -104,22 +107,24 @@ def configure(conf): '-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']) 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 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 @@ -133,6 +138,9 @@ def configure(conf): 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') + if conf.options.use_lld: try: conf.find_program('ld.lld') @@ -167,8 +175,9 @@ def configure(conf): conf.check(lib='dsound', uselib_store='DSOUND', msg="Checking for library dsound") conf.check(lib='winmm', uselib_store='WINMM', msg="Checking for library winmm") conf.check(lib='ksuser', uselib_store='KSUSER', msg="Checking for library ksuser") + conf.check(lib='setupapi', uselib_store='SETUPAPI', msg="Checking for library setupapi") boost_lib_suffix = '-mt' - boost_thread = 'boost_thread_win32-mt' + boost_thread = 'boost_thread-mt' conf.check_cxx(fragment=""" #include \n int main() { std::locale::global (boost::locale::generator().generate ("")); }\n @@ -189,19 +198,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']) - if not conf.env.DISABLE_GUI: - conf.check_cfg(package='gtk+-2.0', args='--cflags --libs', uselib_store='GTK', mandatory=True) + conf.check(lib='dl', uselib_store='DL', msg='Checking for library dl') # 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']) 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. @@ -263,6 +268,9 @@ def configure(conf): # cairomm conf.check_cfg(package='cairomm-1.0', args='--cflags --libs', uselib_store='CAIROMM', mandatory=True) + # 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' @@ -313,10 +321,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 } """, @@ -366,6 +374,28 @@ def configure(conf): # libpng conf.check_cfg(package='libpng', args='--cflags --libs', uselib_store='PNG', mandatory=True) + # lwext4 + if conf.options.enable_disk: + conf.check_cxx(fragment=""" + #include \n + int main() { ext4_mount("ext4_fs", "/mp/", false); }\n + """, + msg='Checking for lwext4 library', + libpath='/usr/local/lib', + lib=['lwext4', 'blockdev'], + uselib_store='LWEXT4') + + if conf.env.TARGET_LINUX and conf.options.enable_disk: + conf.check_cfg(package='polkit-gobject-1', args='--cflags --libs', uselib_store='POLKIT', mandatory=True) + + # nanomsg + 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) + 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: names = ['avformat', 'avfilter', 'avcodec', 'avutil', 'swscale', 'postproc', 'swresample'] @@ -470,7 +500,7 @@ def configure(conf): 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', @@ -510,6 +540,22 @@ def configure(conf): lib=['boost_regex%s' % boost_lib_suffix], uselib_store='BOOST_REGEX') + # Really just checking for the header here (there's no associated library) but the test + # program has to link with boost_system so I'm doing it this way. + if conf.options.enable_disk: + deps = ['boost_system%s' % boost_lib_suffix] + if conf.env.TARGET_WINDOWS: + deps.append('ws2_32') + deps.append('boost_filesystem%s' % boost_lib_suffix) + conf.check_cxx(fragment=""" + #include \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. @@ -657,14 +703,16 @@ def create_version_cc(version, cxx_flags): def post(ctx): 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) + # 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) def pot(bld): bld.recurse('src')