lib/tevent:lib/tevent lib/tdb:lib/tdb
lib/socket_wrapper:lib/socket_wrapper
third_party/popt:third_party/popt
+ lib/util:lib/util lib/tdb_wrap:lib/tdb_wrap
+ lib/ccan:lib/ccan libcli/util:libcli/util
buildtools:buildtools''')
def set_options(opt):
opt.PRIVATE_EXTENSION_DEFAULT('ctdb')
+
opt.RECURSE('lib/replace')
+
+ opt.RECURSE('lib/util')
+
opt.RECURSE('lib/talloc')
opt.RECURSE('lib/tevent')
opt.RECURSE('lib/tdb')
# No need to build python bindings for talloc/tevent/tdb
if conf.IN_LAUNCH_DIR():
+ conf.env.standalone_ctdb = True
Options.options.disable_python = True
conf.RECURSE('lib/replace')
+
+ if conf.env.standalone_ctdb:
+ conf.SAMBA_CHECK_PERL(mandatory=True)
+
+ conf.SAMBA_CHECK_PYTHON(mandatory=True, version=(2,5,0))
+ conf.SAMBA_CHECK_PYTHON_HEADERS(mandatory=True)
+
if conf.CHECK_FOR_THIRD_PARTY():
conf.RECURSE('third_party/popt')
else:
else:
conf.define('USING_SYSTEM_POPT', 1)
+ conf.RECURSE('lib/util')
+
conf.RECURSE('lib/talloc')
conf.RECURSE('lib/tevent')
conf.RECURSE('lib/tdb')
if not conf.CHECK_VARIABLE('ETIME', headers='errno.h'):
conf.DEFINE('ETIME', 'ETIMEDOUT')
+ if sys.platform.startswith('linux'):
+ conf.SET_TARGET_TYPE('pcap', 'EMPTY')
+ else:
+ if not conf.CHECK_HEADERS('pcap.h'):
+ Logs.error('Need libpcap')
+ sys.exit(1)
+ if not conf.CHECK_FUNCS_IN('pcap_open_live', 'pcap', headers='pcap.h'):
+ Logs.error('Need libpcap')
+ sys.exit(1)
+
+ if not conf.CHECK_FUNCS_IN('backtrace backtrace_symbols', 'execinfo',
+ checklibc=True, headers='execinfo.h'):
+ Logs.error('backtrace support not available')
+
have_pmda = False
if Options.options.ctdb_pmda:
pmda_support = True
conf.env.CTDB_SOCKPATH = os.path.join(conf.env.CTDB_RUNDIR,
'ctdbd.socket')
- conf.ADD_CFLAGS('''-DBINDIR=\"%s\"
+ conf.ADD_CFLAGS('''-DCTDB_HELPER_BINDIR=\"%s\"
-DLOGDIR=\"%s\"
-DSOCKPATH=\"%s\"
-DCTDB_ETCDIR=\"%s\"
'share/ctdb-tests')
conf.env.CTDB_TEST_LIBDIR = os.path.join(conf.env.LIBDIR, 'ctdb-tests')
- # Allow separate compilation of utilities to find includes
- if srcdir == '.':
- # Building from tarball
- conf.ADD_EXTRA_INCLUDES('#include')
- conf.ADD_EXTRA_INCLUDES('#include/internal')
- else:
- # Building standalone CTDB from within Samba tree
+ # Allow unified compilation and separate compilation of utilities
+ # to find includes
+ if not conf.env.standalone_ctdb:
conf.ADD_EXTRA_INCLUDES('#ctdb/include')
- conf.ADD_EXTRA_INCLUDES('#ctdb/include/internal')
- conf.ADD_EXTRA_INCLUDES('#ctdb')
+ else:
+ if srcdir == '.':
+ # Building from tarball
+ conf.ADD_EXTRA_INCLUDES('#include')
+ conf.ADD_EXTRA_INCLUDES('#include/internal')
+ else:
+ # Building standalone CTDB from within Samba tree
+ conf.ADD_EXTRA_INCLUDES('#ctdb/include')
+ conf.ADD_EXTRA_INCLUDES('#ctdb/include/internal')
+ conf.ADD_EXTRA_INCLUDES('#ctdb')
+ conf.ADD_EXTRA_INCLUDES('#lib #lib/replace')
+
+ conf.SET_TARGET_TYPE('systemd-daemon', 'EMPTY')
- conf.DEFINE('HAVE_CONFIG_H', 1, add_to_cflags=True)
- conf.SAMBA_CONFIG_H()
+ del(conf.env.defines['PYTHONDIR'])
+ del(conf.env.defines['PYTHONARCHDIR'])
+
+ conf.DEFINE('HAVE_CONFIG_H', 1, add_to_cflags=True)
+ conf.DEFINE('SAMBA_UTIL_CORE_ONLY', 1, add_to_cflags=True)
+ conf.SAMBA_CONFIG_H()
def build(bld):
+ if bld.env.standalone_ctdb:
+ # enable building of public headers in the build tree
+ bld.env.build_public_headers = 'include/public'
+
+ if bld.env.standalone_ctdb:
+ ctdb_mkversion = '../packaging/mkversion.sh'
+ else:
+ ctdb_mkversion = '../ctdb/packaging/mkversion.sh'
+ t = bld.SAMBA_GENERATOR('ctdb-version-header',
+ target='include/ctdb_version.h',
+ rule='%s ${TGT} %s' % (ctdb_mkversion, VERSION),
+ dep_vars=['VERSION'])
+ t.env.VERSION = VERSION
+
+ if bld.env.standalone_ctdb:
+ version_h = samba_utils.os_path_relpath(os.path.join(Options.launch_dir,
+ "version.h"),
+ bld.curdir)
+ t.bld.SAMBA_GENERATOR('ctdb-samba-version-header',
+ target=version_h,
+ rule='printf "#include \\"ctdb_version.h\\" \\n#define SAMBA_VERSION_STRING CTDB_VERSION_STRING\\n" > ${TGT}',
+ dep_vars=['VERSION'])
+ t.env.VERSION = VERSION
+
bld.RECURSE('lib/replace')
if bld.CHECK_FOR_THIRD_PARTY():
bld.RECURSE('third_party/popt')
bld.RECURSE('lib/tdb')
bld.RECURSE('lib/socket_wrapper')
- t = bld.SAMBA_GENERATOR('ctdb-version-header',
- target='include/ctdb_version.h',
- rule='../packaging/mkversion.sh ${TGT} %s' % (VERSION),
- dep_vars=['VERSION'])
- t.env.VERSION = VERSION
+ if bld.env.standalone_ctdb:
+ # In a combined build is implemented, CTDB will wanted to
+ # build against samba-util rather than samba-util-core.
+ # Similarly, other Samba subsystems expect samba-util. So,
+ # for a standalone build, just define a fake samba-util
+ # subsystem that pulls in samba-util-core.
+ bld.SAMBA_SUBSYSTEM('samba-util',
+ source='',
+ deps='samba-util-core')
bld.SAMBA_SUBSYSTEM('ctdb-tcp',
source=bld.SUBDIR('tcp',
bld.SAMBA_SUBSYSTEM('ctdb-system',
source=CTDB_SYSTEM_SRC,
includes='include include/internal',
- deps='replace talloc tevent tdb')
+ deps='replace talloc tevent tdb pcap')
bld.SAMBA_SUBSYSTEM('ctdb-client',
source=bld.SUBDIR('client', 'ctdb_client.c'),
includes='include include/internal',
public_headers='include/ctdb_client.h',
deps='''replace popt talloc tevent tdb
- ctdb-util tdb-wrap''')
+ samba-util tdb-wrap''')
bld.SAMBA_SUBSYSTEM('ctdb-server',
source='server/ctdbd.c ' +
ctdb_traverse.c eventscript.c
ctdb_takeover.c ctdb_serverids.c
ctdb_persistent.c ctdb_keepalive.c
- ctdb_logging.c ctdb_uptime.c
+ ctdb_logging.c
+ ctdb_logging_syslog.c
+ ctdb_logging_file.c
+ ctdb_uptime.c
ctdb_vacuum.c ctdb_banning.c
ctdb_statistics.c
ctdb_update_record.c
ctdb_lock.c'''),
includes='include include/internal',
- public_headers='''include/ctdb.h
+ public_headers='''include/ctdb_version.h
+ include/ctdb.h
include/ctdb_private.h
include/ctdb_protocol.h
include/ctdb_typesafe_cb.h''',
bld.SAMBA_BINARY('ctdb_lock_helper',
source='server/ctdb_lock_helper.c',
- deps='ctdb-util ctdb-common-util talloc tdb',
+ deps='samba-util ctdb-common-util talloc tdb',
includes='include include/internal',
install_path='${BINDIR}')
bld.SAMBA_BINARY('ctdb_event_helper',
source='server/ctdb_event_helper.c',
includes='include include/internal',
- deps='ctdb-util ctdb-common-util replace tdb',
+ deps='samba-util ctdb-common-util replace tdb',
install_path='${BINDIR}')
bld.SAMBA_GENERATOR('ctdb-smnotify-h',
bld.INSTALL_FILES('${CTDB_PMDADIR}', 'utils/pmda/README',
destname='README')
- bld.MANPAGES('''doc/onnode.1 doc/ctdbd_wrapper.1 doc/ctdbd.conf.5
- doc/ctdb.7 doc/ctdb-statistics.7 doc/ctdb-tunables.7''',
- True)
+ if 'XSLTPROC_MANPAGES' in bld.env and bld.env['XSLTPROC_MANPAGES']:
+ bld.MANPAGES('''doc/onnode.1 doc/ctdbd_wrapper.1 doc/ctdbd.conf.5
+ doc/ctdb.7 doc/ctdb-statistics.7 doc/ctdb-tunables.7''',
+ True)
bld.INSTALL_FILES('${BINDIR}', 'tools/onnode',
destname='onnode', chmod=0755)
continue
mode = os.lstat(fl).st_mode & 0777
if arg['trim_path']:
- fl = samba_utils.os_path_relpath(fl, arg['trim_path'])
+ fl = samba_utils.os_path_relpath(fl, arg['trim_path'])
arg['file_list'].append([fl, mode])
def SUBDIR_MODE(path, trim_path=None):
'nfs-rpc-checks.d'
]
+ if bld.env.standalone_ctdb:
+ configdir = 'config'
+ else:
+ configdir = 'ctdb/config'
+
for t in etc_subdirs:
- files = SUBDIR_MODE('config/%s' % t, trim_path='config')
+ files = SUBDIR_MODE('%s/%s' % (configdir, t), trim_path=configdir)
for fmode in files:
bld.INSTALL_FILES(bld.env.CTDB_ETCDIR, 'config/%s' % fmode[0],
destname=fmode[0], chmod=fmode[1])
]
for t in etc_scripts:
- bld.INSTALL_FILES(bld.env.CTDB_ETCDIR, 'config/' + t,
+ bld.INSTALL_FILES(bld.env.CTDB_ETCDIR, 'config/%s' % t,
destname=t, chmod=0755)
bld.INSTALL_FILES('${SYSCONFDIR}/sudoers.d', 'config/ctdb.sudoers',
bld.SAMBA_BINARY('ctdb_takeover_tests',
source='tests/src/ctdb_takeover_tests.c',
deps='''replace popt tdb tevent talloc ctdb-system
- ctdb-util tdb-wrap''' +
+ samba-util tdb-wrap''' +
ib_deps,
includes='include include/internal',
install_path='${CTDB_TEST_LIBDIR}')
bld.SAMBA_BINARY('ctdb_functest',
source='tests/src/ctdb_functest.c',
deps='''replace tdb tevent talloc popt ctdb-system
- ctdb-util tdb-wrap''',
+ samba-util tdb-wrap''',
includes='include include/internal',
install_path='${CTDB_TEST_LIBDIR}')
bld.SAMBA_BINARY('ctdb_stubtest',
source='tests/src/ctdb_test.c',
deps='''replace tdb tevent talloc popt ctdb-system
- ctdb-util tdb-wrap''',
+ samba-util tdb-wrap''',
includes='include include/internal',
install_path='${CTDB_TEST_LIBDIR}')
git.samba.org / obnox / samba / samba-obnox.git / blobdiff