Author: jelmer
Date: 2005-03-11 15:57:45 +0000 (Fri, 11 Mar 2005)
New Revision: 402
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba-docs&rev=402
Log:
- Be a bit more verbose.
- Try some more possibilities when looking for 3.0 sources.
- Fix "make files"
Modified:
trunk/Makefile
trunk/aclocal.m4
trunk/configure.in
trunk/scripts/find_missing_doc.pl
trunk/scripts/find_missing_manpages.pl
trunk/xslt/extract-smbfiles.xsl
Changeset:
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2005-03-11 15:23:25 UTC (rev 401)
+++ trunk/Makefile 2005-03-11 15:57:45 UTC (rev 402)
@@ -1,5 +1,5 @@
#################################################################
-# Makefile.in for Samba Documentation
+# Makefile for Samba Documentation
# Authors:
# James Moore <jmoore at php.net>
# Gerald Carter <jerry at samba.org>
@@ -172,6 +172,10 @@
xslt/figures/%.pdf: xslt/figures/%.eps
$(EPSTOPDF) $<
+# RTF files
+$(RTFDIR)/%.rtf: $(DOCBOOKDIR)/%.xml
+ $(XSLTPROC) --output $@ http://docbook.sourceforge.net/release/xsl/current/fo/docbook.xsl $<
+
# Fo
$(FODIR)/%.fo: $(DOCBOOKDIR)/%.xml
mkdir -p $(@D)
@@ -190,7 +194,7 @@
# Plucker docs
$(PLUCKERDIR)/%.pdb: $(HTMLDIR)/%.html
mkdir -p $(@D)
- $(PLUCKERBUILD) -v -M1 --stayonhost --noimages --zlib-compression -H file:$< -f $* -p $(PLUCKERDIR)
+ $(PLUCKERBUILD) -v -V 2 --stayonhost --zlib-compression -f $* -p $(PLUCKERDIR) file:$<
# Manpages
$(MANPAGEDIR)/smb.conf.5.xml: $(SMBDOTCONFDOC)/parameters.all.xml $(SMBDOTCONFDOC)/parameters.service.xml $(SMBDOTCONFDOC)/parameters.global.xml
@@ -241,7 +245,7 @@
# Examples and the like
-files: $(HOWTODIR)/index.xml xslt/extract-smbfiles.xsl
+files: Samba-HOWTO-Collection/index.xml xslt/extract-smbfiles.xsl
$(XSLTPROC) xslt/extract-smbfiles.xsl $< > /dev/null
samples: $(DOCBOOKDIR)/Samba-HOWTO-Collection.xml xslt/extract-examples.xsl scripts/indent-smb.conf.pl
Modified: trunk/aclocal.m4
===================================================================
--- trunk/aclocal.m4 2005-03-11 15:23:25 UTC (rev 401)
+++ trunk/aclocal.m4 2005-03-11 15:57:45 UTC (rev 402)
@@ -44,6 +44,7 @@
dnl arg4: target that requires it
AC_DEFUN(DOCS_TARGET_REQUIRE_DIR, [
+ AC_MSG_CHECKING([for $2])
AC_SUBST($3)
for I in $1;
do
@@ -56,5 +57,8 @@
else
$4_REQUIRES="$$4_REQUIRES $3"
fi
+ AC_MSG_RESULT([not found])
+ else
+ AC_MSG_RESULT([found in $$3])
fi
])
Modified: trunk/configure.in
===================================================================
--- trunk/configure.in 2005-03-11 15:23:25 UTC (rev 401)
+++ trunk/configure.in 2005-03-11 15:57:45 UTC (rev 402)
@@ -68,7 +68,7 @@
DOCS_TARGET_REQUIRE_PROGRAM(PERL, perl, UNDOCUMENTED)
DOCS_TARGET_REQUIRE_PROGRAM(XMLLINT, xmllint, VERIFY)
DOCS_TARGET_REQUIRE_PROGRAM(FOP, fop, FOPDF)
-DOCS_TARGET_REQUIRE_DIR([$SPECIFIED_SOURCEDIR ..], [source/configure.in], SAMBASOURCEDIR, UNDOCUMENTED)
+DOCS_TARGET_REQUIRE_DIR([$SPECIFIED_SOURCEDIR $SPECIFIED_SOURCEDIR/source ..], [param/loadparm.c], SAMBASOURCEDIR, UNDOCUMENTED)
AC_MSG_RESULT([])
AC_MSG_RESULT([Summary:])
Modified: trunk/scripts/find_missing_doc.pl
===================================================================
--- trunk/scripts/find_missing_doc.pl 2005-03-11 15:23:25 UTC (rev 401)
+++ trunk/scripts/find_missing_doc.pl 2005-03-11 15:57:45 UTC (rev 402)
@@ -27,7 +27,7 @@
# Reading entries from source code
-open(SOURCE,"$topdir/source/param/loadparm.c") or die("Can't open $topdir/source/param/loadparm.c: $!");
+open(SOURCE,"$topdir/param/loadparm.c") or die("Can't open $topdir/param/loadparm.c: $!");
while ($ln = <SOURCE>) {
last if $ln =~ m/^static\ struct\ parm_struct\ parm_table.*/;
@@ -42,7 +42,7 @@
if($doc{lc($1)}) {
$doc{lc($1)} = "FOUND";
} else {
- print "$1 is not documented!\n";
+ print "'$1' is not documented\n";
}
}
close SOURCE;
@@ -52,6 +52,6 @@
foreach (keys %doc) {
if($doc{$_} cmp "FOUND") {
- print "$_ is documented but is not a configuration option!\n";
+ print "'$_' is documented but is not a configuration option\n";
}
}
Modified: trunk/scripts/find_missing_manpages.pl
===================================================================
--- trunk/scripts/find_missing_manpages.pl 2005-03-11 15:23:25 UTC (rev 401)
+++ trunk/scripts/find_missing_manpages.pl 2005-03-11 15:57:45 UTC (rev 402)
@@ -8,7 +8,7 @@
$progs = "";
-open(IN, "$topdir/source/Makefile.in");
+open(IN, "$topdir/Makefile.in");
while(<IN>) {
if($invar && /^([ \t]*)(.*?)([\\])$/) {
$progs.=" " . $2;
@@ -34,6 +34,6 @@
}
if(!$found) {
- print "$f doesn't have a manpage!\n";
+ print "'$f' does not have a manpage\n";
}
}
Modified: trunk/xslt/extract-smbfiles.xsl
===================================================================
--- trunk/xslt/extract-smbfiles.xsl 2005-03-11 15:23:25 UTC (rev 401)
+++ trunk/xslt/extract-smbfiles.xsl 2005-03-11 15:57:45 UTC (rev 402)
@@ -21,7 +21,7 @@
<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="@name"/></xsl:variable>
+ <xsl:variable name="filename"><xsl:text>output/examples/</xsl:text><xsl:value-of select="@name"/></xsl:variable>
<!-- Debug message for an operator, just to show progress of processing :) -->
<xsl:message>
<xsl:text>Writing </xsl:text>