From b1f28e17227f2320d07fe052a8a48942fe17caa5 Mon Sep 17 00:00:00 2001 From: Michael Ellerman Date: Fri, 25 May 2012 16:38:08 +1000 Subject: [PATCH 1/1] tools/create-ccan-tree: Add basic waf support This adds a "waf" buildtype to create-ccan-tree. When passed it generates a basic wscript for building everything into a libccan.a It doesn't support running the generator, so you need to provide config.h Signed-off-by: Michael Ellerman Signed-off-by: Jeremy Kerr --- tools/create-ccan-tree | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/tools/create-ccan-tree b/tools/create-ccan-tree index 6b258984..64fc36e7 100755 --- a/tools/create-ccan-tree +++ b/tools/create-ccan-tree @@ -10,7 +10,7 @@ options: -a, --copy-all copy all files in module tree (not just sources required for build) -b, --build-type=TYPE generate build infrastructure of TYPE - (one of 'make', 'make+config', 'automake') + (one of 'make', 'make+config', 'automake', 'waf') EOF } @@ -60,7 +60,7 @@ fi # check --build-type argument sanity case "$build_type" in - ''|'make'|'make+config'|'automake') + ''|'make'|'make+config'|'automake'|'waf') ;; *) echo "Invalid build type '$build_type'" >&2 @@ -209,6 +209,18 @@ objs = \$(patsubst %.c, %.o, \$(wildcard ccan/*/*.c)) EOF fi +if [ "$build_type" = "waf" ] +then + echo "Adding waf wscript" + cat > "$tmpdir/wscript" << EOF +def build(ctx): + ctx(features = 'c cstlib', + source = ctx.path.ant_glob('**/*.c'), + target = 'ccan', + includes = '.') +EOF +fi + mv "$tmpdir" "$outdir" echo "Done. ccan source tree built in $outdir" -- 2.39.2