sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-15 23:24:37 +03:00
Code

Fix the building of the docs in all formats:

Browse Source 
- legalnotice should be in <bookinfo> (Developer docs)
 - Generate embedded PostScript versions of the PNG files in projdoc/imagefiles
 - Use either the PNG or the EPS images, depending on the desired output format.
 Check CUPS-printing.xml diff for details
(This used to be commit 9992d5452d96508dc5dedc146f62e28d03b53ecc)
This commit is contained in:
Jelmer Vernooij 2003-06-05 22:54:56 +00:00
parent 1fcfcce095
commit ebf69a5ae6
6 changed files with 155 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
docs/docbook/Makefile.in
View File

@ -33,13 +33,16 @@ PDFLATEX = @PDFLATEX@
LATEX = @LATEX@
DVIPS = @DVIPS@
HTMLDOC = @HTMLDOC@
PNGTOPNM = @PNGTOPNM@
PNMTOPS = @PNMTOPS@
XMLTO = @XMLTO@
SRCDIR = @srcdir@
MANDIR=../manpages
HTMLDIR=../htmldocs
MANPROJDOC = manpages
PROJDOC = projdoc
IMAGEPROJDIR = $(PROJDOC)/imagefiles
DEVDOC = devdoc
XMLTO = @XMLTO@
SMBDOTCONFDOC = smbdotconf
PSDIR = ..
PDFDIR = ..
@ -51,6 +54,8 @@ FAQDIR = ../faq
MANPAGES=$(patsubst %,$(MANDIR)/%,$(MANPAGES_NAMES))
MANPAGES_HTML=$(patsubst %,$(HTMLDIR)/%.html,$(MANPAGES_NAMES))
PROJDOC_IMAGES_PNG = $(wildcard $(IMAGEPROJDIR)/*.png)
PROJDOC_IMAGES_EPS=$(patsubst %.png,%.eps,$(wildcard $(IMAGEPROJDIR)/*.png))
PROJDOC_DEPS = $(PROJDOC)/*.xml $(PROJDOC)/attributions.xml
DEVDOC_DEPS = $(DEVDOC)/*.xml $(DEVDOC)/attributions.xml
@ -111,7 +116,7 @@ dev-doc.tex: $(DEVDOC)/dev-doc.xml $(DEVDOC_DEPS)
@$(XSLTPROC) --output $@ xslt/latex.xsl $<
# Adobe PDF files
$(PDFDIR)/Samba-HOWTO-Collection.pdf: samba-doc.tex
$(PDFDIR)/Samba-HOWTO-Collection.pdf: samba-doc.tex $(PROJDOC_IMAGES_PNG)
@echo "Building LaTeX sources via $(PDFLATEX)..."
@$(PDFLATEX) $< | grep 'Rerun to get cross-references right' && \
$(PDFLATEX) $< | grep 'Rerun to get cross-references right' && \
@ -127,8 +132,10 @@ $(PDFDIR)/Samba-Developers-Guide.pdf: dev-doc.tex
@echo "done"
@mv dev-doc.pdf $@
epsimages: $(PROJDOC_IMAGES_EPS)
# DVI files
$(DVIDIR)/Samba-HOWTO-Collection.dvi: samba-doc.tex
$(DVIDIR)/Samba-HOWTO-Collection.dvi: samba-doc.tex $(PROJDOC_IMAGES_EPS)
@echo "Building LaTeX sources via $(LATEX)..."
@$(LATEX) $< 2>&1 | grep 'Rerun to get cross-references right' && \
$(LATEX) $< 2>&1 | grep 'Rerun to get cross-references right' && \
@ -144,6 +151,9 @@ $(DVIDIR)/Samba-Developers-Guide.dvi: dev-doc.tex
@echo "done"
@mv dev-doc.dvi $@
$(IMAGEPROJDIR)/%.eps: $(IMAGEPROJDIR)/%.png
@$(PNGTOPNM) $< | $(PNMTOPS) > $@
# PostScript files
$(PSDIR)/Samba-HOWTO-Collection.ps: $(DVIDIR)/Samba-HOWTO-Collection.dvi
$(DVIPS) -o $@ $<
@ -159,7 +169,7 @@ $(HTMLDIR):
CSS: $(HTMLDIR) xslt/html/samba.css
@cp xslt/html/samba.css $(HTMLDIR)/
$(HTMLDIR)/Samba-HOWTO-Collection.html: $(PROJDOC)/samba-doc.xml $(PROJDOC_DEPS)
$(HTMLDIR)/Samba-HOWTO-Collection.html: $(PROJDOC)/samba-doc.xml $(PROJDOC_DEPS) $(PROJDOC_IMAGES_PNG)
@$(XSLTPROC) --output $@ xslt/html.xsl $<
$(HTMLDIR)/Samba-Developers-Guide.html: $(DEVDOC)/dev-doc.xml $(DEVDOC_DEPS)
@ -216,4 +226,5 @@ clean:
@rm -f $(MANPAGES) $(MANPAGES_HTML) $(HTMLDIR)/*.html $(HTMLDIR)/*.css $(TXTDIR)/*.txt $(PSDIR)/*.ps $(PDFDIR)/*.pdf
@rm -f $(MANPROJDOC)/smb.conf.5.xml $(SMBDOTCONFDOC)/parameters.*.xml
@rm -f samba-doc.* dev-doc.* $(PROJDOC)/attributions.xml
@rm -f $(IMAGEPROJDIR)/*.eps

72
docs/docbook/configure vendored
View File

@ -704,6 +704,76 @@ else
echo "$ac_t""no" 1>&6
fi
# Extract the first word of "pngtopnm", so it can be a program name with args.
set dummy pngtopnm; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:711: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_PNGTOPNM'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
case "$PNGTOPNM" in
/*)
ac_cv_path_PNGTOPNM="$PNGTOPNM" # Let the user override the test with a path.
;;
?:/*)
ac_cv_path_PNGTOPNM="$PNGTOPNM" # Let the user override the test with a dos path.
;;
*)
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
ac_dummy="$PATH"
for ac_dir in $ac_dummy; do
test -z "$ac_dir" && ac_dir=.
if test -f $ac_dir/$ac_word; then
ac_cv_path_PNGTOPNM="$ac_dir/$ac_word"
break
fi
done
IFS="$ac_save_ifs"
;;
esac
fi
PNGTOPNM="$ac_cv_path_PNGTOPNM"
if test -n "$PNGTOPNM"; then
echo "$ac_t""$PNGTOPNM" 1>&6
else
echo "$ac_t""no" 1>&6
fi
# Extract the first word of "pnmtops", so it can be a program name with args.
set dummy pnmtops; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:746: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_PNMTOPS'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
case "$PNMTOPS" in
/*)
ac_cv_path_PNMTOPS="$PNMTOPS" # Let the user override the test with a path.
;;
?:/*)
ac_cv_path_PNMTOPS="$PNMTOPS" # Let the user override the test with a dos path.
;;
*)
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
ac_dummy="$PATH"
for ac_dir in $ac_dummy; do
test -z "$ac_dir" && ac_dir=.
if test -f $ac_dir/$ac_word; then
ac_cv_path_PNMTOPS="$ac_dir/$ac_word"
break
fi
done
IFS="$ac_save_ifs"
;;
esac
fi
PNMTOPS="$ac_cv_path_PNMTOPS"
if test -n "$PNMTOPS"; then
echo "$ac_t""$PNMTOPS" 1>&6
else
echo "$ac_t""no" 1>&6
fi
DOC_BUILD_DATE=`date '+%d-%m-%Y'`
@ -857,6 +927,8 @@ s%@PDFLATEX@%$PDFLATEX%g
s%@XMLTO@%$XMLTO%g
s%@LATEX@%$LATEX%g
s%@DVIPS@%$DVIPS%g
s%@PNGTOPNM@%$PNGTOPNM%g
s%@PNMTOPS@%$PNMTOPS%g
s%@DOC_BUILD_DATE@%$DOC_BUILD_DATE%g
CEOF

2
docs/docbook/configure.in
View File

@ -12,6 +12,8 @@ fi
AC_PATH_PROG(XMLTO, xmlto)
AC_PATH_PROG(LATEX, latex)
AC_PATH_PROG(DVIPS, dvips)
AC_PATH_PROG(PNGTOPNM, pngtopnm)
AC_PATH_PROG(PNMTOPS, pnmtops)
DOC_BUILD_DATE=`date '+%d-%m-%Y'`
AC_SUBST(DOC_BUILD_DATE)

11
docs/docbook/devdoc/dev-doc.xml
View File

@ -30,13 +30,9 @@
<surname>SAMBA Team</surname>
</author>
<address><email>samba@samba.org</email></address>
</bookinfo>
<dedication>
<title>Abstract</title>
<abstract>
<para>
<emphasis>Last Update</emphasis> : Mon Sep 30 15:23:53 CDT 2002
<emphasis>Last Update</emphasis> : Fri Jun 6 00:45:54 CEST 2003
</para>
<para>
@ -57,7 +53,7 @@ distribution. A copy can be found on-line at <ulink
url="http://www.fsf.org/licenses/gpl.txt">http://www.fsf.org/licenses/gpl.txt</ulink>
</para>
</dedication>
</abstract>
<legalnotice>
@ -70,6 +66,7 @@ url="http://www.fsf.org/licenses/gpl.txt">http://www.fsf.org/licenses/gpl.txt</u
</formalpara>
</legalnotice>
</bookinfo>
<!-- Contents -->
<toc/>

77
docs/docbook/projdoc/CUPS-printing.xml
View File

@ -573,7 +573,10 @@ Systems.Their <emphasis>Core Graphic Engine</emphasis> uses a
<para>
<figure><title>Windows Printing to a local Printer</title>
<graphic fileref="projdoc/imagefiles/1small.png"/>
<mediaobject>
<imageobject role="latex"><imagedata fileref="projdoc/imagefiles/1small"/></imageobject>
<imageobject><imagedata fileref="projdoc/imagefiles/1small.png"/></imageobject>
</mediaobject>
</figure>
</para>
</sect2>
@ -655,7 +658,10 @@ is CUPS.... ;-)
<para>
<figure><title>Printing to a Postscript Printer</title>
<graphic fileref="projdoc/imagefiles/2small.png"/>
<mediaobject>
<imageobject role="latex"><imagedata fileref="projdoc/imagefiles/2small"/></imageobject>
<imageobject><imagedata fileref="projdoc/imagefiles/2small.png"/></imageobject>
</mediaobject>
</figure>
</para>
@ -685,7 +691,10 @@ to non-PostScript hardware.
<para>
<figure><title>Ghostscript as a RIP for non-postscript printers</title>
<graphic fileref="projdoc/imagefiles/3small.png"/>
<mediaobject>
<imageobject role="latex"><imagedata fileref="projdoc/imagefiles/3small"/></imageobject>
<imageobject><imagedata fileref="projdoc/imagefiles/3small.png"/></imageobject>
</mediaobject>
</figure>
</para>
@ -1090,7 +1099,10 @@ print options already embedded into the file.
<para>
<figure><title>Prefiltering in CUPS to form Postscript</title>
<graphic fileref="projdoc/imagefiles/4small.png"/>
<mediaobject>
<imageobject role="latex"><imagedata fileref="projdoc/imagefiles/4small"/></imageobject>
<imageobject><imagedata fileref="projdoc/imagefiles/4small.png"/></imageobject>
</mediaobject>
</figure>
</para>
</sect2>
@ -1109,7 +1121,10 @@ stapling an punching it, etc.) into the PostScript file.
<para>
<figure><title>Adding Device-specific Print Options</title>
<graphic fileref="projdoc/imagefiles/5small.png"/>
<mediaobject>
<imageobject role="latex"><imagedata fileref="projdoc/imagefiles/5small"/></imageobject>
<imageobject><imagedata fileref="projdoc/imagefiles/5small.png"/></imageobject>
</mediaobject>
</figure>
</para>
@ -1150,7 +1165,10 @@ that are able to generate device-specific printer data.
<para>
<figure><title>Postscript to intermediate Raster format</title>
<graphic fileref="projdoc/imagefiles/6small.png"/>
<mediaobject>
<imageobject role="latex"><imagedata fileref="projdoc/imagefiles/6small"/></imageobject>
<imageobject><imagedata fileref="projdoc/imagefiles/6small.png"/></imageobject>
</mediaobject>
</figure>
</para>
@ -1169,7 +1187,10 @@ than one vendor financing the development of CUPS raster drivers).
<para>
<figure><title>CUPS-raster production using Ghostscript</title>
<graphic fileref="projdoc/imagefiles/7small.png"/>
<mediaobject>
<imageobject role="latex"><imagedata fileref="projdoc/imagefiles/7small"/></imageobject>
<imageobject><imagedata fileref="projdoc/imagefiles/7small.png"/></imageobject>
</mediaobject>
</figure>
</para>
@ -1205,7 +1226,10 @@ filtering:
<para>
<figure><title>Image format to CUPS-raster format conversion</title>
<graphic fileref="projdoc/imagefiles/8small.png"/>
<mediaobject>
<imageobject role="latex"><imagedata fileref="projdoc/imagefiles/8small"/></imageobject>
<imageobject><imagedata fileref="projdoc/imagefiles/8small.png"/></imageobject>
</mediaobject>
</figure>
</para>
@ -1230,7 +1254,10 @@ closely as possible with CUPS.
<para>
<figure><title>Raster to Printer Specific formats</title>
<graphic fileref="projdoc/imagefiles/9small.png"/>
<mediaobject>
<imageobject role="latex"><imagedata fileref="projdoc/imagefiles/9small"/></imageobject>
<imageobject><imagedata fileref="projdoc/imagefiles/9small.png"/></imageobject>
</mediaobject>
</figure>
</para>
</sect2>
@ -1730,7 +1757,10 @@ advantages) than other methods.
<para>
<figure><title>cupsomatic/foomatic processing versus Native CUPS</title>
<graphic fileref="projdoc/imagefiles/10small.png"/>
<mediaobject>
<imageobject role="latex"><imagedata fileref="projdoc/imagefiles/10small"/></imageobject>
<imageobject><imagedata fileref="projdoc/imagefiles/10small.png"/></imageobject>
</mediaobject>
</figure>
</para>
@ -2018,7 +2048,10 @@ clients.
<para>
<figure><title>Print Driver execution on the Client</title>
<graphic fileref="projdoc/imagefiles/11small.png"/>
<mediaobject>
<imageobject role="latex"><imagedata fileref="projdoc/imagefiles/11small"/></imageobject>
<imageobject><imagedata fileref="projdoc/imagefiles/11small.png"/></imageobject>
</mediaobject>
</figure>
</para>
</sect2>
@ -2038,7 +2071,10 @@ understand.
<para>
<figure><title>Print Driver execution on the Server</title>
<graphic fileref="projdoc/imagefiles/12small.png"/>
<mediaobject>
<imageobject role="latex"><imagedata fileref="projdoc/imagefiles/12small"/></imageobject>
<imageobject><imagedata fileref="projdoc/imagefiles/12small.png"/></imageobject>
</mediaobject>
</figure>
</para>
@ -2113,7 +2149,10 @@ simply use <parameter>printing = sysv</parameter>).
<para>
<figure><title>Printing via CUPS/samba server</title>
<graphic fileref="projdoc/imagefiles/13small.png"/>
<mediaobject>
<imageobject role="latex"><imagedata fileref="projdoc/imagefiles/13small"/></imageobject>
<imageobject><imagedata fileref="projdoc/imagefiles/13small.png"/></imageobject>
</mediaobject>
</figure>
</para>
</sect2>
@ -3013,7 +3052,10 @@ not intended to, and does not work with, "raw" queues!
<para>
<figure><title>cupsaddsmb flowchart</title>
<graphic fileref="projdoc/imagefiles/14small.png"/>
<mediaobject>
<imageobject role="latex"><imagedata fileref="projdoc/imagefiles/1small"/></imageobject>
<imageobject><imagedata fileref="projdoc/imagefiles/1small.png"/></imageobject>
</mediaobject>
</figure>
</para>
</sect2>
@ -3462,7 +3504,7 @@ driver installed".
<sect3>
<title>Fourth Step: Put all required Driver Files into Samba's
<parameter>[print$]</parameter></title>
[print$]</title>
<para><screen>
@ -5746,7 +5788,10 @@ files from the Adobe website.</para></listitem></varlistentry>
<para>
<figure><title>CUPS Printing Overview</title>
<graphic fileref="projdoc/imagefiles/a_small.png"/>
<mediaobject>
<imageobject role="latex"><imagedata fileref="projdoc/imagefiles/a_small"/></imageobject>
<imageobject><imagedata fileref="projdoc/imagefiles/a_small.png"/></imageobject>
</mediaobject>
</figure>
</para>
</sect2>

2
docs/docbook/projdoc/Speed.xml
View File

@ -222,7 +222,7 @@ performance. Check the sections on the various clients in
</sect1>
<sect1>
<title>Samba performance problem due changing kernel (2.4.20 Linux kernel)</title>
<title>Samba performance problem due changing kernel</title>
<para>
Hi everyone. I am running Gentoo on my server and samba 2.2.8a. Recently