[SCM] Samba Shared Repository - branch master updated
Andrew Bartlett
abartlet at samba.org
Wed Jun 10 07:12:12 UTC 2020
The branch, master has been updated
via 0208d5f64b2 Add docs build to CI
via 4a3ed0d8459 docs-xml: Remove GNU TexInfo build
via 9392c3f81ca docs-xml: Remove references to inkscape (not used any more, no more SVG files)
via ccb606c469e docs-xml: Remove final references to Samba3-HOWTO and Samba3-ByExample
via cedd00fdffd docs-xml: Remove references to building docs using Plucker
via 158cea3ba87 Remove "undocumented" target mentioned in configure script
from ddac6b2eb4a util: Reallocate larger buffer if getpwuid_r() returns ERANGE
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 0208d5f64b2cb9b67d5ab6070f411cf45cea1fc4
Author: Andrew Bartlett <abartlet at samba.org>
Date: Wed Jun 3 12:33:50 2020 +1200
Add docs build to CI
We did not check we could actually build the HTML of the
Samba Developers guide and HTML of the manpages previously.
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: David Disseldorp <ddiss at samba.org>
Autobuild-User(master): Andrew Bartlett <abartlet at samba.org>
Autobuild-Date(master): Wed Jun 10 07:11:59 UTC 2020 on sn-devel-184
commit 4a3ed0d8459f626b8df0781b3231270040a0480d
Author: Andrew Bartlett <abartlet at samba.org>
Date: Wed Jun 3 12:21:50 2020 +1200
docs-xml: Remove GNU TexInfo build
This does not build and is not a common or required format for
documentation any more.
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: David Disseldorp <ddiss at samba.org>
commit 9392c3f81ca83e4eda382ebfc335099616fa1bff
Author: Andrew Bartlett <abartlet at samba.org>
Date: Wed Jun 3 12:14:38 2020 +1200
docs-xml: Remove references to inkscape (not used any more, no more SVG files)
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: David Disseldorp <ddiss at samba.org>
commit ccb606c469e1d70af1dc6703d7e290061c35d982
Author: Andrew Bartlett <abartlet at samba.org>
Date: Wed Jun 3 12:09:33 2020 +1200
docs-xml: Remove final references to Samba3-HOWTO and Samba3-ByExample
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: David Disseldorp <ddiss at samba.org>
commit cedd00fdffd2dfaef3cb729fe55258448ec485f2
Author: Andrew Bartlett <abartlet at samba.org>
Date: Wed Jun 3 12:08:01 2020 +1200
docs-xml: Remove references to building docs using Plucker
This was for Palm OS based handheld devices, Windows Mobile devices, and other PDAs...
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: David Disseldorp <ddiss at samba.org>
commit 158cea3ba87de3b7d61c5d02f87824353381ab5c
Author: Andrew Bartlett <abartlet at samba.org>
Date: Wed Jun 3 11:55:45 2020 +1200
Remove "undocumented" target mentioned in configure script
This was left over from 12aed897ec688d5bc379690208e8b85158b8227f
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: David Disseldorp <ddiss at samba.org>
-----------------------------------------------------------------------
Summary of changes:
.gitlab-ci.yml | 1 +
docs-xml/.gitignore | 10 ------
docs-xml/Makefile | 73 ++------------------------------------
docs-xml/Makefile.settings.in | 7 ----
docs-xml/README | 8 ++---
docs-xml/configure.ac | 21 -----------
docs-xml/htmldocs.html | 8 -----
docs-xml/xslt/extract-examples.xsl | 51 --------------------------
script/autobuild.py | 11 +++++-
9 files changed, 16 insertions(+), 174 deletions(-)
delete mode 100644 docs-xml/xslt/extract-examples.xsl
Changeset truncated at 500 lines:
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7177d3b5c44..68e1a52bf1e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -125,6 +125,7 @@ others:
- script/autobuild.py tdb $SAMBA_CI_AUTOBUILD_ENABLE_COVERAGE --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase
- script/autobuild.py tevent $SAMBA_CI_AUTOBUILD_ENABLE_COVERAGE --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase
- script/autobuild.py samba-xc $SAMBA_CI_AUTOBUILD_ENABLE_COVERAGE --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase
+ - script/autobuild.py docs-xml $SAMBA_CI_AUTOBUILD_ENABLE_COVERAGE --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase
samba:
extends: .shared_template
diff --git a/docs-xml/.gitignore b/docs-xml/.gitignore
index 8beaa2d485b..945bea4baa2 100644
--- a/docs-xml/.gitignore
+++ b/docs-xml/.gitignore
@@ -1,9 +1,5 @@
Makefile.settings
Samba3-Developers-Guide-attributions.xml
-Samba3-HOWTO-attributions.xml
-Samba3-HOWTO.d
-Samba4-HOWTO.d
-Samba4-HOWTO-attributions.xml
autom4te.cache
config.log
config.status
@@ -13,7 +9,6 @@ tmp
smbdotconf/parameters.all.xml
*.d
output/manpages
-Samba3-ByExample.tex
Samba3-Developers-Guide.tex
xslt/figures/*.pdf
output/*.pdf
@@ -29,11 +24,6 @@ output/*.pdf
*.loe
*.lot
*.toc
-Samba3-ByExample.pdf
Samba3-Developers-Guide.pdf
-Samba3-HOWTO.pdf
-Samba3-HOWTO.tex
-Samba4-HOWTO.pdf
-Samba4-HOWTO.tex
test.pdf
test.tex
diff --git a/docs-xml/Makefile b/docs-xml/Makefile
index ba49eae06c2..c614097f6c0 100644
--- a/docs-xml/Makefile
+++ b/docs-xml/Makefile
@@ -13,7 +13,6 @@ MAIN_DOCS = $(patsubst %/index.xml,%,$(wildcard */index.xml))
MANPAGES = $(sort $(wildcard $(MANPAGEDIR)/*.?.xml))
# Lists of files to process
-MANPAGES_PLUCKER = $(patsubst $(MANPAGEDIR)/%.xml,$(PLUCKERDIR)/%.pdb,$(MANPAGES))
DBLATEX_OPTIONS = -p xslt/latex.xsl -i xslt/latex
DATETIME := $(shell date +%Y%m%d%H%M%S)
@@ -37,29 +36,21 @@ help:
@echo " release - Build the docs needed for a Samba release"
@echo " all - Build all docs that can be build using the utilities found by configure"
@echo " everything - Build all of the above"
- @echo " pdf,tex,ps,manpages,txt,pearson,htmlhelp - Build specific output format"
+ @echo " pdf,tex,ps,manpages,htmlhelp - Build specific output format"
@echo " html - Build multi-file HTML versions"
@echo " html-single - Build single-file HTML versions"
@echo " htmlman - Build HTML version of manpages"
- @echo " samples - Extract examples"
-$(PDFDIR)/Samba3-ByExample.pdf $(PSDIR)/Samba3-ByExample.ps $(DOCBOOKDIR)/Samba3-ByExample.xml Samba3-ByExample.tex: $(wildcard Samba3-ByExample/*.xml)
-$(PDFDIR)/Samba3-HOWTO.pdf $(PSDIR)/Samba3-HOWTO.ps Samba3-HOWTO.tex $(DOCBOOKDIR)/Samba3-HOWTO.xml: $(wildcard Samba3-HOWTO/*.xml) Samba3-HOWTO-attributions.xml
-Samba3-HOWTO/manpages.xml: $(MANPAGEDIR)/smb.conf.5.xml
$(PDFDIR)/Samba3-Developers-Guide.pdf $(PSDIR)/Samba3-Developers-Guide.ps $(DOCBOOKDIR)/Samba3-Developers-Guide.xml Samba3-Developers-Guide.tex: $(wildcard Samba3-Developers-Guide/*.xml) Samba3-Developers-Guide-attributions.xml
# Pseudo targets
all:: $(TARGETS)
-everything:: manpages pdf html-single html htmlman txt ps fo htmlhelp pearson
+everything:: manpages pdf html-single html htmlman ps fo htmlhelp
release:: manpages htmlman html pdf
clean::
@echo "Cleaning up..."
rm -rf $(OUTPUTDIR)/* $(DOCBOOKDIR)
rm -f *-attributions.xml
- rm -f $(patsubst %.svg,%.png,$(foreach DOC,$(MAIN_DOCS),$($(DOC)-images-latex-dia))) \
- $(patsubst %.svg,%.pdf,$(foreach DOC,$(MAIN_DOCS),$($(DOC)-images-latex-svg))) \
- $(patsubst %.svg,%.eps,$(foreach DOC,$(MAIN_DOCS),$($(DOC)-images-latex-svg))) \
- $(patsubst %.svg,%.png,$(foreach DOC,$(MAIN_DOCS),$($(DOC)-images-latex-svg)))
rm -f *-attributions.xml *.d *.tpt *.tex *.loc *.toc *.lof *.glo *.idx *.aux
rm -f *-images-html*
rm -f *-images-latex-* $(LATEX_FIGURES)
@@ -70,14 +61,8 @@ clean::
# Output format targets
pdf:: $(patsubst %,$(PDFDIR)/%.pdf,$(MAIN_DOCS))
ps:: $(patsubst %,$(PSDIR)/%.ps,$(MAIN_DOCS))
-txt:: $(patsubst %,$(TXTDIR)/%.txt,$(MAIN_DOCS))
tex:: $(addsuffix .tex,$(MAIN_DOCS))
-texi:: $(patsubst %,$(TEXINFODIR)/%.texi,$(MAIN_DOCS))
-texiinfo:: $(patsubst %,$(TEXINFODIR)/%.info,$(MAIN_DOCS))
manpages:: $(patsubst $(MANPAGEDIR)/%.xml,$(OUTPUTDIR)/manpages/%,$(MANPAGES))
-pearson:: $(PEARSONDIR)/Samba3-HOWTO.xml
-pearson-verify:: $(PEARSONDIR)/Samba3-HOWTO.report.html
-plucker:: $(patsubst %,$(PLUCKERDIR)/%.pdb,$(MAIN_DOCS))
htmlman:: $(patsubst $(MANPAGEDIR)/%.xml,$(HTMLDIR)/manpages/%.html,$(MANPAGES)) $(HTMLDIR)/manpages/index.html
html-single:: $(patsubst %,$(HTMLDIR)/%.html,$(MAIN_DOCS))
html:: $(patsubst %,$(HTMLDIR)/%/index.html,$(MAIN_DOCS)) $(HTMLDIR)/index.html
@@ -131,11 +116,6 @@ $(HTMLDIR)/%.html: $(DOCBOOKDIR)/%.xml $(HTMLDIR)/samba.css xslt/html.xsl $(XSLT
@cp -f templates/attributions.xml $@
@$(XSLTPROC) --xinclude -o $@ xslt/generate-attributions.xsl $*/index.xml
-# Text files
-$(TXTDIR)/%.txt: $(HTMLDIR)/%.html
- @mkdir -p $(@D)
- $(HTML2TEXT) -nobs -style pretty -o $@ $<
-
# Tex files
%.tex: %/index.xml xslt/latex.xsl
@echo "Generating $@..."
@@ -146,13 +126,9 @@ $(TXTDIR)/%.txt: $(HTMLDIR)/%.html
%.d: $(DOCBOOKDIR)/%.xml xslt/generate-dependencies.xsl $(XSLTPROC_DEPS)
@echo "Generating dependency file for $*"
@$(XSLTPROC) --novalid \
- --stringparam txtbasedir "$(TXTDIR)/$*/" \
--stringparam target "$*" \
-o $@ xslt/generate-dependencies.xsl $<
- @echo "$*-images-latex-svg = \$$(wildcard \$$(addsuffix .svg, \$$($*-images-latex)))" >> $@
@echo "$*-images-latex-eps: \$$(addsuffix .eps, \$$($*-images-latex))" >> $@
- @echo "$*-images-latex-pdf: \$$(patsubst %.svg, %.pdf, \$$($*-images-latex-svg))" >> $@
- @echo "$*-images-latex-png: \$$(filter-out \$$(patsubst %.svg,%.png,\$$($*-images-latex-svg)), \$$(addsuffix .png, \$$($*-images-latex)))" >> $@
@echo >> $@
@echo "\$$(HTMLDIR)/%: $*/%" >> $@
@@ -185,37 +161,15 @@ $(PDFDIR)/%.pdf: %/index.xml $(PDFDIR) xslt/latex.xsl %-images-latex-png %-image
$(PSDIR)/%.ps: %/index.xml $(PSDIR) xslt/latex.xsl %-images-latex-eps
$(DBLATEX) $(DBLATEX_OPTIONS) -I $*/images -t ps -o $@ $<
-%.eps: %.svg
- $(INKSCAPE) -z -f $(abspath $<) --export-eps=$(abspath $@)
-
-%.png: %.svg
- $(INKSCAPE) -z -f $(abspath $<) --export-png=$(abspath $@)
-
%.eps: %.png
$(PNGTOPNM) $< | $(PNMTOPS) > $@
-%.pdf: %.svg
- $(INKSCAPE) -z -f $(abspath $<) --export-pdf=$(abspath $@)
-
$(HTMLHELPDIR)/%: $(DOCBOOKDIR)/%.xml %-images-htmlhelp $(XSLTPROC_DEPS)
$(XSLTPROC) --stringparam htmlhelp.chm $*.chm \
--stringparam manifest.in.base.dir "$@/" \
--stringparam base.dir "$@/" \
http://docbook.sourceforge.net/release/xsl/current/htmlhelp/htmlhelp.xsl $<
-# Plucker docs
-$(PLUCKERDIR)/%.pdb: $(HTMLDIR)/%.html
- @mkdir -p $(@D)
- $(PLUCKERBUILD) -v -V 2 --stayonhost --zlib-compression -f $* -p $(PLUCKERDIR) file:$<
-
-# Texinfo docs
-$(TEXINFODIR)/%.texi: $(DOCBOOKDIR)/%.xml
- @mkdir -p $(@D)
- cd $(@D) && $(DB2TEXI) $(shell pwd)/$<
-
-$(TEXINFODIR)/%.info: $(TEXINFODIR)/%.texi
- $(MAKEINFO) --no-validate --force -o $@ "$<"
-
# Manpages
$(MANPAGEDIR)/smb.conf.5.xml: parameters
@@ -244,15 +198,6 @@ $(HTMLDIR)/smb.conf/%.html: $(SMBDOTCONFDOC)/%.xml
@mkdir -p $(@D)
$(XSLTPROC) --output $@ xslt/smb.conf-html.xsl $<
-# Pearson compatible XML
-$(PEARSONDIR)/%.xml: %/index.xml xslt/pearson.xsl
- @mkdir -p $(@D)
- $(XSLTPROC) --xinclude --output $@ xslt/sambadoc2pearson.xsl $<
-
-$(PEARSONDIR)/%.report.html: $(PEARSONDIR)/%.xml
- @mkdir -p $(@D)
- -$(XMLLINT) --valid --noout $< 2> $@
-
# Validation verification
%-validate: %/index.xml
cd $(<D) && $(XMLLINT) --xinclude --noent --postvalid --noout $(<F)
@@ -260,17 +205,6 @@ $(PEARSONDIR)/%.report.html: $(PEARSONDIR)/%.xml
build/catalog.xml: build/catalog.xml.in
sed -e "s|@abs_top_srcdir@|`pwd`|g;s|@abs_top_builddir@|`pwd`|g" < build/catalog.xml.in > build/catalog.xml
-samples: $(DOCBOOKDIR)/Samba3-HOWTO.xml xslt/extract-examples.xsl scripts/indent-smb.conf.pl
- @mkdir -p examples
- $(XSLTPROC) --xinclude xslt/extract-examples.xsl $< > /dev/null 2> examples/README
- for I in examples/*.conf; do { ./scripts/indent-smb.conf.pl < $$I > $$I.tmp; mv $$I.tmp $$I; } done
-
-# Archiving
-archive: pdf
- @mkdir -p $(ARCHIVEDIR)
- cp $(PDFDIR)/Samba3-HOWTO.pdf $(ARCHIVEDIR)/TOSHARG-$(DATETIME).pdf
- cp $(PDFDIR)/Samba3-ByExample.pdf $(ARCHIVEDIR)/S3bE-$(DATETIME).pdf
-
# XSL scripts
xslt/html.xsl: xslt/html-common.xsl
xslt/html-chunk.xsl: xslt/html-common.xsl
@@ -278,7 +212,6 @@ xslt/latex.xsl:
xslt/expand-sambadoc.xsl:
xslt/generate-attributions.xsl:
xslt/man.xsl:
-xslt/pearson.xsl:
distclean clobber:: clean
rm -f Makefile.settings config.status config.log
@@ -290,4 +223,4 @@ realdistclean:: distclean
# Always keep intermediate files if we can
.SECONDARY:
-.PHONY: clean clobber archive release everything all
+.PHONY: clean clobber release everything all
diff --git a/docs-xml/Makefile.settings.in b/docs-xml/Makefile.settings.in
index 08c250cc93d..7898b6bb4d0 100644
--- a/docs-xml/Makefile.settings.in
+++ b/docs-xml/Makefile.settings.in
@@ -2,12 +2,8 @@
XSLTPROC = @XSLTPROC@ --nonet
XMLLINT = @XMLLINT@
PNGTOPNM = @PNGTOPNM@
-INKSCAPE = @INKSCAPE@
PNMTOPS = @PNMTOPS@
-HTML2TEXT = @HTML2TEXT@
-DB2TEXI = @DB2TEXI@
MAKEINFO = @MAKEINFO@
-PLUCKERBUILD = @PLUCKERBUILD@
DBLATEX = @DBLATEX@
RM = @RM@
PERL = @PERL@
@@ -23,10 +19,7 @@ DOCBOOKDIR = tmp
PSDIR = $(OUTPUTDIR)
PDFDIR = $(OUTPUTDIR)
HTMLHELPDIR = $(OUTPUTDIR)/htmlhelp
-PEARSONDIR = $(OUTPUTDIR)/pearson
-TXTDIR = $(OUTPUTDIR)/textdocs
HTMLDIR=$(OUTPUTDIR)/htmldocs
-PLUCKERDIR=$(OUTPUTDIR)/plucker
DB2LATEX_ARGS = --stringparam latex.documentclass.book @LATEX_DOCUMENTCLASS_OPTIONS@
TARGETS = @TARGETS@
diff --git a/docs-xml/README b/docs-xml/README
index 33b07218781..4affbeec538 100644
--- a/docs-xml/README
+++ b/docs-xml/README
@@ -35,8 +35,8 @@ The format
----------
If you are new to xml, regard an xml file as 'source code'. You don't
-read it directly, but use it to create other formats (like the txt and html
-included in ../txtdocs and ../htmldocs).
+read it directly, but use it to create other formats (like the html
+included in ../htmldocs).
Docbook is a particular XML style, particularly suited to producing
technical manuals.
@@ -60,7 +60,6 @@ To generate the docs, you need to have the following packages installed:
* GNU Make
* GNU autoconf
* xsltproc
- * inkscape
For generating PDF and PostScript (thru LaTeX):
* dblatex (from http://dblatex.sf.net/)
@@ -71,9 +70,6 @@ For generating PDF (thru FO):
For generating ASCII:
* html2text
-For generating Palm-viewable docs:
- * plucker-build
-
For generating texi files:
* docbook2x-texi
* makeinfo
diff --git a/docs-xml/configure.ac b/docs-xml/configure.ac
index 9a7f9ce168e..aaec457d817 100644
--- a/docs-xml/configure.ac
+++ b/docs-xml/configure.ac
@@ -1,9 +1,6 @@
AC_INIT(xslt/latex.xsl)
LATEX_DOCUMENTCLASS_OPTIONS="letterpaper,11pt,openright,twoside"
-AC_ARG_ENABLE(prentice-hall,
-[ --enable-prentice-hall Produce Prentice-Hall compatible output],
-[ test "$enableval" && LATEX_DOCUMENTCLASS_OPTIONS="letterpaper,10pt,openleft,twoside,ph" ])
AC_SUBST(LATEX_DOCUMENTCLASS_OPTIONS)
DOC_BUILD_DATE=`date '+%d-%m-%Y'`
@@ -11,23 +8,11 @@ AC_SUBST(DOC_BUILD_DATE)
DOCS_TARGET_REQUIRE_PROGRAM(XSLTPROC, xsltproc, ALL)
DOCS_TARGET_REQUIRE_PROGRAM(RM, rm, ALL)
-DOCS_TARGET_REQUIRE_PROGRAM(INKSCAPE, inkscape, LATEX)
-DOCS_TARGET_REQUIRE_PROGRAM(INKSCAPE, inkscape, PS)
-DOCS_TARGET_REQUIRE_PROGRAM(INKSCAPE, inkscape, PDF)
-DOCS_TARGET_REQUIRE_PROGRAM(INKSCAPE, inkscape, HTML)
-DOCS_TARGET_REQUIRE_PROGRAM(INKSCAPE, inkscape, HTMLHELP)
-DOCS_TARGET_REQUIRE_PROGRAM(INKSCAPE, inkscape, PEARSON)
-DOCS_TARGET_REQUIRE_PROGRAM(INKSCAPE, inkscape, PLUCKER)
DOCS_TARGET_REQUIRE_PROGRAM(PNGTOPNM, pngtopnm, PS)
DOCS_TARGET_REQUIRE_PROGRAM(PNMTOPS, pnmtops, PS)
DOCS_TARGET_REQUIRE_PROGRAM(DBLATEX, dblatex, LATEX)
-DOCS_TARGET_REQUIRE_PROGRAM(PLUCKERBUILD, plucker-build, PLUCKER)
-DOCS_TARGET_REQUIRE_PROGRAM(HTML2TEXT, html2text, TXT)
-DOCS_TARGET_REQUIRE_PROGRAM(PERL, perl, UNDOCUMENTED)
DOCS_TARGET_REQUIRE_PROGRAM(XMLLINT, xmllint, VALIDATE)
-DOCS_TARGET_REQUIRE_PROGRAM(DB2TEXI, docbook2x-texi, TEXI)
-DOCS_TARGET_REQUIRE_PROGRAM(MAKEINFO, makeinfo, TEXIINFO)
AC_MSG_RESULT([])
AC_MSG_RESULT([Summary:])
@@ -39,13 +24,7 @@ DOCS_DEFINE_TARGET(HTML, ALL, [HTML versions], [html])
DOCS_DEFINE_TARGET(HTMLHELP, ALL, [HTML Help versions], [htmlhelp])
DOCS_DEFINE_TARGET(HTMLMAN, ALL, [HTML versions of the manpages], [htmlman])
DOCS_DEFINE_TARGET(MANPAGES, ALL, [manpages], [manpages])
-DOCS_DEFINE_TARGET(PEARSON, ALL, [pearson-compatible XML], [pearson])
-DOCS_DEFINE_TARGET(PLUCKER, HTML, [plucker versions], [plucker])
DOCS_DEFINE_TARGET(VALIDATE, ALL, [validating docbook output], [])
-DOCS_DEFINE_TARGET(TEXI, ALL, [TexInfo versions], [texi])
-DOCS_DEFINE_TARGET(TEXIINFO, ALL, [TexInfo Info versions], [texiinfo])
-DOCS_DEFINE_TARGET(UNDOCUMENTED, MANPAGES, [list of undocumented options], [undocumented])
-DOCS_DEFINE_TARGET(TXT, HTML, [text versions], [txt])
if test x"$TARGETS" = x; then
AC_MSG_ERROR([You won't be able to build any of the docs])
diff --git a/docs-xml/htmldocs.html b/docs-xml/htmldocs.html
index cf646de436b..040f4f809d8 100644
--- a/docs-xml/htmldocs.html
+++ b/docs-xml/htmldocs.html
@@ -14,14 +14,6 @@
<td valign="top">SAMBA <a href="Samba-Developers-Guide/index.html">Developers</a> Guide</td>
<td valign="top">This book is a collection of documents that might be useful for people developing samba or those interested in doing so. It's nothing more than a collection of documents written by samba developers about the internals of various parts of samba and the SMB protocol. It's still (and will always be) incomplete.</td>
</tr>
-<tr>
-<td valign="top">Samba-3 by <a href="Samba3-ByExample/index.html">Example</a></td>
- <td valign="top">Practical Exercises in Successful Samba Deployment.</td>
-</tr>
-<tr>
- <td valign="top">The Official Samba-3 <a href="Samba3-HOWTO/index.html">HOWTO</a> and Reference Guide</td>
- <td valign="top">This book provides example configurations, it documents key aspects of Microsoft Windows networking, provides in-depth insight into the important configuration of Samba-3, and helps to put all of these into a useful framework.</td>
-</tr>
<tr>
<td valign="top"><a href="manpages/index.html">Man pages</a></td>
<td valign="top">The Samba man pages in HTML.</td>
diff --git a/docs-xml/xslt/extract-examples.xsl b/docs-xml/xslt/extract-examples.xsl
deleted file mode 100644
index 2f3d5f4bc00..00000000000
--- a/docs-xml/xslt/extract-examples.xsl
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version='1.0'?>
-<!--
- Extract examples out of a DocBook/XML file into separate files.
- (C) Jelmer Vernooij 2003
-
- Published under the GNU GPLv3 or later
--->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
- xmlns:exsl="http://exslt.org/common"
- xmlns:samba="http://www.samba.org/samba/DTD/samba-doc"
- version="1.1"
- extension-element-prefixes="exsl">
-
-<xsl:output method="xml"/>
-
-<xsl:template match="example/title"></xsl:template>
-
-<xsl:template match="example/simplelist/title"></xsl:template>
-
-<!-- Parse all varlistentries and extract those of them which are descriptions of smb.conf
- parameters. We determine them by existence of <anchor> element inside <term> element.
- If <anchor> is there, then its 'id' attribute is translated to lower case and is used
- as basis for file name for that parameter.
--->
-<xsl:template match="example">
- <!-- reconstruct varlistentry - not all of them will go into separate files
- and also we must repair the main varlistentry itself.
- -->
- <xsl:variable name="content">
- <xsl:apply-templates/>
- </xsl:variable>
- <!-- Now put varlistentry into separate file _if_ it has anchor associated with it -->
- <xsl:variable name="filename"><xsl:text>examples/</xsl:text><xsl:value-of select="@id"/>.conf</xsl:variable>
- <!-- Debug message for an operator, just to show progress of processing :) -->
- <xsl:message>
- <xsl:text>Writing </xsl:text>
- <xsl:value-of select="$filename"/>
- <xsl:text> for </xsl:text>
- <xsl:value-of select="title"/>
- </xsl:message>
- <!-- Write finally varlistentry to a separate file -->
- <exsl:document href="{$filename}"
- method="xml"
- encoding="UTF-8"
- indent="yes"
- omit-xml-declaration="yes">
- <xsl:copy-of select="$content"/>
- </exsl:document>
-</xsl:template>
-
-</xsl:stylesheet>
diff --git a/script/autobuild.py b/script/autobuild.py
index 1d63111f992..0ab04eb7c26 100755
--- a/script/autobuild.py
+++ b/script/autobuild.py
@@ -126,7 +126,8 @@ builddirs = {
"talloc": "lib/talloc",
"replace": "lib/replace",
"tevent": "lib/tevent",
- "pidl": "pidl"
+ "pidl": "pidl",
+ "docs-xml": "docs-xml"
}
ctdb_configure_params = " --enable-developer ${PREFIX}"
@@ -190,6 +191,14 @@ tasks = {
("clean", "make clean"),
],
+ "docs-xml": [
+ ("random-sleep", random_sleep(300, 900)),
+ ("autoconf", "autoconf"),
+ ("configure", "./configure"),
+ ("make", "make html htmlman"),
+ ("clean", "make clean"),
+ ],
+
# We have 'test' before 'install' because, 'test' should work without 'install (runs all the other envs)'
"samba": [
("random-sleep", random_sleep(300, 900)),
--
Samba Shared Repository
More information about the samba-cvs
mailing list