diff --git a/.waf-tools/boost.py b/.waf-tools/boost.py index d7e0107c..4b2ede53 100644 --- a/.waf-tools/boost.py +++ b/.waf-tools/boost.py @@ -56,6 +56,7 @@ from waflib.TaskGen import feature, after_method BOOST_LIBS = ['/usr/lib', '/usr/local/lib', '/opt/local/lib', '/sw/lib', '/lib'] BOOST_INCLUDES = ['/usr/include', '/usr/local/include', '/opt/local/include', '/sw/include'] + BOOST_VERSION_FILE = 'boost/version.hpp' BOOST_VERSION_CODE = ''' #include @@ -90,13 +91,18 @@ int main() { boost::thread t; } BOOST_LOG_CODE = ''' #include +int main() { BOOST_LOG_TRIVIAL(info) << "boost_log is working"; } +''' + +BOOST_LOG_SETUP_CODE = ''' +#include #include #include int main() { using namespace boost::log; add_common_attributes(); add_console_log(std::clog, keywords::format = "%Message%"); - BOOST_LOG_TRIVIAL(debug) << "log is working" << std::endl; + BOOST_LOG_TRIVIAL(info) << "boost_log_setup is working"; } ''' @@ -145,7 +151,7 @@ def options(opt): opt.add_option('--boost-abi', type='string', default='', dest='boost_abi', help='''select libraries with tags (gd for debug, static is automatically added), see doc Boost, Getting Started, chapter 6.1''') - opt.add_option('--boost-linkage_autodetect', action="store_true", dest='boost_linkage_autodetect', + opt.add_option('--boost-linkage_autodetect', action='store_true', dest='boost_linkage_autodetect', help="auto-detect boost linkage options (don't get used to it / might break other stuff)") opt.add_option('--boost-toolset', type='string', default='', dest='boost_toolset', @@ -175,7 +181,7 @@ def boost_get_version(self, d): try: txt = node.read() except EnvironmentError: - Logs.error("Could not read the file %r" % node.abspath()) + Logs.error('Could not read the file %r' % node.abspath()) else: re_but1 = re.compile('^#define\\s+BOOST_LIB_VERSION\\s+"(.+)"', re.M) m1 = re_but1.search(txt) @@ -183,7 +189,7 @@ def boost_get_version(self, d): m2 = re_but2.search(txt) if m1 and m2: return (m1.group(1), m2.group(1)) - return self.check_cxx(fragment=BOOST_VERSION_CODE, includes=[d], execute=True, define_ret=True).split(":") + return self.check_cxx(fragment=BOOST_VERSION_CODE, includes=[d], execute=True, define_ret=True).split(':') @conf def boost_get_includes(self, *k, **kw): @@ -194,10 +200,10 @@ def boost_get_includes(self, *k, **kw): if self.__boost_get_version_file(d): return d if includes: - self.end_msg('headers not found in %s' % includes) + self.end_msg('headers not found in %s' % includes, 'YELLOW') self.fatal('The configuration failed') else: - self.end_msg('headers not found, please provide a --boost-includes argument (see help)') + self.end_msg('headers not found, please provide a --boost-includes argument (see help)', 'YELLOW') self.fatal('The configuration failed') @@ -240,10 +246,10 @@ def __boost_get_libs_path(self, *k, **kw): break if not path: if libs: - self.end_msg('libs not found in %s' % libs) + self.end_msg('libs not found in %s' % libs, 'YELLOW') self.fatal('The configuration failed') else: - self.end_msg('libs not found, please provide a --boost-libs argument (see help)') + self.end_msg('libs not found, please provide a --boost-libs argument (see help)', 'YELLOW') self.fatal('The configuration failed') self.to_log('Found the boost path in %r with the libraries:' % path) @@ -313,7 +319,7 @@ def boost_get_libs(self, *k, **kw): libs.append(format_lib_name(file.name)) break else: - self.end_msg('lib %s not found in %s' % (lib, path.abspath())) + self.end_msg('lib %s not found in %s' % (lib, path.abspath()), 'YELLOW') self.fatal('The configuration failed') return libs @@ -354,7 +360,7 @@ def _check_pthread_flag(self, *k, **kw): # ... -mt is also the pthreads flag for HP/aCC # -lpthread: GNU Linux, etc. # --thread-safe: KAI C++ - if Utils.unversioned_sys_platform() == "sunos": + if Utils.unversioned_sys_platform() == 'sunos': # On Solaris (at least, for some versions), libc contains stubbed # (non-functional) versions of the pthreads routines, so link-based # tests will erroneously succeed. (We need to link with -pthreads/-mt/ @@ -362,23 +368,22 @@ def _check_pthread_flag(self, *k, **kw): # a function called by this macro, so we could check for that, but # who knows whether they'll stub that too in a future libc.) So, # we'll just look for -pthreads and -lpthread first: - boost_pthread_flags = ["-pthreads", "-lpthread", "-mt", "-pthread"] + boost_pthread_flags = ['-pthreads', '-lpthread', '-mt', '-pthread'] else: - boost_pthread_flags = ["", "-lpthreads", "-Kthread", "-kthread", "-llthread", "-pthread", - "-pthreads", "-mthreads", "-lpthread", "--thread-safe", "-mt"] + boost_pthread_flags = ['', '-lpthreads', '-Kthread', '-kthread', '-llthread', '-pthread', + '-pthreads', '-mthreads', '-lpthread', '--thread-safe', '-mt'] for boost_pthread_flag in boost_pthread_flags: try: self.env.stash() self.env['CXXFLAGS_%s' % var] += [boost_pthread_flag] self.env['LINKFLAGS_%s' % var] += [boost_pthread_flag] - self.check_cxx(code=PTHREAD_CODE, msg=None, use=var, execute=False) - + self.check_cxx(code=PTHREAD_CODE, msg=None, use=var, execute=False, quiet=True) self.end_msg(boost_pthread_flag) return except self.errors.ConfigurationError: self.env.revert() - self.end_msg('None') + self.end_msg('none') @conf def check_boost(self, *k, **kw): @@ -403,21 +408,24 @@ def check_boost(self, *k, **kw): var = kw.get('uselib_store', 'BOOST') - self.find_program('dpkg-architecture', var='DPKG_ARCHITECTURE', mandatory=False) - if self.env.DPKG_ARCHITECTURE: - deb_host_multiarch = self.cmd_and_log([self.env.DPKG_ARCHITECTURE[0], '-qDEB_HOST_MULTIARCH']) - BOOST_LIBS.insert(0, '/usr/lib/%s' % deb_host_multiarch.strip()) + if not self.env.DONE_FIND_BOOST_COMMON: + self.find_program('dpkg-architecture', var='DPKG_ARCHITECTURE', mandatory=False) + if self.env.DPKG_ARCHITECTURE: + deb_host_multiarch = self.cmd_and_log([self.env.DPKG_ARCHITECTURE[0], '-qDEB_HOST_MULTIARCH']) + BOOST_LIBS.insert(0, '/usr/lib/%s' % deb_host_multiarch.strip()) - self.start_msg('Checking boost includes') - self.env['INCLUDES_%s' % var] = inc = self.boost_get_includes(**params) - versions = self.boost_get_version(inc) - self.env.BOOST_VERSION = versions[0] - self.env.BOOST_VERSION_NUMBER = int(versions[1]) - self.end_msg("%d.%d.%d" % (int(versions[1]) / 100000, - int(versions[1]) / 100 % 1000, - int(versions[1]) % 100)) - if Logs.verbose: - Logs.pprint('CYAN', ' path : %s' % self.env['INCLUDES_%s' % var]) + self.start_msg('Checking boost includes') + self.env['INCLUDES_%s' % var] = inc = self.boost_get_includes(**params) + versions = self.boost_get_version(inc) + self.env.BOOST_VERSION = versions[0] + self.env.BOOST_VERSION_NUMBER = int(versions[1]) + self.end_msg('%d.%d.%d' % (int(versions[1]) / 100000, + int(versions[1]) / 100 % 1000, + int(versions[1]) % 100)) + if Logs.verbose: + Logs.pprint('CYAN', ' path : %s' % self.env['INCLUDES_%s' % var]) + + self.env.DONE_FIND_BOOST_COMMON = True if not params['lib'] and not params['stlib']: return @@ -429,7 +437,7 @@ def check_boost(self, *k, **kw): self.env['STLIBPATH_%s' % var] = [path] self.env['LIB_%s' % var] = libs self.env['STLIB_%s' % var] = stlibs - self.end_msg('ok') + self.end_msg(' '.join(libs + stlibs)) if Logs.verbose: Logs.pprint('CYAN', ' path : %s' % path) Logs.pprint('CYAN', ' shared libs : %s' % libs) @@ -450,15 +458,18 @@ def check_boost(self, *k, **kw): self.check_cxx(fragment=BOOST_ERROR_CODE, use=var, execute=False) if has_lib('thread'): self.check_cxx(fragment=BOOST_THREAD_CODE, use=var, execute=False) - if has_lib('log'): + if has_lib('log') or has_lib('log_setup'): if not has_lib('thread'): self.env['DEFINES_%s' % var] += ['BOOST_LOG_NO_THREADS'] - if has_shlib('log'): + if has_shlib('log') or has_shlib('log_setup'): self.env['DEFINES_%s' % var] += ['BOOST_LOG_DYN_LINK'] - self.check_cxx(fragment=BOOST_LOG_CODE, use=var, execute=False) + if has_lib('log_setup'): + self.check_cxx(fragment=BOOST_LOG_SETUP_CODE, use=var, execute=False) + else: + self.check_cxx(fragment=BOOST_LOG_CODE, use=var, execute=False) if params.get('linkage_autodetect', False): - self.start_msg("Attempting to detect boost linkage flags") + self.start_msg('Attempting to detect boost linkage flags') toolset = self.boost_get_toolset(kw.get('toolset', '')) if toolset in ('vc',): # disable auto-linking feature, causing error LNK1181 @@ -480,10 +491,10 @@ def check_boost(self, *k, **kw): # we attempt to play with some known-to-work CXXFLAGS combinations for cxxflags in (['/MD', '/EHsc'], []): self.env.stash() - self.env["CXXFLAGS_%s" % var] += cxxflags + self.env['CXXFLAGS_%s' % var] += cxxflags try: try_link() - self.end_msg("ok: winning cxxflags combination: %s" % (self.env["CXXFLAGS_%s" % var])) + self.end_msg('ok: winning cxxflags combination: %s' % (self.env['CXXFLAGS_%s' % var])) exc = None break except Errors.ConfigurationError as e: @@ -491,17 +502,17 @@ def check_boost(self, *k, **kw): exc = e if exc is not None: - self.end_msg("Could not auto-detect boost linking flags combination, you may report it to boost.py author", ex=exc) + self.end_msg('Could not auto-detect boost linking flags combination, you may report it to boost.py author', ex=exc) self.fatal('The configuration failed') else: - self.end_msg("Boost linkage flags auto-detection not implemented (needed ?) for this toolchain") + self.end_msg('Boost linkage flags auto-detection not implemented (needed ?) for this toolchain') self.fatal('The configuration failed') else: self.start_msg('Checking for boost linkage') try: try_link() except Errors.ConfigurationError as e: - self.end_msg("Could not link against boost libraries using supplied options") + self.end_msg('Could not link against boost libraries using supplied options', 'YELLOW') self.fatal('The configuration failed') self.end_msg('ok') diff --git a/.waf-tools/unix-socket.py b/.waf-tools/unix-socket.py index 07d1e9eb..4c98f1a2 100644 --- a/.waf-tools/unix-socket.py +++ b/.waf-tools/unix-socket.py @@ -1,13 +1,13 @@ # -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*- # -# Copyright (c) 2014-2018, Regents of the University of California +# Copyright (c) 2014-2019, Regents of the University of California # # GPL 3.0 license, see the COPYING.md file for more information from waflib import Options BOOST_ASIO_HAS_LOCAL_SOCKETS_CHECK = ''' -#include +#include #ifndef BOOST_ASIO_HAS_LOCAL_SOCKETS #error "Unix sockets are not available on this platform" #endif @@ -25,6 +25,5 @@ def configure(conf): fragment=BOOST_ASIO_HAS_LOCAL_SOCKETS_CHECK, features='cxx', use='BOOST', mandatory=False) - if conf.options.force_unix_socket or boost_asio_has_local_sockets(): - conf.define('HAVE_UNIX_SOCKETS', 1) - conf.env.HAVE_UNIX_SOCKETS = True + conf.env.HAVE_UNIX_SOCKETS = conf.options.force_unix_socket or boost_asio_has_local_sockets() + conf.define_cond('HAVE_UNIX_SOCKETS', conf.env.HAVE_UNIX_SOCKETS) diff --git a/wscript b/wscript index 6aee7cd3..4722ece2 100644 --- a/wscript +++ b/wscript @@ -88,35 +88,30 @@ def configure(conf): 'pch', 'boost', 'dependency-checker', 'websocket', 'doxygen', 'sphinx_build']) - if conf.options.with_tests: - conf.env.WITH_TESTS = True - conf.define('WITH_TESTS', 1) - if conf.options.with_other_tests: - conf.env.WITH_OTHER_TESTS = True - conf.define('WITH_OTHER_TESTS', 1) + conf.env.WITH_TESTS = conf.options.with_tests + conf.env.WITH_OTHER_TESTS = conf.options.with_other_tests conf.find_program('bash', var='BASH') if 'PKG_CONFIG_PATH' not in os.environ: os.environ['PKG_CONFIG_PATH'] = Utils.subst_vars('${LIBDIR}/pkgconfig', conf.env) - conf.check_cfg(package='libndn-cxx', args=['--cflags', '--libs'], - uselib_store='NDN_CXX', mandatory=True) + conf.check_cfg(package='libndn-cxx', args=['--cflags', '--libs'], uselib_store='NDN_CXX') - conf.check_cfg(package='libsystemd', args=['--cflags', '--libs'], - uselib_store='SYSTEMD', mandatory=False) + if not conf.options.without_systemd: + conf.check_cfg(package='libsystemd', args=['--cflags', '--libs'], + uselib_store='SYSTEMD', mandatory=False) conf.checkDependency(name='librt', lib='rt', mandatory=False) conf.checkDependency(name='libresolv', lib='resolv', mandatory=False) - if not conf.check_cxx(msg='Checking if privilege drop/elevation is supported', mandatory=False, - define_name='HAVE_PRIVILEGE_DROP_AND_ELEVATE', fragment=PRIVILEGE_CHECK_CODE): - Logs.warn('Dropping privileges is not supported on this platform') + conf.check_cxx(msg='Checking if privilege drop/elevation is supported', mandatory=False, + define_name='HAVE_PRIVILEGE_DROP_AND_ELEVATE', fragment=PRIVILEGE_CHECK_CODE) conf.check_cxx(header_name='valgrind/valgrind.h', define_name='HAVE_VALGRIND', mandatory=False) - boost_libs = 'system chrono program_options thread log log_setup' - if conf.options.with_tests or conf.options.with_other_tests: - boost_libs += ' unit_test_framework' + boost_libs = ['system', 'program_options', 'filesystem', 'thread'] + if conf.env.WITH_TESTS or conf.env.WITH_OTHER_TESTS: + boost_libs.append('unit_test_framework') conf.check_boost(lib=boost_libs, mt=True) if conf.env.BOOST_VERSION_NUMBER < 105800: @@ -127,11 +122,11 @@ def configure(conf): conf.load('unix-socket') if not conf.options.without_libpcap: - conf.checkDependency(name='libpcap', lib='pcap', mandatory=True, + conf.checkDependency(name='libpcap', lib='pcap', errmsg='not found, but required for Ethernet face support. ' 'Specify --without-libpcap to disable Ethernet face support.') - conf.checkWebsocket(mandatory=True) + conf.checkWebsocket() conf.check_compiler_flags() @@ -139,10 +134,13 @@ def configure(conf): conf.load('coverage') conf.load('sanitizers') + conf.define_cond('WITH_TESTS', conf.env.WITH_TESTS) + conf.define_cond('WITH_OTHER_TESTS', conf.env.WITH_OTHER_TESTS) conf.define('DEFAULT_CONFIG_FILE', '%s/ndn/nfd.conf' % conf.env.SYSCONFDIR) - # disable assertions in release builds - if not conf.options.debug: - conf.define('NDEBUG', 1) + # The config header will contain all defines that were added using conf.define() + # or conf.define_cond(). Everything that was added directly to conf.env.DEFINES + # will not appear in the config header, but will instead be passed directly to the + # compiler on the command line. conf.write_config_header('core/config.hpp') def build(bld): @@ -219,7 +217,7 @@ def build(bld): bld.install_files('${SYSCONFDIR}/ndn', 'autoconfig.conf.sample') - if Utils.unversioned_sys_platform() == 'linux': + if bld.env.HAVE_SYSTEMD: systemd_units = bld.path.ant_glob('systemd/*.in') bld(features='subst', name='systemd-units',