From 73ed1533105ac3f90813e5a0e7888a095eff4b75 Mon Sep 17 00:00:00 2001 From: Alexander Bokovoy Date: Mon, 17 Sep 2012 13:07:26 +0300 Subject: docs-xml: convert smb.conf.5 build to waf smb.conf(5) is different from other manpages because before it is built, it gets merged together from a number of smaller files, one per parameter. So we first create a parameters.all.xml file that references all these files and then include it into master smb.conf.5.xml One small issue is how to handle generated files in WAF build from xi:include perspective as the files are generated in bin/default/docs-xml rather than in docs-xml. We solve this by further expanding use of XML catalogs and rewriting virtual path http://www.samba.org/samba/smbdotconf/ to proper location. Both docs-xml autoconf and waf builds work correctly now. Autobuild-User(master): Alexander Bokovoy Autobuild-Date(master): Mon Sep 17 14:18:31 CEST 2012 on sn-devel-104 --- wscript_build | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'wscript_build') diff --git a/wscript_build b/wscript_build index 5434056fe1a..0098036531a 100755 --- a/wscript_build +++ b/wscript_build @@ -144,7 +144,9 @@ bld.RECURSE('testsuite/headers') bld.SYMBOL_CHECK() bld.DUP_SYMBOL_CHECK() -bld.env.ABS_TOP_BUILDDIR = bld.srcnode.abspath() + '/docs-xml' +bld.env.ABS_TOP_SRCDIR = bld.srcnode.abspath() + '/docs-xml' +bld.env.ABS_TOP_BUILDDIR = bld.srcnode.abspath() + '/bin/default/docs-xml' bld.CONFIGURE_FILE('docs-xml/build/catalog.xml', - ABS_TOP_BUILDDIR = bld.env.ABS_TOP_BUILDDIR) + ABS_TOP_BUILDDIR = bld.env.ABS_TOP_BUILDDIR, + ABS_TOP_SRCDIR=bld.env.ABS_TOP_SRCDIR) bld.RECURSE('docs-xml') -- cgit v1.2.1