[SCM] Samba Shared Repository - branch master updated -
release-4-0-0alpha7-1347-gbcb8982
Jelmer Vernooij
jelmer at samba.org
Fri May 1 11:10:54 GMT 2009
The branch, master has been updated
via bcb89826de933ab67589daecb64ff0abf5af8920 (commit)
via 4abc5c945e305df24476f2cc93b63353c3dd922e (commit)
via 6e48495ee715156a292d96d9fa87ec7ff17d02f6 (commit)
via 90c9e0aec401c1fe714712c3072cb43923049a7f (commit)
from 5b7b47f01568200f5064ca4b48457edb5ccc3109 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit bcb89826de933ab67589daecb64ff0abf5af8920
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Fri May 1 04:51:46 2009 +0200
Fix regular expressions in find_missing_doc after code format changes in
loadparm.c.
commit 4abc5c945e305df24476f2cc93b63353c3dd922e
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Fri May 1 04:40:55 2009 +0200
Fix 'make undocumented' (by hardcoding the source path, now that the docs
live in the same git repo)
commit 6e48495ee715156a292d96d9fa87ec7ff17d02f6
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Fri May 1 04:38:19 2009 +0200
Filter substitution variables out of list of undocumented applications.
commit 90c9e0aec401c1fe714712c3072cb43923049a7f
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Fri May 1 04:34:23 2009 +0200
Fix 'make samples' (git doesn't version directories, so 'examples' won't
exist yet)
-----------------------------------------------------------------------
Summary of changes:
docs-xml/Makefile | 2 +-
docs-xml/Makefile.settings.in | 3 +--
docs-xml/aclocal.m4 | 26 --------------------------
docs-xml/configure.ac | 6 ------
docs-xml/scripts/find_missing_doc.pl | 6 +++---
docs-xml/scripts/find_missing_manpages.pl | 4 +++-
6 files changed, 8 insertions(+), 39 deletions(-)
Changeset truncated at 500 lines:
diff --git a/docs-xml/Makefile b/docs-xml/Makefile
index 610d720..2a0a9d7 100644
--- a/docs-xml/Makefile
+++ b/docs-xml/Makefile
@@ -302,7 +302,7 @@ undocumented: $(SMBDOTCONFDOC)/parameters.all.xml scripts/find_missing_doc.pl sc
$(PERL) scripts/find_missing_manpages.pl $(SRCDIR)
samples: $(DOCBOOKDIR)/Samba3-HOWTO.xml xslt/extract-examples.xsl scripts/indent-smb.conf.pl
- @mkdir -p $(EXAMPLESDIR)
+ @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
diff --git a/docs-xml/Makefile.settings.in b/docs-xml/Makefile.settings.in
index fd7b4d7..254ac6b 100644
--- a/docs-xml/Makefile.settings.in
+++ b/docs-xml/Makefile.settings.in
@@ -28,11 +28,10 @@ endif
OUTPUTDIR = output
ARCHIVEDIR = archive
TEXINFODIR = $(OUTPUTDIR)/texi
-SRCDIR = @SAMBASOURCEDIR@
+SRCDIR = ../source3
EPSTOPDF = @EPSTOPDF@
MANPAGEDIR3 = manpages-3
MAKEINDEX = @MAKEINDEX@
-EXAMPLESDIR = $(OUTPUTDIR)/examples
SMBDOTCONFDOC = smbdotconf
DOCBOOKDIR = tmp
PSDIR = $(OUTPUTDIR)
diff --git a/docs-xml/aclocal.m4 b/docs-xml/aclocal.m4
index 9ecbda5..1252d21 100644
--- a/docs-xml/aclocal.m4
+++ b/docs-xml/aclocal.m4
@@ -36,29 +36,3 @@ AC_DEFUN(DOCS_TARGET_REQUIRE_PROGRAM, [
fi
fi
])
-
-dnl DOCS_TARGET_REQUIRE_DIR
-dnl arg1: list of possible paths
-dnl arg2: file in dir know to exist
-dnl arg3: variable to store found path in
-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
- test -f "$I/$2" && $3="$I"
- done
-
- if test x$$3 = x; then
- if test x"$$4_REQUIRES" = x; then
- $4_REQUIRES="$3"
- else
- $4_REQUIRES="$$4_REQUIRES $3"
- fi
- AC_MSG_RESULT([not found])
- else
- AC_MSG_RESULT([found in $$3])
- fi
-])
diff --git a/docs-xml/configure.ac b/docs-xml/configure.ac
index c0d6686..02e5c5d 100644
--- a/docs-xml/configure.ac
+++ b/docs-xml/configure.ac
@@ -1,9 +1,5 @@
AC_INIT(xslt/latex.xsl)
-AC_ARG_WITH(samba-sources,
-[ --with-samba-sources=DIR Specify path to Samba sources],
-[ test "$withval" && SPECIFIED_SOURCEDIR="$withval" ])
-
LATEX_DOCUMENTCLASS_OPTIONS="letterpaper,11pt,openright,twoside"
AC_ARG_ENABLE(prentice-hall,
[ --enable-prentice-hall Produce Prentice-Hall compatible output],
@@ -12,7 +8,6 @@ AC_SUBST(LATEX_DOCUMENTCLASS_OPTIONS)
DOC_BUILD_DATE=`date '+%d-%m-%Y'`
AC_SUBST(DOC_BUILD_DATE)
-AC_SUBST(SAMBASOURCEDIR)
DOCS_TARGET_REQUIRE_PROGRAM(XSLTPROC, xsltproc, ALL)
DOCS_TARGET_REQUIRE_PROGRAM(RM, rm, ALL)
@@ -63,7 +58,6 @@ DOCS_TARGET_REQUIRE_PROGRAM(XMLLINT, xmllint, VALIDATE)
DOCS_TARGET_REQUIRE_PROGRAM(FOP, fop, FOPDF)
DOCS_TARGET_REQUIRE_PROGRAM(DB2TEXI, docbook2x-texi, TEXI)
DOCS_TARGET_REQUIRE_PROGRAM(MAKEINFO, makeinfo, TEXIINFO)
-DOCS_TARGET_REQUIRE_DIR([$SPECIFIED_SOURCEDIR $SPECIFIED_SOURCEDIR/source ..], [param/loadparm.c], SAMBASOURCEDIR, UNDOCUMENTED)
AC_MSG_RESULT([])
AC_MSG_RESULT([Summary:])
diff --git a/docs-xml/scripts/find_missing_doc.pl b/docs-xml/scripts/find_missing_doc.pl
index 2b557b9..4379d3a 100755
--- a/docs-xml/scripts/find_missing_doc.pl
+++ b/docs-xml/scripts/find_missing_doc.pl
@@ -14,8 +14,8 @@ chdir("smbdotconf");
open(IN,"xsltproc --xinclude --param smb.context ALL generate-context.xsl parameters.all.xml|");
while(<IN>) {
- if( /<listitem><para><link linkend="([^"]*)"><parameter moreinfo="none">([^<]*)<\/parameter><\/link><\/para><\/listitem>/g ){
- $doc{$2} = $1;
+ if( /<samba:parameter .*?name="([^"]*?)"/g ){
+ $doc{$1} = "NOTFOUND";
}
}
@@ -37,7 +37,7 @@ while ($ln = <SOURCE>) {
last if $ln =~ m/^\s*\}\;\s*$/;
#pull in the param names only
next if $ln =~ m/.*P_SEPARATOR.*/;
- next unless $ln =~ /\s*\{\"(.*)\".*/;
+ next unless $ln =~ /\s*\.label\s*=\s*\"(.*)\".*/;
if($doc{lc($1)}) {
$doc{lc($1)} = "FOUND";
diff --git a/docs-xml/scripts/find_missing_manpages.pl b/docs-xml/scripts/find_missing_manpages.pl
index c468d7d..90d9f6a 100755
--- a/docs-xml/scripts/find_missing_manpages.pl
+++ b/docs-xml/scripts/find_missing_manpages.pl
@@ -19,6 +19,8 @@ while(<IN>) {
} else { $invar = 0; }
}
+$progs =~ s/@([^@]+)@//g;
+
foreach(split(/bin\//, $progs)) {
next if($_ eq " ");
s/\@EXEEXT\@//g;
@@ -30,7 +32,7 @@ foreach(split(/bin\//, $progs)) {
$found = 0;
for($i = 0; $i < 9; $i++) {
- if(-e "manpages/$f.$i.xml") { $found = 1; }
+ if(-e "manpages-3/$f.$i.xml") { $found = 1; }
}
if(!$found) {
--
Samba Shared Repository
More information about the samba-cvs
mailing list