From 47ea1237edcf8016eb3b9ccdc1a8d66af328cd82 Mon Sep 17 00:00:00 2001 From: Avi Kivity Date: Tue, 16 Feb 2016 12:13:29 +0200 Subject: [PATCH] build: build seastar's iotune Target name is build/{mode}/iotune. --- configure.py | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/configure.py b/configure.py index 43259c637a..c04bb0294e 100755 --- a/configure.py +++ b/configure.py @@ -223,7 +223,11 @@ apps = [ tests = scylla_tests -all_artifacts = apps + tests +other = [ + 'iotune', + ] + +all_artifacts = apps + tests + other arg_parser = argparse.ArgumentParser('Configure scylla') arg_parser.add_argument('--static', dest = 'static', action = 'store_const', default = '', @@ -727,6 +731,9 @@ with open(buildfile, 'w') as f: command = {ninja} -C $subdir $target restat = 1 description = NINJA $out + rule copy + command = cp $in $out + description = COPY $out ''').format(**globals())) for mode in build_modes: modeval = modes[mode] @@ -763,6 +770,8 @@ with open(buildfile, 'w') as f: thrifts = set() antlr3_grammars = set() for binary in build_artifacts: + if binary in other: + continue srcs = deps[binary] objs = ['$builddir/' + mode + '/' + src.replace('.cc', '.o') for src in srcs @@ -860,9 +869,13 @@ with open(buildfile, 'w') as f: for cc in grammar.sources('$builddir/{}/gen'.format(mode)): obj = cc.replace('.cpp', '.o') f.write('build {}: cxx.{} {}\n'.format(obj, mode, cc)) - f.write('build seastar/build/{}/libseastar.a: ninja {}\n'.format(mode, seastar_deps)) + f.write('build seastar/build/{mode}/libseastar.a seastar/build/{mode}/apps/iotune/iotune: ninja {seastar_deps}\n' + .format(**locals())) f.write(' subdir = seastar\n') - f.write(' target = build/{}/libseastar.a\n'.format(mode)) + f.write(' target = build/{mode}/libseastar.a build/{mode}/apps/iotune/iotune\n'.format(**locals())) + f.write(textwrap.dedent('''\ + build build/{mode}/iotune: copy seastar/build/{mode}/apps/iotune/iotune + ''').format(**locals())) f.write('build {}: phony\n'.format(seastar_deps)) f.write(textwrap.dedent('''\ rule configure