diff options
Diffstat (limited to 'docs-xml')
| -rw-r--r-- | docs-xml/build/catalog.xml.in | 7 | ||||
| -rw-r--r-- | docs-xml/manpages/smb.conf.5.xml | 5 | ||||
| -rw-r--r-- | docs-xml/wscript_build | 25 |
3 files changed, 32 insertions, 5 deletions
diff --git a/docs-xml/build/catalog.xml.in b/docs-xml/build/catalog.xml.in index 4b99cf50d4..56d13a6cd3 100644 --- a/docs-xml/build/catalog.xml.in +++ b/docs-xml/build/catalog.xml.in @@ -6,9 +6,12 @@ <rewriteURI uriStartString="http://www.samba.org/samba/DTD/" - rewritePrefix="file://@abs_top_builddir@/build/DTD/"/> + rewritePrefix="file://@abs_top_srcdir@/build/DTD/"/> <rewriteURI uriStartString="http://www.gnu.org/licenses/" - rewritePrefix="file://@abs_top_builddir@/Samba3-ByExample/"/> + rewritePrefix="file://@abs_top_srcdir@/Samba3-ByExample/"/> + <rewriteURI + uriStartString="http://www.samba.org/samba/smbdotconf/" + rewritePrefix="file://@abs_top_builddir@/smbdotconf/"/> </catalog> diff --git a/docs-xml/manpages/smb.conf.5.xml b/docs-xml/manpages/smb.conf.5.xml index e09eee0d55..a73382f54a 100644 --- a/docs-xml/manpages/smb.conf.5.xml +++ b/docs-xml/manpages/smb.conf.5.xml @@ -757,7 +757,10 @@ chmod 1770 /usr/local/samba/lib/usershares <title>EXPLANATION OF EACH PARAMETER</title> <samba:parameterlist> - <xi:include href="../smbdotconf/parameters.all.xml" parse="xml"/> + <!-- The URI below is resolved to local generated version of parameters.all.xml //--> + <!-- WAF build places it in bin/default/docs-xml/smbdotconf/parameters.all.xml //--> + <!-- and we redirect there via use of XML_CATALOG_FILES, see docs-xml/build/catalog.xml.in //--> + <xi:include href="http://www.samba.org/samba/smbdotconf/parameters.all.xml" parse="xml"/> </samba:parameterlist> </refsect1> diff --git a/docs-xml/wscript_build b/docs-xml/wscript_build index 011854b2e6..c5d5839d96 100644 --- a/docs-xml/wscript_build +++ b/docs-xml/wscript_build @@ -1,5 +1,5 @@ #!/usr/bin/env python - +from samba_utils import save_file manpages=''' manpages/eventlogadm.8 manpages/findsmb.1 @@ -23,7 +23,6 @@ manpages=''' manpages/rpcclient.1 manpages/samba.7 manpages/sharesec.1 - manpages/smb.conf.5 manpages/smbcacls.1 manpages/smbclient.1 manpages/smbcontrol.1 @@ -87,8 +86,30 @@ pam_winbind_manpages = ''' krb5_locator_manpages = 'manpages/winbind_krb5_locator.7' +def smbdotconf_generate_parameter_list(task): + parameter_all = task.outputs[0].bldpath(task.env) + articles = task.inputs + + t = '<section xmlns:xi="http://www.w3.org/2003/XInclude">\n' + for article in articles: + t += "<xi:include href='file://" + article.abspath(task.env) + "' parse='xml'/>\n" + t += "</section>\n" + save_file(parameter_all, t , create_dir=True) + return 0 + +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) + bld.SAMBAMANPAGES(target) + if ('XSLTPROC_MANPAGES' in bld.env and bld.env['XSLTPROC_MANPAGES']): + SMBDOTCONF_MANPAGE(bld, 'manpages/smb.conf.5') bld.SAMBAMANPAGES(manpages) if bld.CONFIG_SET('WITH_PAM_MODULES') and bld.CONFIG_SET('HAVE_PAM_START'): |