The branch, master has been updated
via 3e5d527 docs: correctly depend on used xsl files and catalog for
building manpages.t
from 86652c0 s4-setup: Add saltPrincipal to secrets_dns.ldif
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 3e5d52776653aa2ae85420fe70aa1df6bc9d70e4
Author: Michael Adam <[email protected]>
Date: Thu Apr 23 13:40:17 2015 +0200
docs: correctly depend on used xsl files and catalog for building manpages.t
So changes in (e.g.) our man.xsl will trigger a rebuild of the manpages.
Signed-off-by: Michael Adam <[email protected]>
Reviewed-by: Alexander Bokovoy <[email protected]>
Autobuild-User(master): Michael Adam <[email protected]>
Autobuild-Date(master): Fri Apr 24 15:39:31 CEST 2015 on sn-devel-104
-----------------------------------------------------------------------
Summary of changes:
buildtools/wafsamba/wafsamba.py | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
Changeset truncated at 500 lines:
diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
index c423e60..d7e482c 100644
--- a/buildtools/wafsamba/wafsamba.py
+++ b/buildtools/wafsamba/wafsamba.py
@@ -886,7 +886,8 @@ def SAMBAMANPAGES(bld, manpages, extra_source=None):
'''build and install manual pages'''
bld.env.SAMBA_EXPAND_XSL = bld.srcnode.abspath() +
'/docs-xml/xslt/expand-sambadoc.xsl'
bld.env.SAMBA_MAN_XSL = bld.srcnode.abspath() + '/docs-xml/xslt/man.xsl'
- bld.env.SAMBA_CATALOGS = 'file:///etc/xml/catalog
file:///usr/local/share/xml/catalog file://' + bld.srcnode.abspath() +
'/bin/default/docs-xml/build/catalog.xml'
+ bld.env.SAMBA_CATALOG = bld.srcnode.abspath() +
'/bin/default/docs-xml/build/catalog.xml'
+ bld.env.SAMBA_CATALOGS = 'file:///etc/xml/catalog
file:///usr/local/share/xml/catalog file://' + bld.env.SAMBA_CATALOG
for m in manpages.split():
source = m + '.xml'
@@ -896,6 +897,7 @@ def SAMBAMANPAGES(bld, manpages, extra_source=None):
source=source,
target=m,
group='final',
+ dep_vars=['SAMBA_MAN_XSL', 'SAMBA_EXPAND_XSL',
'SAMBA_CATALOG'],
rule='''XML_CATALOG_FILES="${SAMBA_CATALOGS}"
export XML_CATALOG_FILES
${XSLTPROC} --xinclude --stringparam
noreference 0 -o ${TGT}.xml --nonet ${SAMBA_EXPAND_XSL} ${SRC[0].abspath(env)}
--
Samba Shared Repository
