lib/async_req:lib/async_req
buildtools:buildtools third_party/waf:third_party/waf''')
-manpages = [
+manpages_binary = [
'ctdb.1',
- 'ctdb.7',
'ctdbd.1',
- 'ctdbd.conf.5',
+ 'ltdbtool.1',
+ 'ping_pong.1'
+]
+
+manpages_misc = [
+ 'ctdb_diagnostics.1',
'ctdbd_wrapper.1',
+ 'onnode.1',
+ 'ctdbd.conf.5',
+ 'ctdb.7',
'ctdb-statistics.7',
'ctdb-tunables.7',
- 'ltdbtool.1',
- 'onnode.1',
- 'ping_pong.1'
+]
+
+manpages_etcd = [
+ 'ctdb-etcd.7',
+]
+
+manpages_ceph = [
+ 'ctdb_mutex_ceph_rados_helper.7',
]
opt.add_option('--enable-pmda',
help=("Turn on PCP pmda support (default=no)"),
action="store_true", dest='ctdb_pmda', default=False)
+ opt.add_option('--enable-etcd-reclock',
+ help=("Enable etcd recovery lock helper (default=no)"),
+ action="store_true", dest='ctdb_etcd_reclock', default=False)
+ opt.add_option('--enable-ceph-reclock',
+ help=("Enable Ceph CTDB recovery lock helper (default=no)"),
+ action="store_true", dest='ctdb_ceph_reclock', default=False)
opt.add_option('--with-logdir',
help=("Path to log directory"),
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')
conf.define('HAVE_INFINIBAND', 1)
conf.define('USE_INFINIBAND', 1)
+ have_etcd_reclock = False
+ if Options.options.ctdb_etcd_reclock:
+ try:
+ conf.check_python_module('etcd')
+ have_etcd_reclock = True
+ except:
+ Logs.error('etcd support not available')
+ sys.exit(1)
+ if have_etcd_reclock:
+ Logs.info('Building with etcd support')
+ conf.env.etcd_reclock = have_etcd_reclock
+
+ if Options.options.ctdb_ceph_reclock:
+ if (conf.CHECK_HEADERS('rados/librados.h', False, False, 'rados') and
+ conf.CHECK_LIB('rados', shlib=True)):
+ Logs.info('Building with Ceph librados recovery lock support')
+ conf.define('HAVE_LIBRADOS', 1)
+ else:
+ Logs.error("Missing librados for Ceph recovery lock support")
+ sys.exit(1)
+
conf.env.CTDB_BINDIR = os.path.join(conf.env.EXEC_PREFIX, 'bin')
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))
conf.env.CTDB_TEST_DATADIR = os.path.join(conf.env.EXEC_PREFIX,
- 'share/ctdb-tests')
- conf.env.CTDB_TEST_LIBDIR = os.path.join(conf.env.LIBDIR, 'ctdb-tests')
+ 'share/ctdb/tests')
+ conf.env.CTDB_TEST_LIBEXECDIR = os.path.join(conf.env.LIBEXECDIR, 'ctdb/tests')
# Allow unified compilation and separate compilation of utilities
# to find includes
Logs.info("xsltproc unavailable, checking for pre-built manpages")
conf.env.ctdb_prebuilt_manpages = []
+ manpages = manpages_binary + manpages_misc
+ if conf.env.etcd_reclock:
+ manpages += manpages_etcd
+ if conf.env.HAVE_LIBRADOS:
+ manpages += manpages_ceph
for m in manpages:
if os.path.exists(os.path.join("doc", m)):
Logs.info(" %s: yes" % (m))
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.SAMBA_SUBSYSTEM('ctdb-common',
source=bld.SUBDIR('common',
'''ctdb_io.c ctdb_util.c ctdb_ltdb.c
- cmdline.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'''),
- deps='replace talloc tevent tdb tevent-util')
+ logging.c rb_tree.c tunable.c
+ pidfile.c run_proc.c
+ hash_count.c run_event.c
+ sock_client.c version.c'''),
+ deps='''samba-util sys_rw tevent-util
+ replace talloc tevent tdb''')
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_sock.c'''),
includes='include',
deps='replace talloc tdb')
+ bld.SAMBA_SUBSYSTEM('ctdb-protocol-util',
+ source='protocol/protocol_util.c',
+ deps='replace talloc tdb')
+
bld.SAMBA_SUBSYSTEM('ctdb-client',
source=bld.SUBDIR('client', 'ctdb_client.c'),
includes='include',
client_message_sync.c
client_control_sync.c
client_db.c client_util.c
+ client_event.c client_tunnel.c
'''),
includes='include',
deps='replace talloc tevent tdb tdb-wrap')
+ bld.SAMBA_SUBSYSTEM('ctdb-server-util',
+ source=bld.SUBDIR('common',
+ '''sock_daemon.c'''),
+ deps='''samba-util ctdb-util tevent-util
+ replace talloc tevent''')
+
bld.SAMBA_SUBSYSTEM('ctdb-ipalloc',
source=bld.SUBDIR('server',
'''ipalloc_deterministic.c
ipalloc.c
'''),
includes='include',
- deps='ctdb-protocol replace talloc tevent')
+ deps='ctdb-protocol-util replace talloc tevent')
- bld.SAMBA_SUBSYSTEM('ctdb-server',
- source='server/ctdbd.c ' +
+ bld.SAMBA_BINARY('ctdbd',
+ source='server/ctdbd.c ' +
bld.SUBDIR('server',
'''ctdb_daemon.c ctdb_recoverd.c
ctdb_recover.c ctdb_freeze.c
ctdb_persistent.c ctdb_keepalive.c
ctdb_cluster_mutex.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 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-system ctdb-tcp ctdb-util''' +
+ ctdb_lock.c ctdb_fork.c
+ ctdb_tunnel.c'''),
+ includes='include',
+ deps='''ctdb-client ctdb-common ctdb-system ctdb-protocol
+ ctdb-tcp ctdb-util replace sys_rw popt
+ talloc tevent tdb talloc_report''' +
ib_deps,
install_path='${SBINDIR}',
manpages='ctdbd.1')
bld.SAMBA_BINARY('ctdb',
source='tools/ctdb.c',
- deps='ctdb-client ctdb-common ctdb-system ctdb-util',
- includes='include',
+ deps='''ctdb-client2 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-protocol-util
+ ctdb-util ctdb-system samba-util replace''',
+ install_path='${CTDB_HELPER_BINDIR}')
+
bld.SAMBA_BINARY('ltdbtool',
source='tools/ltdbtool.c',
includes='include',
install_path='${BINDIR}',
manpages='ltdbtool.1')
- bld.SAMBA_BINARY('ctdb_lock_helper',
- source='server/ctdb_lock_helper.c',
- deps='samba-util ctdb-system talloc tdb',
- includes='include',
+ bld.SAMBA_BINARY('ctdb_eventd',
+ source='server/ctdb_eventd.c',
+ deps='''ctdb-server-util ctdb-protocol ctdb-protocol-util
+ ctdb-util samba-util LIBASYNC_REQ replace popt''',
install_path='${CTDB_HELPER_BINDIR}')
- bld.SAMBA_BINARY('ctdb_event_helper',
- source='server/ctdb_event_helper.c',
+ bld.SAMBA_BINARY('ctdb_lock_helper',
+ source='server/ctdb_lock_helper.c',
+ deps='''samba-util sys_rw ctdb-system tevent-util
+ talloc tevent tdb''',
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''',
+ 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
+ samba-util sys_rw replace ctdb-ipalloc popt''',
install_path='${CTDB_HELPER_BINDIR}')
bld.SAMBA_BINARY('ctdb_mutex_fcntl_helper',
source='server/ctdb_mutex_fcntl_helper.c',
- deps='ctdb-system',
+ deps='sys_rw ctdb-system',
includes='include',
install_path='${CTDB_HELPER_BINDIR}')
bld.SAMBA_BINARY('pmdactdb',
source='utils/pmda/pmda_ctdb.c',
includes='include',
- deps='ctdb-client ctdb-common pcp_pmda pcp',
+ deps='''ctdb-client2 ctdb-protocol ctdb-util
+ samba-util 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')
+ if bld.env.HAVE_LIBRADOS:
+ bld.SAMBA_BINARY('ctdb_mutex_ceph_rados_helper',
+ source='utils/ceph/ctdb_mutex_ceph_rados_helper.c',
+ deps='talloc tevent rados',
+ includes='include',
+ install_path='${CTDB_HELPER_BINDIR}')
+
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_expr1, sed_expr2, sed_expr3, sed_expr4, sed_expr5,
sed_expr6, sed_expr7)
- for f in manpages:
+ manpages_extra = manpages_misc
+ if bld.env.etcd_reclock:
+ manpages_extra += manpages_etcd
+ if bld.env.HAVE_LIBRADOS:
+ manpages_extra += manpages_ceph
+ for f in manpages_binary + manpages_extra:
x = '%s.xml' % (f)
bld.SAMBA_GENERATOR(x,
source=os.path.join('doc', 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)
+ bld.MANPAGES(' '.join(manpages_extra), True)
else:
for m in bld.env.ctdb_prebuilt_manpages:
bld.SAMBA_GENERATOR(m,
bld.INSTALL_FILES('${BINDIR}', 'ctdb_diagnostics',
destname='ctdb_diagnostics', chmod=0755)
+ if bld.env.etcd_reclock:
+ bld.SAMBA_GENERATOR('ctdb-etcd-lock',
+ source='utils/etcd/ctdb_etcd_lock',
+ target='ctdb_etcd_lock',
+ rule='sed %s ${SRC} > ${TGT}' % (sed_cmdline))
+ bld.INSTALL_FILES('${CTDB_HELPER_BINDIR}', 'ctdb_etcd_lock',
+ destname='ctdb_etcd_lock', chmod=0744)
+
bld.SAMBA_GENERATOR('ctdb-natgw',
source='tools/ctdb_natgw',
target='ctdb_natgw',
'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',
]
for target in ctdb_unit_tests:
bld.SAMBA_BINARY(target,
source=src,
deps='''talloc tevent tdb tevent-util
- LIBASYNC_REQ samba-util''',
- install_path='${CTDB_TEST_LIBDIR}')
+ LIBASYNC_REQ samba-util sys_rw''',
+ install_path='${CTDB_TEST_LIBEXECDIR}')
bld.SAMBA_BINARY('reqid_test',
source='tests/src/reqid_test.c',
deps='samba-util',
- install_path='${CTDB_TEST_LIBDIR}')
+ install_path='${CTDB_TEST_LIBEXECDIR}')
+
+ bld.SAMBA_BINARY('rb_test',
+ source='tests/src/rb_test.c',
+ deps='samba-util talloc',
+ install_path='${CTDB_TEST_LIBEXECDIR}')
bld.SAMBA_BINARY('ctdb_packet_parse',
source='tests/src/ctdb_packet_parse.c',
deps='talloc tevent tdb ctdb-protocol',
- install_path='${CTDB_TEST_LIBDIR}')
+ install_path='${CTDB_TEST_LIBEXECDIR}')
- # Test binaries
- ctdb_tests = [
- 'rb_test',
- 'ctdb_fetch',
- 'ctdb_fetch_one',
- 'ctdb_fetch_readonly_once',
- 'ctdb_fetch_readonly_loop',
- 'ctdb_trackingdb_test',
- 'ctdb_update_record',
- 'ctdb_update_record_persistent',
- 'ctdb_store',
- 'ctdb_traverse',
- 'ctdb_randrec',
- 'ctdb_persistent',
- 'ctdb_porting_tests',
- 'ctdb_transaction',
- 'ctdb_lock_tdb'
+ bld.SAMBA_BINARY('porting_tests',
+ source='tests/src/porting_tests.c',
+ 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_tests:
+ for target in ctdb_protocol_tests:
src = 'tests/src/' + target + '.c'
bld.SAMBA_BINARY(target,
source=src,
- includes='include',
- deps='ctdb-client ctdb-common ctdb-util',
- install_path='${CTDB_TEST_LIBDIR}')
+ 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')
+ # Test binaries
ctdb_tests = [
'g_lock_loop',
- 'message_ring'
+ 'message_ring',
+ 'fetch_ring',
+ 'fetch_loop',
+ 'fetch_loop_key',
+ 'fetch_readonly',
+ 'fetch_readonly_loop',
+ 'transaction_loop',
+ 'update_record',
+ 'update_record_persistent',
+ 'lock_tdb',
+ 'dummy_client',
+ 'tunnel_test',
+ 'tunnel_cmd',
]
for target in ctdb_tests:
includes='include',
deps='''ctdb-client2 ctdb-protocol ctdb-util
samba-util ctdb-tests-common''',
- install_path='${CTDB_TEST_LIBDIR}')
+ install_path='${CTDB_TEST_LIBEXECDIR}')
bld.SAMBA_BINARY('ctdb_takeover_tests',
- source='tests/src/ctdb_takeover_tests.c',
+ source='''tests/src/ctdb_takeover_tests.c
+ tests/src/ipalloc_read_known_ips.c''',
deps='''replace popt tdb tevent talloc ctdb-system
samba-util tdb-wrap talloc_report
ctdb-ipalloc ctdb-protocol ctdb-util''',
includes='include',
- install_path='${CTDB_TEST_LIBDIR}')
+ install_path='${CTDB_TEST_LIBEXECDIR}')
bld.SAMBA_BINARY('fake_ctdbd',
- source='tests/src/fake_ctdbd.c',
- deps='''ctdb-util ctdb-protocol ctdb-system
- samba-util tevent-util LIBASYNC_REQ popt''',
- install_path='${CTDB_TEST_LIBDIR}')
+ source='''tests/src/fake_ctdbd.c
+ tests/src/ipalloc_read_known_ips.c''',
+ 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' +
+ deps='replace talloc ctdb-client ctdb-common sys_rw' +
ib_deps,
- install_path='${CTDB_TEST_LIBDIR}')
+ install_path='${CTDB_TEST_LIBEXECDIR}')
+
+ if bld.env.HAVE_ROBUST_MUTEXES and sys.platform.startswith('linux'):
+ bld.SAMBA_BINARY('test_mutex_raw',
+ source='tests/src/test_mutex_raw.c',
+ deps='pthread',
+ install_path='${CTDB_TEST_LIBEXECDIR}')
test_subdirs = [
'complex',
'cunit',
+ 'eventd',
'events.d',
'eventscripts',
'onnode',
'shellcheck',
'simple',
'takeover',
+ 'takeover_helper',
'tool'
]
+ if bld.env.standalone_ctdb:
+ testdir = 'tests'
+ else:
+ testdir = 'ctdb/tests'
+
for t in test_subdirs:
- files = SUBDIR_MODE('tests/%s' % t, trim_path='tests')
+ files = SUBDIR_MODE('%s/%s' % (testdir, t), trim_path=testdir)
for fmode in files:
bld.INSTALL_FILES(bld.env.CTDB_TEST_DATADIR, 'tests/%s' % fmode[0],
destname=fmode[0], chmod=fmode[1])
destname=os.path.join('scripts', t))
sed_expr = 's@^TEST_SCRIPTS_DIR=.*@&\\nexport TEST_BIN_DIR=\"%s\"@' % (
- bld.env.CTDB_TEST_LIBDIR)
+ bld.env.CTDB_TEST_LIBEXECDIR)
bld.SAMBA_GENERATOR('ctdb-test-wrap',
source='tests/scripts/test_wrap',
target='test_wrap',
'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_LIBDIR)
+ 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',
print VERSION
-def dist():
+def manpages(ctx):
+ BASE_URL = 'http://docbook.sourceforge.net/release/xsl/current'
+ MAN_XSL = '%s/manpages/docbook.xsl' % BASE_URL
+ HTML_XSL = '%s/html/docbook.xsl' % BASE_URL
+ CMD_TEMPLATE = 'xsltproc --xinclude -o %s --nonet %s %s'
+ manpages = manpages_binary + manpages_misc + manpages_etcd + manpages_ceph
+ for t in manpages:
+ cmd = CMD_TEMPLATE % ('doc/%s' % t, MAN_XSL, 'doc/%s.xml' % t)
+ ret = samba_utils.RUN_COMMAND(cmd)
+ if ret != 0:
+ print('Command %s failed with exit status %d' % (cmd, ret))
+ sys.exit(ret)
+
+ cmd = CMD_TEMPLATE % ('doc/%s.html' % t, HTML_XSL, 'doc/%s.xml' % t)
+ ret = samba_utils.RUN_COMMAND(cmd)
+ if ret != 0:
+ print('Command %s failed with exit status %d' % (cmd, ret))
+ sys.exit(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
sys.exit(ret)
samba_dist.DIST_FILES('ctdb/%s:%s' % (t, t), extend=True)
- cmd = 'make -C doc'
- ret = samba_utils.RUN_COMMAND(cmd)
- if ret != 0:
- print('Command "%s" failed with exit status %d' % (cmd, ret))
- sys.exit(ret)
+ manpages = manpages_binary + manpages_misc + manpages_etcd + manpages_ceph
for t in manpages:
samba_dist.DIST_FILES('ctdb/doc/%s:doc/%s' % (t, t), extend=True)
samba_dist.DIST_FILES('ctdb/doc/%s.html:doc/%s.html' % (t, t),
samba_dist.dist()
+def dist():
+ import Scripting
+ Scripting.commands.append('manpages')
+ Scripting.commands.append('distonly')
+
+
def rpmonly(ctx):
opts = os.getenv('RPM_OPTIONS') or ''
cmd = 'rpmbuild -ta --clean --rmsource %s ctdb-%s.tar.gz' % (opts, VERSION)
def rpm(ctx):
import Scripting
- Scripting.commands.append('dist')
+ Scripting.commands.append('manpages')
+ Scripting.commands.append('distonly')
Scripting.commands.append('rpmonly')
git.samba.org / samba.git / blobdiff