srcdir = srcdir + '/..'
sys.path.insert(0, srcdir + '/buildtools/wafsamba')
-import wafsamba, samba_dist, Options, Logs
+import wafsamba, samba_dist, Options, Logs, Utils
import samba_utils, samba_version
env = samba_utils.LOAD_ENVIRONMENT()
if os.path.isfile('./VERSION'):
- vdir='.'
+ vdir = '.'
elif os.path.isfile('../VERSION'):
- vdir='..'
+ vdir = '..'
else:
Logs.error("VERSION file not found")
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 lib/popt:lib/popt
+ lib/tevent:lib/tevent lib/tdb:lib/tdb
lib/socket_wrapper:lib/socket_wrapper
- buildtools:buildtools''')
+ 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 third_party/waf:third_party/waf''')
+
+manpages = [
+ 'ctdb.1',
+ 'ctdb.7',
+ 'ctdbd.1',
+ 'ctdbd.conf.5',
+ 'ctdbd_wrapper.1',
+ 'ctdb-statistics.7',
+ 'ctdb-tunables.7',
+ 'ltdbtool.1',
+ 'onnode.1',
+ 'ping_pong.1'
+]
+
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')
help=("Path to log directory"),
action="store", dest='ctdb_logdir', default=None)
opt.add_option('--with-socketpath',
- help=("path to CTDB daemon socket"),
- action="store_true", dest='ctdb_sockpath', default=False)
+ help=("path to CTDB daemon socket"),
+ action="store", dest='ctdb_sockpath', default=None)
+
def configure(conf):
# 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')
- conf.RECURSE('lib/popt')
+
+ 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:
+ 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.RECURSE('lib/util')
+
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')
+ if sys.platform.startswith('aix') and not conf.CHECK_FUNCS('thread_setsched'):
+ Logs.error('Need thread_setsched() on AIX')
+ sys.exit(1)
+ elif not conf.CHECK_FUNCS('sched_setscheduler'):
+ Logs.error('Need sched_setscheduler()')
+ sys.exit(1)
+ conf.CHECK_FUNCS('mlockall')
+
+ 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:
conf.env.CTDB_VARDIR = os.path.join(conf.env.LOCALSTATEDIR, 'lib/ctdb')
conf.env.CTDB_RUNDIR = os.path.join(conf.env.LOCALSTATEDIR, 'run/ctdb')
- machine = os.uname()[4]
- if machine in ['x86_64', 'ppc64', 'powerpc64']:
- conf.env.LIBDIR = conf.env.LIBDIR + '64'
-
if Options.options.ctdb_logdir:
conf.env.CTDB_LOGDIR = Options.options.ctdb_logdir
else:
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('''-DBINDIR=\"%s\"
+ 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_LOGDIR,
- conf.env.CTDB_SOCKPATH,
conf.env.CTDB_ETCDIR,
conf.env.CTDB_VARDIR,
conf.env.CTDB_RUNDIR))
'share/ctdb-tests')
conf.env.CTDB_TEST_LIBDIR = os.path.join(conf.env.LIBDIR, 'ctdb-tests')
- conf.DEFINE('HAVE_CONFIG_H', 1, add_to_cflags=True)
- conf.SAMBA_CONFIG_H()
+ # Allow unified compilation and separate compilation of utilities
+ # to find includes
+ if not conf.env.standalone_ctdb:
+ conf.ADD_EXTRA_INCLUDES('#include/public #ctdb/include #ctdb')
+ else:
+ if srcdir == '.':
+ # Building from tarball
+ conf.ADD_EXTRA_INCLUDES('#include')
+ else:
+ # Building standalone CTDB from within Samba tree
+ conf.ADD_EXTRA_INCLUDES('#ctdb/include')
+ conf.ADD_EXTRA_INCLUDES('#ctdb')
+ conf.ADD_EXTRA_INCLUDES('#lib #lib/replace')
+
+ 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()
+
+ 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:
+ # 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.env.PKGCONFIGDIR = '${LIBDIR}/pkgconfig'
+
bld.RECURSE('lib/replace')
- bld.RECURSE('lib/popt')
+ if bld.CHECK_FOR_THIRD_PARTY():
+ bld.RECURSE('third_party/popt')
+
+ bld.RECURSE('lib/tdb_wrap')
+ bld.RECURSE('lib/util')
+
bld.RECURSE('lib/talloc')
bld.RECURSE('lib/tevent')
bld.RECURSE('lib/tdb')
- bld.RECURSE('lib/socket_wrapper')
-
- bld.SAMBA_GENERATOR('ctdb-version-header',
- target='include/ctdb_version.h',
- rule='../packaging/mkversion.sh ${TGT} %s' % (VERSION),
- always=True)
-
- bld.SAMBA_SUBSYSTEM('ctdb-util',
- source=bld.SUBDIR('lib/util',
- 'util.c util_file.c util_time.c'),
- includes='include include/internal',
- deps='replace talloc tevent tdb')
-
- bld.SAMBA_SUBSYSTEM('ctdb-util-misc',
- source=bld.SUBDIR('lib/util',
- '''db_wrap.c debug.c fault.c
- idtree.c signal.c strlist.c
- substitute.c'''),
- includes='include include/internal lib/util',
- deps='replace talloc tevent 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
+ # 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',
'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')
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 . lib/util',
- deps='replace popt talloc tevent tdb')
-
- 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 == 'linux2':
+ if sys.platform.startswith('linux'):
CTDB_SYSTEM_SRC = bld.SUBDIR('common', 'system_linux.c')
- elif sys.platform == 'aix':
+ elif sys.platform.startswith('aix'):
CTDB_SYSTEM_SRC = bld.SUBDIR('common', 'system_aix.c')
- elif sys.platform == 'freebsd':
+ elif sys.platform.startswith('freebsd'):
CTDB_SYSTEM_SRC = bld.SUBDIR('common', 'system_freebsd.c')
elif sys.platform == 'kfreebsd':
CTDB_SYSTEM_SRC = bld.SUBDIR('common', 'system_kfreebsd.c')
Logs.error("Platform %s not supported" % sys.platform)
bld.SAMBA_SUBSYSTEM('ctdb-system',
- source=CTDB_SYSTEM_SRC,
- includes='include include/internal',
- deps='replace talloc tevent tdb')
+ 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 rb_tree.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'''),
+ 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_util.c'''),
+ includes='include',
+ deps='replace talloc tdb')
bld.SAMBA_SUBSYSTEM('ctdb-client',
source=bld.SUBDIR('client', 'ctdb_client.c'),
- includes='include include/internal lib/util',
- public_headers='include/ctdb_client.h',
- deps='replace popt talloc tevent tdb')
+ includes='include',
+ deps='''replace popt talloc tevent tdb
+ 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-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 lib/util',
- public_headers='''include/ctdb.h
- include/ctdb_private.h
- include/ctdb_protocol.h
- include/ctdb_typesafe_cb.h''',
- deps='replace popt talloc tevent tdb')
-
- bld.SAMBA_BINARY('bin/ctdbd',
+ ctdb_lock.c ctdb_fork.c'''),
+ includes='include',
+ deps='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-util ctdb-util-misc''' +
+ ctdb-system ctdb-tcp ctdb-util''' +
ib_deps,
install_path='${SBINDIR}',
- manpages='doc/ctdbd.1')
+ manpages='ctdbd.1')
- bld.SAMBA_BINARY('bin/ctdb',
- source='tools/ctdb.c tools/ctdb_vacuum.c',
- deps='''ctdb-client ctdb-common ctdb-common-util
- ctdb-system ctdb-util ctdb-util-misc''',
+ bld.SAMBA_BINARY('ctdb',
+ source='tools/ctdb.c',
+ deps='ctdb-client ctdb-common ctdb-system ctdb-util',
+ includes='include',
install_path='${BINDIR}',
- manpages='doc/ctdb.1')
+ manpages='ctdb.1')
- bld.SAMBA_BINARY('bin/ltdbtool',
+ bld.SAMBA_BINARY('ltdbtool',
source='tools/ltdbtool.c',
includes='include',
deps='tdb',
install_path='${BINDIR}',
- manpages='doc/ltdbtool.1')
+ manpages='ltdbtool.1')
- bld.SAMBA_BINARY('bin/ctdb_lock_helper',
+ bld.SAMBA_BINARY('ctdb_lock_helper',
source='server/ctdb_lock_helper.c',
- deps='ctdb-util ctdb-util-misc ctdb-common-util talloc tdb',
+ deps='samba-util ctdb-system talloc tdb',
+ includes='include',
install_path='${BINDIR}')
- bld.SAMBA_BINARY('bin/ctdb_event_helper',
+ bld.SAMBA_BINARY('ctdb_event_helper',
source='server/ctdb_event_helper.c',
- includes='include include/internal',
- deps='ctdb-util ctdb-util-misc ctdb-common-util replace tdb',
+ includes='include',
+ deps='samba-util ctdb-system replace tdb',
+ install_path='${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='${BINDIR}')
bld.SAMBA_GENERATOR('ctdb-smnotify-h',
target='utils/smnotify/smnotify.h',
rule='rpcgen -h ${SRC} > ${TGT}')
+ xdr_buf_hack = 'sed -e "s@^\([ \t]*register int32_t \*buf\);@\\1 = buf;@"'
+
bld.SAMBA_GENERATOR('ctdb-smnotify-x',
source='utils/smnotify/smnotify.x',
target='utils/smnotify/gen_xdr.c',
- rule='rpcgen -c ${SRC} > ${TGT}')
+ rule='rpcgen -c ${SRC} | ' + xdr_buf_hack + ' > ${TGT}')
bld.SAMBA_GENERATOR('ctdb-smnotify-c',
source='utils/smnotify/smnotify.x',
target='utils/smnotify/gen_smnotify.c',
rule='rpcgen -l ${SRC} > ${TGT}')
- bld.SAMBA_BINARY('bin/smnotify',
+ 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',
includes='utils utils/smnotify',
install_path='${BINDIR}')
- bld.SAMBA_BINARY('bin/ping_pong',
+ bld.SAMBA_BINARY('ping_pong',
source='utils/ping_pong/ping_pong.c',
deps='',
install_path='${BINDIR}',
- manpages='doc/ping_pong.1')
+ manpages='ping_pong.1')
if bld.env.HAVE_PMDA:
- bld.SAMBA_BINARY('bin/pmdactdb',
+ bld.SAMBA_BINARY('pmdactdb',
source='utils/pmda/pmda_ctdb.c',
- includes='include include/internal',
- deps='''ctdb-client ctdb-common ctdb-system
- ctdb-util-misc ctdb-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')
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-tunables.7''', True)
-
- bld.INSTALL_FILES('${BINDIR}', 'tools/onnode',
+ sed_expr1 = 's|/usr/local/var/lib/ctdb|%s|g' % (bld.env.CTDB_VARDIR)
+ 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_cmdline = '-e "%s" -e "%s" -e "%s" -e "%s" -e "%s"' % \
+ (sed_expr1, sed_expr2, sed_expr3, sed_expr4, sed_expr5)
+
+ for f in manpages:
+ x = '%s.xml' % (f)
+ bld.SAMBA_GENERATOR(x,
+ source=os.path.join('doc', x),
+ target=x,
+ rule='sed %s ${SRC} > ${TGT}' % (sed_cmdline))
+
+ 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)
+ 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('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):
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):
- pd = {'trim_path': trim_path, 'file_list': []}
- os.path.walk(path, SUBDIR_MODE_callback, pd)
- return pd['file_list']
+ pd = {'trim_path': trim_path, 'file_list': []}
+ os.path.walk(path, SUBDIR_MODE_callback, pd)
+ return pd['file_list']
etc_subdirs = [
'events.d',
- 'nfs-rpc-checks.d'
+ 'nfs-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])
- bld.INSTALL_FILES(bld.env.CTDB_ETCDIR, 'config/functions',
- destname='functions')
+ bld.SAMBA_GENERATOR('ctdb-functions',
+ source='config/functions',
+ target='functions',
+ rule='sed %s ${SRC} > ${TGT}' % (sed_cmdline))
+ bld.INSTALL_FILES(bld.env.CTDB_ETCDIR, 'functions', destname='functions')
etc_scripts = [
'ctdb-crash-cleanup.sh',
'debug-hung-script.sh',
'debug_locks.sh',
'gcore_trace.sh',
+ 'nfs-linux-kernel-callout',
'notify.sh',
'statd-callout'
]
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_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_VARDIR)
sed_expr = 's/@PACKAGE_VERSION@/%s/g' % VERSION
- bld.SAMBA_GENERATOR('ctdb-pc',
- source='ctdb.pc.in',
- target='ctdb.pc',
- rule='sed -e "%s" ${SRC} > ${TGT}' % sed_expr)
+ 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}')
+
# Test binaries
ctdb_tests = [
'rb_test',
'ctdb_lock_tdb'
]
- for t in ctdb_tests:
- target = 'bin/' + t
- src = 'tests/src/' + t + '.c'
+ for target in ctdb_tests:
+ src = 'tests/src/' + target + '.c'
- bld.SAMBA_BINARY(target,
- source=src,
- deps='''ctdb-client ctdb-common ctdb-common-util
- ctdb-system ctdb-util ctdb-util-misc''',
- install_path='${CTDB_TEST_LIBDIR}')
+ bld.SAMBA_BINARY(target,
+ source=src,
+ includes='include',
+ deps='ctdb-client ctdb-common ctdb-util',
+ install_path='${CTDB_TEST_LIBDIR}')
- bld.SAMBA_BINARY('bin/ctdb_takeover_tests',
+ bld.SAMBA_BINARY('ctdb_takeover_tests',
source='tests/src/ctdb_takeover_tests.c',
- deps='replace popt tdb tevent talloc ctdb-system' +
+ deps='''replace popt tdb tevent talloc ctdb-system
+ samba-util tdb-wrap talloc_report''' +
ib_deps,
- includes='../include ../include/internal lib/util',
+ includes='include',
install_path='${CTDB_TEST_LIBDIR}')
- bld.SAMBA_BINARY('bin/ctdb_functest',
+ bld.SAMBA_BINARY('ctdb_functest',
source='tests/src/ctdb_functest.c',
- deps='replace tdb tevent talloc popt ctdb-system',
- includes='../include ../include/internal lib/util',
+ deps='''replace tdb tevent talloc popt ctdb-system
+ samba-util tdb-wrap''',
+ includes='include',
install_path='${CTDB_TEST_LIBDIR}')
- bld.SAMBA_BINARY('bin/ctdb_stubtest',
+ bld.SAMBA_BINARY('ctdb_stubtest',
source='tests/src/ctdb_test.c',
- deps='replace tdb tevent talloc popt ctdb-system',
- includes='../include ../include/internal lib/util',
+ deps='''replace tdb tevent talloc popt ctdb-system
+ samba-util tdb-wrap''',
+ includes='include',
install_path='${CTDB_TEST_LIBDIR}')
if bld.env.HAVE_INFINIBAND:
- bld.SAMBA_BINARY('bin/ibwrapper_test',
+ bld.SAMBA_BINARY('ibwrapper_test',
source='ib/ibwrapper_test.c',
- includes='include include/internal',
- deps='''replace talloc ctdb-client ctdb-common
- ctdb-system ctdb-util-misc ctdb-util''' +
+ includes='include',
+ deps='replace talloc ctdb-client ctdb-common' +
ib_deps,
install_path='${CTDB_TEST_LIBDIR}')
test_subdirs = [
'complex',
+ 'cunit',
'events.d',
'eventscripts',
'onnode',
test_eventscript_links = [
'events.d',
'functions',
- 'nfs-rpc-checks.d'
+ 'nfs-checks.d',
+ 'nfs-linux-kernel-callout',
+ 'statd-callout'
]
test_link_dir = os.path.join(bld.env.CTDB_TEST_DATADIR,
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'
print('tests exited with exit status %d' % ret)
sys.exit(ret)
+
def test(ctx):
import Scripting
Scripting.commands.append('build')
Scripting.commands.append('testonly')
+
def autotest(ctx):
- cmd = 'LD_PRELOAD=bin/shared/libsocket-wrapper.so tests/run_tests.sh -e -S -C'
+ ld = 'LD_PRELOAD=%s/bin/shared/libsocket-wrapper.so' % os.getcwd()
+ cmd = '%s tests/run_tests.sh -e -S -C' % ld
ret = samba_utils.RUN_COMMAND(cmd)
if ret != 0:
print('autotest exited with exit status %d' % ret)
sys.exit(ret)
+
def show_version(ctx):
print VERSION
+
def dist():
samba_dist.DIST_FILES('VERSION:VERSION', extend=True)
sys.exit(ret)
samba_dist.DIST_FILES('ctdb/%s:%s' % (t, t), extend=True)
- manpages = [
- 'ctdb.1',
- 'ctdb.7',
- 'ctdbd.1',
- 'ctdbd.conf.5',
- 'ctdbd_wrapper.1',
- 'ctdb-tunables.7',
- 'ltdbtool.1'
- ]
-
cmd = 'make -C doc'
ret = samba_utils.RUN_COMMAND(cmd)
if ret != 0:
samba_dist.dist()
+
def rpmonly(ctx):
- cmd = 'rpmbuild -ta --clean --rmsource ctdb-%s.tar.gz' % VERSION
+ opts = os.getenv('RPM_OPTIONS') or ''
+ cmd = 'rpmbuild -ta --clean --rmsource %s ctdb-%s.tar.gz' % (opts, VERSION)
ret = samba_utils.RUN_COMMAND(cmd)
if ret != 0:
print('rpmbuild exited with exit status %d' % ret)
sys.exit(ret)
+
def rpm(ctx):
import Scripting
Scripting.commands.append('dist')
Scripting.commands.append('rpmonly')
+
def ctags(ctx):
"build 'tags' file using ctags"
import Utils
git.samba.org / obnox / samba / samba-obnox.git / blobdiff