version = samba_version.samba_version_file('%s/VERSION' % vdir, vdir, env)
VERSION = version.STRING.replace('-', '.')
-Options.default_prefix = '/usr/local'
+default_prefix = Options.default_prefix = '/usr/local'
samba_dist.DIST_DIRS('''ctdb:. lib/replace:lib/replace lib/talloc:lib/talloc
lib/tevent:lib/tevent lib/tdb:lib/tdb
def configure(conf):
- # CTDB relies on nested event loops
- conf.env.TEVENT_DEPRECATED = 1
-
# No need to build python bindings for talloc/tevent/tdb
if conf.IN_LAUNCH_DIR():
conf.env.standalone_ctdb = True
conf.RECURSE('lib/talloc')
conf.RECURSE('lib/tevent')
conf.RECURSE('lib/tdb')
- conf.RECURSE('lib/socket_wrapper')
+ if conf.env.standalone_ctdb or conf.CONFIG_GET('ENABLE_SELFTEST'):
+ conf.RECURSE('lib/socket_wrapper')
conf.CHECK_HEADERS('sched.h')
conf.CHECK_HEADERS('procinfo.h')
conf.env.CTDB_ETCDIR = os.path.join(conf.env.SYSCONFDIR, 'ctdb')
conf.env.CTDB_VARDIR = os.path.join(conf.env.LOCALSTATEDIR, 'lib/ctdb')
conf.env.CTDB_RUNDIR = os.path.join(conf.env.LOCALSTATEDIR, 'run/ctdb')
+ conf.env.CTDB_HELPER_BINDIR = os.path.join(conf.env.LIBEXECDIR, 'ctdb')
if Options.options.ctdb_logdir:
conf.env.CTDB_LOGDIR = Options.options.ctdb_logdir
else:
conf.env.CTDB_SOCKPATH = os.path.join(conf.env.CTDB_RUNDIR,
'ctdbd.socket')
+ conf.define('CTDB_SOCKET', conf.env.CTDB_SOCKPATH)
conf.ADD_CFLAGS('''-DCTDB_HELPER_BINDIR=\"%s\"
-DLOGDIR=\"%s\"
- -DSOCKPATH=\"%s\"
-DCTDB_ETCDIR=\"%s\"
-DCTDB_VARDIR=\"%s\"
-DCTDB_RUNDIR=\"%s\"''' % (
- conf.env.CTDB_BINDIR,
+ conf.env.CTDB_HELPER_BINDIR,
conf.env.CTDB_LOGDIR,
- conf.env.CTDB_SOCKPATH,
conf.env.CTDB_ETCDIR,
conf.env.CTDB_VARDIR,
conf.env.CTDB_RUNDIR))
# 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('#include/public #ctdb/include #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.DEFINE('SAMBA_UTIL_CORE_ONLY', 1, add_to_cflags=True)
conf.SAMBA_CONFIG_H()
+ if 'XSLTPROC_MANPAGES' in conf.env and conf.env['XSLTPROC_MANPAGES']:
+ conf.env.ctdb_generate_manpages = True
+ else:
+ conf.env.ctdb_generate_manpages = False
+
+ Logs.info("xsltproc unavailable, checking for pre-built manpages")
+ conf.env.ctdb_prebuilt_manpages = []
+ for m in manpages:
+ if os.path.exists(os.path.join("doc", m)):
+ Logs.info(" %s: yes" % (m))
+ conf.env.ctdb_prebuilt_manpages.append(m)
+ else:
+ Logs.info(" %s: no" % (m))
def build(bld):
if bld.env.standalone_ctdb:
dep_vars=['VERSION'])
t.env.VERSION = VERSION
+ bld.env.PKGCONFIGDIR = '${LIBDIR}/pkgconfig'
+
bld.RECURSE('lib/replace')
if bld.CHECK_FOR_THIRD_PARTY():
bld.RECURSE('third_party/popt')
bld.RECURSE('lib/talloc')
bld.RECURSE('lib/tevent')
bld.RECURSE('lib/tdb')
- bld.RECURSE('lib/socket_wrapper')
+ if bld.env.standalone_ctdb or bld.CONFIG_GET('SOCKET_WRAPPER'):
+ bld.RECURSE('lib/socket_wrapper')
if bld.env.standalone_ctdb:
- # In a combined build is implemented, CTDB will wanted to
+ # If a combined build is implemented, CTDB will want 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
bld.SAMBA_SUBSYSTEM('ctdb-tcp',
source=bld.SUBDIR('tcp',
'tcp_connect.c tcp_init.c tcp_io.c'),
- includes='include include/internal',
+ includes='include',
deps='replace tdb talloc tevent')
ib_deps = ''
source=bld.SUBDIR('ib',
'''ibwrapper.c ibw_ctdb.c
ibw_ctdb_init.c'''),
- includes='include include/internal',
- deps='replace')
+ includes='include',
+ deps='replace talloc tevent tdb')
ib_deps = ' ctdb-ib rdmacm ibverbs'
- bld.SAMBA_SUBSYSTEM('ctdb-common',
- source=bld.SUBDIR('common',
- '''ctdb_io.c ctdb_util.c ctdb_ltdb.c
- ctdb_message.c cmdline.c rb_tree.c
- system_common.c ctdb_fork.c'''),
- includes='include include/internal common .',
- deps='replace popt talloc tevent tdb popt')
-
- bld.SAMBA_SUBSYSTEM('ctdb-common-util',
- source=bld.SUBDIR('common',
- 'system_util.c ctdb_logging.c'),
- includes='include include/internal',
- deps='replace tevent tdb')
-
if sys.platform.startswith('linux'):
CTDB_SYSTEM_SRC = bld.SUBDIR('common', 'system_linux.c')
elif sys.platform.startswith('aix'):
CTDB_SYSTEM_SRC = bld.SUBDIR('common', 'system_aix.c')
elif sys.platform.startswith('freebsd'):
CTDB_SYSTEM_SRC = bld.SUBDIR('common', 'system_freebsd.c')
- elif sys.platform == 'kfreebsd':
+ elif sys.platform.startswith('gnukfreebsd'):
CTDB_SYSTEM_SRC = bld.SUBDIR('common', 'system_kfreebsd.c')
elif sys.platform == 'gnu':
CTDB_SYSTEM_SRC = bld.SUBDIR('common', 'system_gnu.c')
Logs.error("Platform %s not supported" % sys.platform)
bld.SAMBA_SUBSYSTEM('ctdb-system',
- source=CTDB_SYSTEM_SRC,
- includes='include include/internal',
+ source=bld.SUBDIR('common',
+ 'system_common.c system_util.c') +
+ CTDB_SYSTEM_SRC,
+ includes='include',
deps='replace talloc tevent tdb pcap')
+ bld.SAMBA_SUBSYSTEM('ctdb-common',
+ source=bld.SUBDIR('common',
+ '''ctdb_io.c ctdb_util.c ctdb_ltdb.c
+ cmdline.c'''),
+ includes='include',
+ deps='replace popt talloc tevent tdb popt ctdb-system')
+
+ bld.SAMBA_SUBSYSTEM('ctdb-util',
+ source=bld.SUBDIR('common',
+ '''db_hash.c srvid.c reqid.c
+ pkt_read.c pkt_write.c comm.c
+ logging.c rb_tree.c'''),
+ deps='replace talloc tevent tdb tevent-unix-util')
+
+ bld.SAMBA_SUBSYSTEM('ctdb-protocol',
+ source=bld.SUBDIR('protocol',
+ '''protocol_header.c protocol_packet.c
+ protocol_types.c protocol_call.c
+ protocol_message.c
+ protocol_control.c
+ protocol_client.c
+ protocol_debug.c
+ protocol_util.c'''),
+ includes='include',
+ deps='replace talloc tdb')
+
bld.SAMBA_SUBSYSTEM('ctdb-client',
source=bld.SUBDIR('client', 'ctdb_client.c'),
- includes='include include/internal',
- public_headers='include/ctdb_client.h',
+ includes='include',
deps='''replace popt talloc tevent tdb
- samba-util tdb-wrap''')
+ samba-util tdb-wrap ctdb-util''')
+
+ bld.SAMBA_SUBSYSTEM('ctdb-client2',
+ source=bld.SUBDIR('client',
+ '''client_connect.c client_call.c
+ client_message.c client_control.c
+ client_message_sync.c
+ client_control_sync.c
+ client_db.c client_util.c
+ '''),
+ includes='include',
+ deps='replace talloc tevent tdb tdb-wrap')
+
+ bld.SAMBA_SUBSYSTEM('ctdb-ipalloc',
+ source=bld.SUBDIR('server',
+ '''ipalloc_deterministic.c
+ ipalloc_nondeterministic.c
+ ipalloc_lcp2.c
+ ipalloc_common.c
+ ipalloc.c
+ '''),
+ includes='include',
+ deps='ctdb-protocol replace talloc tevent')
bld.SAMBA_SUBSYSTEM('ctdb-server',
source='server/ctdbd.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_version.h
- include/ctdb.h
- include/ctdb_private.h
- include/ctdb_protocol.h
- include/ctdb_typesafe_cb.h''',
- deps='replace popt talloc tevent tdb talloc_report')
+ ctdb_lock.c ctdb_fork.c'''),
+ includes='include',
+ deps='ctdb-ipalloc replace popt talloc tevent tdb talloc_report')
bld.SAMBA_BINARY('ctdbd',
source='',
deps='''ctdb-server ctdb-client ctdb-common
- ctdb-common-util ctdb-system ctdb-tcp''' +
+ ctdb-system ctdb-tcp ctdb-util''' +
ib_deps,
install_path='${SBINDIR}',
manpages='ctdbd.1')
bld.SAMBA_BINARY('ctdb',
- source='tools/ctdb.c tools/ctdb_vacuum.c',
- deps='''ctdb-client ctdb-common ctdb-common-util
- ctdb-system''',
- includes='include include/internal',
+ source='tools/ctdb.c',
+ deps='ctdb-client ctdb-common ctdb-system ctdb-util',
+ includes='include',
install_path='${BINDIR}',
manpages='ctdb.1')
+ bld.SAMBA_BINARY('ctdb_killtcp',
+ source='tools/ctdb_killtcp.c',
+ deps='''ctdb-protocol ctdb-util ctdb-system
+ samba-util replace''',
+ install_path='${CTDB_HELPER_BINDIR}')
+
bld.SAMBA_BINARY('ltdbtool',
source='tools/ltdbtool.c',
includes='include',
bld.SAMBA_BINARY('ctdb_lock_helper',
source='server/ctdb_lock_helper.c',
- deps='samba-util ctdb-common-util talloc tdb',
- includes='include include/internal',
- install_path='${BINDIR}')
+ deps='samba-util ctdb-system talloc tdb',
+ includes='include',
+ install_path='${CTDB_HELPER_BINDIR}')
bld.SAMBA_BINARY('ctdb_event_helper',
source='server/ctdb_event_helper.c',
- includes='include include/internal',
- deps='samba-util ctdb-common-util replace tdb',
- install_path='${BINDIR}')
+ includes='include',
+ deps='samba-util ctdb-system replace tdb',
+ install_path='${CTDB_HELPER_BINDIR}')
+
+ bld.SAMBA_BINARY('ctdb_recovery_helper',
+ source='server/ctdb_recovery_helper.c',
+ deps='''ctdb-client2 ctdb-protocol ctdb-util
+ samba-util replace tdb''',
+ install_path='${CTDB_HELPER_BINDIR}')
bld.SAMBA_GENERATOR('ctdb-smnotify-h',
source='utils/smnotify/smnotify.x',
'smnotify.c gen_smnotify.c gen_xdr.c'),
deps='ctdb-smnotify-h ctdb-smnotify-c ctdb-smnotify-x popt',
includes='utils utils/smnotify',
- install_path='${BINDIR}')
+ install_path='${CTDB_HELPER_BINDIR}')
bld.SAMBA_BINARY('ping_pong',
source='utils/ping_pong/ping_pong.c',
if bld.env.HAVE_PMDA:
bld.SAMBA_BINARY('pmdactdb',
source='utils/pmda/pmda_ctdb.c',
- includes='include include/internal',
- deps='''ctdb-client ctdb-common ctdb-system
- ctdb-common-util pcp_pmda pcp''',
+ includes='include',
+ deps='ctdb-client ctdb-common pcp_pmda pcp',
install_path='${CTDB_PMDADIR}')
bld.INSTALL_FILES('${CTDB_PMDADIR}', 'utils/pmda/Install',
destname='Install')
destname='README')
sed_expr1 = 's|/usr/local/var/lib/ctdb|%s|g' % (bld.env.CTDB_VARDIR)
- sed_cmdline = '-e "%s"' % (sed_expr1)
+ sed_expr2 = 's|/usr/local/etc/ctdb|%s|g' % (bld.env.CTDB_ETCDIR)
+ sed_expr3 = 's|/usr/local/var/log|%s|g' % (bld.env.CTDB_LOGDIR)
+ sed_expr4 = 's|/usr/local/var/run/ctdb|%s|g' % (bld.env.CTDB_RUNDIR)
+ sed_expr5 = 's|/usr/local/sbin|%s|g' % (bld.env.SBINDIR)
+ sed_expr6 = 's|/usr/local/libexec/ctdb|%s|g' % (bld.env.CTDB_HELPER_BINDIR)
+ sed_cmdline = '-e "%s" -e "%s" -e "%s" -e "%s" -e "%s" -e "%s"' % \
+ (sed_expr1, sed_expr2, sed_expr3, sed_expr4, sed_expr5,
+ sed_expr6)
for f in manpages:
x = '%s.xml' % (f)
target=x,
rule='sed %s ${SRC} > ${TGT}' % (sed_cmdline))
- if 'XSLTPROC_MANPAGES' in bld.env and bld.env['XSLTPROC_MANPAGES']:
+ if bld.env.ctdb_generate_manpages:
bld.MANPAGES('''onnode.1 ctdbd_wrapper.1 ctdbd.conf.5
ctdb.7 ctdb-statistics.7 ctdb-tunables.7''',
True)
-
- bld.INSTALL_FILES('${BINDIR}', 'tools/onnode',
+ else:
+ for m in bld.env.ctdb_prebuilt_manpages:
+ bld.SAMBA_GENERATOR(m,
+ source=os.path.join("doc", m),
+ target=m,
+ rule='sed %s ${SRC} > ${TGT}' % (sed_cmdline))
+ bld.INSTALL_FILES('${MANDIR}/man%s' % m[-1], m)
+
+ bld.SAMBA_GENERATOR('ctdb-onnode',
+ source='tools/onnode',
+ target='onnode',
+ rule='sed %s ${SRC} > ${TGT}' % (sed_cmdline))
+ bld.INSTALL_FILES('${BINDIR}', 'onnode',
destname='onnode', chmod=0755)
- bld.INSTALL_FILES('${BINDIR}', 'tools/ctdb_diagnostics',
+
+ bld.SAMBA_GENERATOR('ctdb-diagnostics',
+ source='tools/ctdb_diagnostics',
+ target='ctdb_diagnostics',
+ rule='sed %s ${SRC} > ${TGT}' % (sed_cmdline))
+ bld.INSTALL_FILES('${BINDIR}', 'ctdb_diagnostics',
destname='ctdb_diagnostics', chmod=0755)
- bld.INSTALL_FILES('${SBINDIR}', 'config/ctdbd_wrapper',
+
+ bld.SAMBA_GENERATOR('ctdb-natgw',
+ source='tools/ctdb_natgw',
+ target='ctdb_natgw',
+ rule='sed %s ${SRC} > ${TGT}' % (sed_cmdline))
+ bld.INSTALL_FILES('${CTDB_HELPER_BINDIR}', 'ctdb_natgw',
+ destname='ctdb_natgw', chmod=0755)
+
+ bld.SAMBA_GENERATOR('ctdbd-wrapper',
+ source='config/ctdbd_wrapper',
+ target='ctdbd_wrapper',
+ rule='sed %s ${SRC} > ${TGT}' % (sed_cmdline))
+ bld.INSTALL_FILES('${SBINDIR}', 'ctdbd_wrapper',
destname='ctdbd_wrapper', chmod=0755)
def SUBDIR_MODE_callback(arg, dirname, fnames):
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_GENERATOR('ctdb-sudoers',
+ source='config/ctdb.sudoers',
+ target='ctdb.sudoers',
+ rule='sed %s ${SRC} > ${TGT}' % (sed_cmdline))
+ bld.INSTALL_FILES('${SYSCONFDIR}/sudoers.d', 'ctdb.sudoers',
destname='ctdb')
bld.INSTALL_FILES('${CTDB_ETCDIR}/notify.d', 'config/notify.d.README',
bld.install_dir(bld.env.CTDB_RUNDIR)
bld.install_dir(bld.env.CTDB_VARDIR)
- sed_expr = 's/@PACKAGE_VERSION@/%s/g' % VERSION
- t = bld.SAMBA_GENERATOR('ctdb-pc',
- source='ctdb.pc.in',
- target='ctdb.pc',
- rule='sed -e "%s" ${SRC} > ${TGT}' % sed_expr,
- dep_vars=['VERSION'])
- t.env.VERSION = VERSION
- bld.INSTALL_FILES('${LIBDIR}/pkgconfig', 'ctdb.pc')
+ # Unit tests
+ ctdb_unit_tests = [
+ 'db_hash_test',
+ 'srvid_test',
+ 'pkt_read_test',
+ 'pkt_write_test',
+ 'comm_test',
+ 'comm_server_test',
+ 'comm_client_test',
+ 'protocol_types_test',
+ 'protocol_client_test',
+ ]
+
+ for target in ctdb_unit_tests:
+ src = 'tests/src/' + target + '.c'
+
+ bld.SAMBA_BINARY(target,
+ source=src,
+ deps='talloc tevent tdb tevent-unix-util',
+ install_path='${CTDB_TEST_LIBDIR}')
+
+ bld.SAMBA_BINARY('reqid_test',
+ source='tests/src/reqid_test.c',
+ deps='samba-util',
+ install_path='${CTDB_TEST_LIBDIR}')
+
+ bld.SAMBA_BINARY('ctdb_packet_parse',
+ source='tests/src/ctdb_packet_parse.c',
+ deps='talloc tevent tdb ctdb-protocol',
+ install_path='${CTDB_TEST_LIBDIR}')
# Test binaries
ctdb_tests = [
bld.SAMBA_BINARY(target,
source=src,
- includes='include include/internal',
- deps='''ctdb-client ctdb-common ctdb-common-util
- ctdb-system''',
+ includes='include',
+ deps='ctdb-client ctdb-common ctdb-util',
install_path='${CTDB_TEST_LIBDIR}')
bld.SAMBA_BINARY('ctdb_takeover_tests',
source='tests/src/ctdb_takeover_tests.c',
deps='''replace popt tdb tevent talloc ctdb-system
- samba-util tdb-wrap talloc_report''' +
+ samba-util tdb-wrap talloc_report
+ ctdb-protocol ctdb-util''' +
ib_deps,
- includes='include include/internal',
+ includes='include',
install_path='${CTDB_TEST_LIBDIR}')
bld.SAMBA_BINARY('ctdb_functest',
source='tests/src/ctdb_functest.c',
deps='''replace tdb tevent talloc popt ctdb-system
- samba-util tdb-wrap''',
- includes='include include/internal',
+ samba-util tdb-wrap ctdb-util''',
+ includes='include',
install_path='${CTDB_TEST_LIBDIR}')
bld.SAMBA_BINARY('ctdb_stubtest',
source='tests/src/ctdb_test.c',
deps='''replace tdb tevent talloc popt ctdb-system
- samba-util tdb-wrap''',
- includes='include include/internal',
+ samba-util tdb-wrap ctdb-util''',
+ includes='include',
install_path='${CTDB_TEST_LIBDIR}')
if bld.env.HAVE_INFINIBAND:
bld.SAMBA_BINARY('ibwrapper_test',
source='ib/ibwrapper_test.c',
- includes='include include/internal',
- deps='''replace talloc ctdb-client ctdb-common
- ctdb-system''' +
+ includes='include',
+ deps='replace talloc ctdb-client ctdb-common' +
ib_deps,
install_path='${CTDB_TEST_LIBDIR}')
test_subdirs = [
'complex',
+ 'cunit',
'events.d',
'eventscripts',
'onnode',
bld.symlink_as(os.path.join(test_link_dir, t),
os.path.join(bld.env.CTDB_ETCDIR, t))
+ # Tests that use onnode need to overwrite link to in-tree
+ # functions file when installed
+ bld.symlink_as(os.path.join(bld.env.CTDB_TEST_DATADIR, 'onnode/functions'),
+ os.path.join(bld.env.CTDB_ETCDIR, 'functions'))
+ bld.symlink_as(os.path.join(bld.env.CTDB_TEST_DATADIR, 'simple/functions'),
+ os.path.join(bld.env.CTDB_ETCDIR, 'functions'))
+
+ # Need a link to nodes file because $CTDB_BASE is overridden
+ bld.symlink_as(os.path.join(bld.env.CTDB_TEST_DATADIR, 'simple/nodes'),
+ os.path.join(bld.env.CTDB_ETCDIR, 'nodes'))
+
def testonly(ctx):
cmd = 'tests/run_tests.sh -V tests/var'
git.samba.org / samba.git / blobdiff