diff options
| author | Alexander Bokovoy <ab@samba.org> | 2012-09-17 13:07:26 +0300 |
|---|---|---|
| committer | Alexander Bokovoy <ab@samba.org> | 2012-09-17 14:18:31 +0200 |
| commit | 73ed1533105ac3f90813e5a0e7888a095eff4b75 (patch) | |
| tree | 74ec0f4b2878b3d6a9ebf37c6d08be4a601c2100 /docs-xml/build | |
| parent | 57990cbcbbdf83d7b9997ac1fd33528c63c96226 (diff) | |
| download | samba-73ed1533105ac3f90813e5a0e7888a095eff4b75.tar.gz samba-73ed1533105ac3f90813e5a0e7888a095eff4b75.tar.bz2 samba-73ed1533105ac3f90813e5a0e7888a095eff4b75.zip | |
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 <ab@samba.org>
Autobuild-Date(master): Mon Sep 17 14:18:31 CEST 2012 on sn-devel-104
Diffstat (limited to 'docs-xml/build')
| -rw-r--r-- | docs-xml/build/catalog.xml.in | 7 |
1 files changed, 5 insertions, 2 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> |