samba_dist.DIST_DIRS('''ctdb:. lib/replace:lib/replace lib/talloc:lib/talloc
lib/tevent:lib/tevent lib/tdb:lib/tdb
- lib/socket_wrapper:lib/socket_wrapper
+ third_party/socket_wrapper:third_party/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
'ctdb_diagnostics.1',
'ctdbd_wrapper.1',
'onnode.1',
+ 'ctdb-script.options.5',
+ 'ctdb.sysconfig.5',
'ctdbd.conf.5',
'ctdb.7',
'ctdb-statistics.7',
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)
+ conf.SAMBA_CHECK_PYTHON(mandatory=False, version=(2,5,0))
+ conf.SAMBA_CHECK_PYTHON_HEADERS(mandatory=False)
if conf.CHECK_FOR_THIRD_PARTY():
conf.RECURSE('third_party/popt')
+ if conf.env.standalone_ctdb or conf.CONFIG_GET('ENABLE_SELFTEST'):
+ conf.RECURSE('third_party/socket_wrapper')
+ conf.env.SOCKET_WRAPPER_SO_PATH = conf.CONFIG_GET('LIBSOCKET_WRAPPER_SO_PATH')
else:
if not conf.CHECK_POPT():
raise Utils.WafError('popt development packages have not been found\nIf third_party is installed, check that it is in the proper place.')
else:
conf.define('USING_SYSTEM_POPT', 1)
+ conf.env.SOCKET_WRAPPER_SO_PATH = ''
+
+
+ if conf.env.standalone_ctdb or conf.CONFIG_GET('ENABLE_SELFTEST'):
+ if not conf.CHECK_SOCKET_WRAPPER():
+ raise Utils.WafError('socket_wrapper package has not been found.\nIf third_party is installed, check that it is in the proper place.')
+ else:
+ conf.define('USING_SYSTEM_SOCKET_WRAPPER', 1)
+ conf.env.SOCKET_WRAPPER_SO_PATH = conf.CONFIG_GET('LIBSOCKET_WRAPPER_SO_PATH')
conf.RECURSE('lib/util')
conf.RECURSE('lib/talloc')
conf.RECURSE('lib/tevent')
conf.RECURSE('lib/tdb')
- if conf.env.standalone_ctdb or conf.CONFIG_GET('ENABLE_SELFTEST'):
- conf.RECURSE('lib/socket_wrapper')
- conf.env.SOCKET_WRAPPER_SO_PATH = conf.CONFIG_GET('LIBSOCKET_WRAPPER_SO_PATH')
conf.CHECK_HEADERS('sched.h')
conf.CHECK_HEADERS('procinfo.h')
if not conf.CHECK_FUNCS_IN('pmdaDaemon', 'pcp_pmda'):
pmda_support = False
if pmda_support:
+ conf.CHECK_TYPE_IN('__pmID_int', 'pcp/pmapi.h pcp/impl.h')
have_pmda = True
else:
Logs.error("PMDA support not available")
else:
Logs.info(" %s: no" % (m))
+def gen_ctdb_version(task):
+ fp = file(task.outputs[0].bldpath(task.env), 'w')
+ fp.write('/* This file is auto-generated from waf */\n')
+ fp.write('#include "version.h"\n')
+ fp.write('\n')
+ fp.write('#define CTDB_VERSION_STRING "%s"\n' % VERSION)
+ fp.close()
+
+
def build(bld):
if bld.env.standalone_ctdb:
# enable building of public headers in the build tree
bld.env.build_public_headers = 'include/public'
- version_h = samba_utils.os_path_relpath(os.path.join(Options.launch_dir,
- "version.h"),
- bld.curdir)
-
if bld.env.standalone_ctdb:
- ctdb_mkversion = '../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
-
- 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
- else:
- t = bld.SAMBA_GENERATOR('ctdb-samba-version-header',
- target='include/ctdb_version.h',
- rule='printf "#include \\"%s\\" \\n#define CTDB_VERSION_STRING SAMBA_VERSION_STRING\\n" > ${TGT}' % version_h,
- dep_vars=['VERSION'])
- t.env.VERSION = VERSION
+ bld.SAMBA_MKVERSION('version.h', '%s/VERSION' % vdir)
+
+ t = bld.SAMBA_GENERATOR('ctdb-version-header',
+ target='include/ctdb_version.h',
+ rule=gen_ctdb_version,
+ 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')
+ if bld.env.standalone_ctdb or bld.CONFIG_GET('SOCKET_WRAPPER'):
+ bld.RECURSE('third_party/socket_wrapper')
bld.RECURSE('lib/tdb_wrap')
bld.RECURSE('lib/util')
bld.RECURSE('lib/talloc')
bld.RECURSE('lib/tevent')
bld.RECURSE('lib/tdb')
- if bld.env.standalone_ctdb or bld.CONFIG_GET('SOCKET_WRAPPER'):
- bld.RECURSE('lib/socket_wrapper')
if bld.env.standalone_ctdb:
# If a combined build is implemented, CTDB will want to
'''ctdb_io.c ctdb_util.c ctdb_ltdb.c
sock_io.c'''),
includes='include',
- deps='replace popt talloc tevent tdb popt ctdb-system')
+ deps='''replace popt talloc tevent tdb popt ctdb-system
+ ctdb-protocol-util''')
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 tunable.c
- pidfile.c run_proc.c'''),
+ pidfile.c run_proc.c
+ hash_count.c run_event.c
+ sock_client.c version.c
+ cmdline.c path.c conf.c
+ '''),
deps='''samba-util sys_rw tevent-util
- replace talloc tevent tdb''')
+ replace talloc tevent tdb popt''')
bld.SAMBA_SUBSYSTEM('ctdb-protocol',
source=bld.SUBDIR('protocol',
'''protocol_header.c protocol_packet.c
- protocol_types.c protocol_call.c
+ protocol_basic.c protocol_types.c
+ protocol_call.c
protocol_message.c
protocol_control.c
+ protocol_keepalive.c
+ protocol_tunnel.c
protocol_client.c
protocol_debug.c
- protocol_util.c
- protocol_event.c'''),
+ protocol_event.c
+ protocol_sock.c'''),
includes='include',
deps='replace talloc tdb')
- bld.SAMBA_SUBSYSTEM('ctdb-client',
- source=bld.SUBDIR('client', 'ctdb_client.c'),
- includes='include',
- deps='''replace popt talloc tevent tdb
- samba-util tdb-wrap ctdb-util''')
+ bld.SAMBA_SUBSYSTEM('ctdb-protocol-util',
+ source='protocol/protocol_util.c',
+ deps='replace talloc tdb')
- bld.SAMBA_SUBSYSTEM('ctdb-client2',
+ bld.SAMBA_SUBSYSTEM('ctdb-client',
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
- client_event.c
+ client_event.c client_tunnel.c
'''),
includes='include',
deps='replace talloc tevent tdb tdb-wrap')
source=bld.SUBDIR('common',
'''sock_daemon.c'''),
deps='''samba-util ctdb-util tevent-util
- replace talloc tevent''')
+ LIBASYNC_REQ replace talloc tevent''')
bld.SAMBA_SUBSYSTEM('ctdb-ipalloc',
source=bld.SUBDIR('server',
ipalloc.c
'''),
includes='include',
- deps='ctdb-protocol replace talloc tevent')
+ deps='ctdb-protocol-util replace talloc tevent')
+
+ bld.SAMBA_BINARY('ctdb-path',
+ source='common/path_tool.c',
+ cflags='-DCTDB_PATH_TOOL',
+ deps='''ctdb-util samba-util talloc replace popt''',
+ install_path='${CTDB_HELPER_BINDIR}')
bld.SAMBA_BINARY('ctdbd',
source='server/ctdbd.c ' +
ctdb_vacuum.c ctdb_banning.c
ctdb_statistics.c
ctdb_update_record.c
- ctdb_lock.c ctdb_fork.c'''),
+ ctdb_lock.c ctdb_fork.c
+ ctdb_tunnel.c ctdb_client.c'''),
includes='include',
- deps='''ctdb-ipalloc ctdb-client ctdb-common ctdb-system
+ deps='''ctdb-common ctdb-system ctdb-protocol
ctdb-tcp ctdb-util replace sys_rw popt
- talloc tevent tdb talloc_report''' +
+ talloc tevent tdb-wrap tdb talloc_report''' +
ib_deps,
install_path='${SBINDIR}',
manpages='ctdbd.1')
bld.SAMBA_BINARY('ctdb',
source='tools/ctdb.c',
- deps='''ctdb-client2 ctdb-protocol ctdb-util ctdb-system
- samba-util sys_rw popt''',
+ deps='''ctdb-client ctdb-protocol ctdb-protocol-util
+ ctdb-util ctdb-system samba-util sys_rw popt''',
install_path='${BINDIR}',
manpages='ctdb.1')
bld.SAMBA_BINARY('ctdb_killtcp',
source='tools/ctdb_killtcp.c',
- deps='''ctdb-protocol ctdb-util ctdb-system
+ deps='''ctdb-protocol-util ctdb-util ctdb-system
samba-util replace''',
install_path='${CTDB_HELPER_BINDIR}')
bld.SAMBA_BINARY('ctdb_event',
source='tools/ctdb_event.c',
- deps='''ctdb-client2 ctdb-protocol ctdb-util ctdb-system
- samba-util replace''',
+ deps='''ctdb-client ctdb-protocol ctdb-protocol-util
+ ctdb-util ctdb-system samba-util replace''',
install_path='${CTDB_HELPER_BINDIR}')
bld.SAMBA_BINARY('ltdbtool',
bld.SAMBA_BINARY('ctdb_eventd',
source='server/ctdb_eventd.c',
- deps='''ctdb-server-util ctdb-protocol ctdb-util
- samba-util LIBASYNC_REQ replace popt''',
+ deps='''ctdb-server-util ctdb-protocol ctdb-protocol-util
+ ctdb-util samba-util replace popt''',
install_path='${CTDB_HELPER_BINDIR}')
bld.SAMBA_BINARY('ctdb_lock_helper',
bld.SAMBA_BINARY('ctdb_recovery_helper',
source='server/ctdb_recovery_helper.c',
- deps='''ctdb-client2 ctdb-protocol ctdb-util
+ deps='''ctdb-client ctdb-protocol ctdb-util
samba-util sys_rw replace tdb''',
install_path='${CTDB_HELPER_BINDIR}')
bld.SAMBA_BINARY('ctdb_takeover_helper',
source='server/ctdb_takeover_helper.c',
- deps='''ctdb-client2 ctdb-protocol ctdb-util
+ deps='''ctdb-client ctdb-protocol ctdb-util
samba-util sys_rw replace ctdb-ipalloc popt''',
install_path='${CTDB_HELPER_BINDIR}')
bld.SAMBA_BINARY('smnotify',
source=bld.SUBDIR('utils/smnotify',
'smnotify.c gen_smnotify.c gen_xdr.c'),
- deps='ctdb-smnotify-h ctdb-smnotify-c ctdb-smnotify-x popt',
+ deps='ctdb-smnotify-h ctdb-smnotify-c ctdb-smnotify-x popt tirpc',
includes='utils utils/smnotify',
install_path='${CTDB_HELPER_BINDIR}')
bld.SAMBA_BINARY('pmdactdb',
source='utils/pmda/pmda_ctdb.c',
includes='include',
- deps='''ctdb-client2 ctdb-protocol ctdb-util
+ deps='''ctdb-client ctdb-protocol ctdb-util
samba-util pcp_pmda pcp''',
install_path='${CTDB_PMDADIR}')
bld.INSTALL_FILES('${CTDB_PMDADIR}', 'utils/pmda/Install',
'ctdb-crash-cleanup.sh',
'debug-hung-script.sh',
'debug_locks.sh',
- 'gcore_trace.sh',
'nfs-linux-kernel-callout',
'notify.sh',
'statd-callout'
'comm_test',
'comm_server_test',
'comm_client_test',
- 'protocol_types_test',
- 'protocol_client_test',
'pidfile_test',
'run_proc_test',
'sock_daemon_test',
'sock_io_test',
+ 'hash_count_test',
+ 'run_event_test',
+ 'cmdline_test',
+ 'conf_test',
]
for target in ctdb_unit_tests:
bld.SAMBA_BINARY(target,
source=src,
- deps='''talloc tevent tdb tevent-util
+ deps='''talloc tevent tdb tevent-util popt
LIBASYNC_REQ samba-util sys_rw''',
install_path='${CTDB_TEST_LIBEXECDIR}')
deps='samba-util ctdb-system popt',
install_path='${CTDB_TEST_LIBEXECDIR}')
+ bld.SAMBA_SUBSYSTEM('protocol-tests-common',
+ source=bld.SUBDIR('tests/src',
+ '''protocol_common.c
+ protocol_common_ctdb.c
+ protocol_common_event.c
+ '''),
+ includes='include',
+ deps='replace popt talloc tevent tdb')
+
+ ctdb_protocol_tests = [
+ 'protocol_basic_test',
+ 'protocol_types_test',
+ 'protocol_ctdb_test',
+ 'protocol_event_test',
+ 'protocol_util_test',
+ 'protocol_types_compat_test',
+ 'protocol_ctdb_compat_test',
+ ]
+
+ for target in ctdb_protocol_tests:
+ src = 'tests/src/' + target + '.c'
+
+ bld.SAMBA_BINARY(target,
+ source=src,
+ deps='''protocol-tests-common
+ samba-util talloc tdb''',
+ install_path='${CTDB_TEST_LIBEXECDIR}')
bld.SAMBA_SUBSYSTEM('ctdb-tests-common',
source=bld.SUBDIR('tests/src',
includes='include',
deps='replace popt talloc tevent tdb')
- bld.SAMBA_BINARY('protocol_util_test',
- source='tests/src/protocol_util_test.c',
- deps='talloc ctdb-protocol samba-util',
- install_path='${CTDB_TEST_LIBEXECDIR}')
-
# Test binaries
ctdb_tests = [
'g_lock_loop',
'transaction_loop',
'update_record',
'update_record_persistent',
- 'lock_tdb'
+ 'lock_tdb',
+ 'dummy_client',
+ 'tunnel_test',
+ 'tunnel_cmd',
]
for target in ctdb_tests:
bld.SAMBA_BINARY(target,
source=src,
includes='include',
- deps='''ctdb-client2 ctdb-protocol ctdb-util
+ deps='''ctdb-client ctdb-protocol ctdb-util
samba-util ctdb-tests-common''',
install_path='${CTDB_TEST_LIBEXECDIR}')
bld.SAMBA_BINARY('fake_ctdbd',
source='''tests/src/fake_ctdbd.c
tests/src/ipalloc_read_known_ips.c''',
- deps='''ctdb-util ctdb-protocol ctdb-system
- samba-util tevent-util LIBASYNC_REQ popt''',
+ deps='''ctdb-util ctdb-protocol ctdb-protocol-util
+ ctdb-system samba-util tevent-util
+ LIBASYNC_REQ popt''',
install_path='${CTDB_TEST_LIBEXECDIR}')
if bld.env.HAVE_INFINIBAND:
bld.SAMBA_BINARY('ibwrapper_test',
source='ib/ibwrapper_test.c',
includes='include',
- deps='replace talloc ctdb-client ctdb-common sys_rw' +
+ deps='replace talloc ctdb-common sys_rw' +
ib_deps,
install_path='${CTDB_TEST_LIBEXECDIR}')
'complex',
'cunit',
'eventd',
- 'events.d',
'eventscripts',
'onnode',
'shellcheck',
'script_install_paths.sh',
destname='script_install_paths.sh', chmod=0644)
- sed_expr1 = 's@^test_dir=.*@test_dir=%s\\nexport TEST_BIN_DIR=\"%s\"@' % (
- bld.env.CTDB_TEST_DATADIR, bld.env.CTDB_TEST_LIBEXECDIR)
+ sed_expr1 = 's@^\(export %s\)=.*@\\1=%s\\nexport %s=\"%s\"@''' % (
+ 'CTDB_TEST_DIR', bld.env.CTDB_TEST_DATADIR,
+ 'TEST_BIN_DIR', bld.env.CTDB_TEST_LIBEXECDIR)
sed_expr2 = 's@^\(export CTDB_TESTS_ARE_INSTALLED\)=false@\\1=true@'
bld.SAMBA_GENERATOR('ctdb-test-runner',
source='tests/run_tests.sh',
bld.symlink_as(os.path.join(bld.env.BINDIR, 'ctdb_run_cluster_tests'),
'ctdb_run_tests')
- test_eventscript_links = [
- 'events.d',
- 'functions',
- 'nfs-checks.d',
- 'nfs-linux-kernel-callout',
- 'statd-callout'
- ]
-
- test_link_dir = os.path.join(bld.env.CTDB_TEST_DATADIR,
- 'eventscripts/etc-ctdb')
- for t in test_eventscript_links:
- 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'
def autotest(ctx):
env = samba_utils.LOAD_ENVIRONMENT()
- ld = 'LD_PRELOAD=%s' % env.SOCKET_WRAPPER_SO_PATH
- cmd = '%s tests/run_tests.sh -e -S -C' % ld
+ cmd = 'tests/run_tests.sh -e -S %s -C' % env.SOCKET_WRAPPER_SO_PATH
ret = samba_utils.RUN_COMMAND(cmd)
if ret != 0:
print('autotest exited with exit status %d' % ret)
def distonly(ctx):
samba_dist.DIST_FILES('VERSION:VERSION', extend=True)
- t = 'include/ctdb_version.h'
- cmd = 'packaging/mkversion.sh %s %s' % (t, VERSION)
- ret = samba_utils.RUN_COMMAND(cmd)
- if ret != 0:
- print('Command "%s" failed with exit status %d' % (cmd, ret))
- sys.exit(ret)
- samba_dist.DIST_FILES('ctdb/%s:%s' % (t, t), extend=True)
+ distfile = file('.distversion', 'w')
+ for field in version.vcs_fields:
+ distfile.write('%s=%s\n' % (field, str(version.vcs_fields[field])))
+ distfile.close()
+ samba_dist.DIST_FILES('ctdb/.distversion:.distversion', extend=True)
t = 'ctdb.spec'
sed_expr1 = 's/@VERSION@/%s/g' % VERSION
git.samba.org / vlendec / samba-autobuild / .git / blobdiff