diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2014-01-15 18:11:41 +1300 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2014-01-31 21:21:14 +0100 |
| commit | 2c86758b04515998c690f293fada2cc43116d764 (patch) | |
| tree | 6a0301ee25ea45a202b7af4864e5135cd127eb38 | |
| parent | 464009c01d747c12be682a92400a24a871cff0c1 (diff) | |
| download | samba-2c86758b04515998c690f293fada2cc43116d764.tar.gz | |
docs: Always declare rule to build parameters.all.xml and do it first
This ensures this file and the rule to generate it can always be found.
Andrew Bartlett
Change-Id: I76d9f4470e2678fc2df4e3a13642737128938f3a
Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
| -rw-r--r-- | docs-xml/wscript_build | 15 | ||||
| -rw-r--r-- | wscript_build | 13 |
2 files changed, 15 insertions, 13 deletions
diff --git a/docs-xml/wscript_build b/docs-xml/wscript_build index 4ee72a4d518..d59d4b57ad8 100644 --- a/docs-xml/wscript_build +++ b/docs-xml/wscript_build @@ -115,15 +115,16 @@ def smbdotconf_generate_parameter_list(task): save_file(parameter_all, t , create_dir=True) return 0 +articles = bld.path.ant_glob("smbdotconf/**/*.xml") +parameter_all = 'smbdotconf/parameters.all.xml' +bld.SAMBA_GENERATOR(parameter_all, + source=articles, + target=parameter_all, + rule=smbdotconf_generate_parameter_list, + always=True) + def SMBDOTCONF_MANPAGE(bld, target): ''' assemble and build smb.conf.5 manual page''' - articles = bld.path.ant_glob("smbdotconf/**/*.xml") - parameter_all = 'smbdotconf/parameters.all.xml' - bld.SAMBA_GENERATOR(parameter_all, - source=articles, - target=parameter_all, - rule=smbdotconf_generate_parameter_list, - always=True) bld.SAMBAMANPAGES(target, parameter_all) if ('XSLTPROC_MANPAGES' in bld.env and bld.env['XSLTPROC_MANPAGES']): diff --git a/wscript_build b/wscript_build index f0c9f2a5b3d..f28c08cb414 100644 --- a/wscript_build +++ b/wscript_build @@ -27,6 +27,13 @@ bld.SAMBA_MKVERSION('version.h') # bld.ENABLE_MAGIC_ORDERING() +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_SRCDIR=bld.env.ABS_TOP_SRCDIR) +bld.RECURSE('docs-xml') + bld.RECURSE('lib/replace') bld.RECURSE('lib/socket') bld.RECURSE('lib/talloc') @@ -143,9 +150,3 @@ bld.RECURSE('testsuite/headers') bld.SYMBOL_CHECK() bld.DUP_SYMBOL_CHECK() -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_SRCDIR=bld.env.ABS_TOP_SRCDIR) -bld.RECURSE('docs-xml') |