[SCM] Samba Shared Repository - branch master updated
Jelmer Vernooij
jelmer at samba.org
Sun May 30 17:39:14 MDT 2010
The branch, master has been updated
via f3f1745... wafsamba: Actually install manual pages.
via 38cbb60... ldb: Remove manual pages for binaries that have already been moved to utils/.
via 3e65af3... ldb-waf: Fix installation path of manpages, simplify manpage handling.
via f757263... s4-waf: Look for xsltproc executable, required to build manpages.
from c2327b2... s3: final test for working shlib support requires PIE_LDFLAGS
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit f3f1745e271ec3c44e4df04d05698f954b8f518d
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Mon May 31 01:35:43 2010 +0200
wafsamba: Actually install manual pages.
commit 38cbb60e973d0db6d70f58d3803b3e62f1c942ce
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Mon May 31 01:35:07 2010 +0200
ldb: Remove manual pages for binaries that have already been moved to utils/.
commit 3e65af312c1250cbea8eea17d9705e1e2352262f
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Mon May 31 01:28:15 2010 +0200
ldb-waf: Fix installation path of manpages, simplify manpage handling.
commit f757263fb3d56041d6778304e521bed55771aea1
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Mon May 31 01:25:56 2010 +0200
s4-waf: Look for xsltproc executable, required to build manpages.
-----------------------------------------------------------------------
Summary of changes:
buildtools/wafsamba/wafsamba.py | 11 ++++
source4/lib/ldb/man/ad2oLschema.1.xml | 87 -------------------------------
source4/lib/ldb/man/oLschema2ldif.1.xml | 79 ----------------------------
source4/lib/ldb/wscript | 8 +--
source4/wscript | 1 +
5 files changed, 15 insertions(+), 171 deletions(-)
delete mode 100644 source4/lib/ldb/man/ad2oLschema.1.xml
delete mode 100644 source4/lib/ldb/man/oLschema2ldif.1.xml
Changeset truncated at 500 lines:
diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
index 412b0d2..4dac6fb 100644
--- a/buildtools/wafsamba/wafsamba.py
+++ b/buildtools/wafsamba/wafsamba.py
@@ -295,6 +295,17 @@ def SAMBA_BINARY(bld, binname, source,
if subsystem_name is not None:
bld.TARGET_ALIAS(subsystem_name, binname)
+ if manpages is not None and bld.env.XSLTPROC is not None:
+ bld.env.MAN_XSL = 'http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl'
+ for m in manpages.split():
+ source = m + '.xml'
+ bld.SAMBA_GENERATOR(m,
+ source=source,
+ target=m,
+ rule='${XSLTPROC} -o ${TGT} ${MAN_XSL} ${SRC}'
+ )
+ bld.INSTALL_FILES('${MANDIR}/man%s' % m[-1], m, flat=True)
+
Build.BuildContext.SAMBA_BINARY = SAMBA_BINARY
diff --git a/source4/lib/ldb/man/ad2oLschema.1.xml b/source4/lib/ldb/man/ad2oLschema.1.xml
deleted file mode 100644
index 6ae8996..0000000
--- a/source4/lib/ldb/man/ad2oLschema.1.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
-<refentry id="ad2oLschema.1">
-
-<refmeta>
- <refentrytitle>ad2oLschema</refentrytitle>
- <manvolnum>1</manvolnum>
-</refmeta>
-
-
-<refnamediv>
- <refname>ad2oLschema</refname>
- <refpurpose>Converts AC-like LDAP schemas to OpenLDAP
- compatible schema files</refpurpose>
-</refnamediv>
-
-<refsynopsisdiv>
- <cmdsynopsis>
- <command>ad2oLschema</command>
- <arg choice="opt">-I INPUT-FILE</arg>
- <arg choice="opt">-O OUTPUT-FILE</arg>
- </cmdsynopsis>
-</refsynopsisdiv>
-
-<refsect1>
- <title>DESCRIPTION</title>
-
- <para>ad2oLschema is a simple tool that converts AD-like LDIF
- schema files into OpenLDAP schema files.</para>
-</refsect1>
-
-
-<refsect1>
- <title>OPTIONS</title>
-
- <variablelist>
- <varlistentry>
- <term>-H url</term>
- <listitem><para>URL to an LDB or LDAP server with an AD schema to read. </para></listitem>
- </varlistentry>
-
- <varlistentry>
- <term>-I input-file</term> <listitem><para>AD schema
- to read. If neither this nor -H is specified, the
- schema file will be read from standard input.
- </para></listitem>
- </varlistentry>
-
- <varlistentry>
- <term>-O output-file</term>
- <listitem><para>File to write OpenLDAP version of schema to.
- </para></listitem>
- </varlistentry>
- </variablelist>
-</refsect1>
-
-<refsect1>
- <title>VERSION</title>
-
- <para>This man page is correct for version 4.0 of the Samba suite.</para>
-</refsect1>
-
-<refsect1>
- <title>SEE ALSO</title>
-
- <para>ldb(7), ldbmodify, ldbdel, ldif(5)</para>
-
-</refsect1>
-
-<refsect1>
- <title>AUTHOR</title>
-
- <para> ldb was written by
- <ulink url="http://samba.org/~tridge/">Andrew Tridgell</ulink>.
- ad2oLschema was written by <ulink
- url="http://samba.org/~abartlet/">Andrew Bartlett</ulink>.
- </para>
-
- <para>
-If you wish to report a problem or make a suggestion then please see
-the <ulink url="http://ldb.samba.org/"/> web site for
-current contact and maintainer information.
- </para>
-
-</refsect1>
-
-</refentry>
diff --git a/source4/lib/ldb/man/oLschema2ldif.1.xml b/source4/lib/ldb/man/oLschema2ldif.1.xml
deleted file mode 100644
index b1e681b..0000000
--- a/source4/lib/ldb/man/oLschema2ldif.1.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
-<refentry id="oLschema2ldif.1">
-
-<refmeta>
- <refentrytitle>oLschema2ldif</refentrytitle>
- <manvolnum>1</manvolnum>
-</refmeta>
-
-
-<refnamediv>
- <refname>oLschema2ldif</refname>
- <refpurpose>Converts LDAP schema's to LDB-compatible LDIF</refpurpose>
-</refnamediv>
-
-<refsynopsisdiv>
- <cmdsynopsis>
- <command>oLschema2ldif</command>
- <arg choice="opt">-I INPUT-FILE</arg>
- <arg choice="opt">-O OUTPUT-FILE</arg>
- </cmdsynopsis>
-</refsynopsisdiv>
-
-<refsect1>
- <title>DESCRIPTION</title>
-
- <para>oLschema2ldif is a simple tool that converts standard OpenLDAP schema files to a LDIF format that is understood by LDB.</para>
-</refsect1>
-
-
-<refsect1>
- <title>OPTIONS</title>
-
- <variablelist>
- <varlistentry>
- <term>-I input-file</term>
- <listitem><para>OpenLDAP schema to read. If none are specified,
-the schema file will be read from standard input.
- </para></listitem>
- </varlistentry>
-
- <varlistentry>
- <term>-O output-file</term>
- <listitem><para>File to write ldif version of schema to.
- </para></listitem>
- </varlistentry>
- </variablelist>
-</refsect1>
-
-<refsect1>
- <title>VERSION</title>
-
- <para>This man page is correct for version 4.0 of the Samba suite.</para>
-</refsect1>
-
-<refsect1>
- <title>SEE ALSO</title>
-
- <para>ldb(7), ldbmodify, ldbdel, ldif(5)</para>
-
-</refsect1>
-
-<refsect1>
- <title>AUTHOR</title>
-
- <para> ldb was written by
- <ulink url="http://samba.org/~tridge/">Andrew Tridgell</ulink>.
- oLschema2ldif was written by <ulink url="mailto:idra at samba.org">Simo Sorce</ulink>.
- </para>
-
- <para>
-If you wish to report a problem or make a suggestion then please see
-the <ulink url="http://ldb.samba.org/"/> web site for
-current contact and maintainer information.
- </para>
-
-</refsect1>
-
-</refentry>
diff --git a/source4/lib/ldb/wscript b/source4/lib/ldb/wscript
index 32ae58a..a2855dc 100644
--- a/source4/lib/ldb/wscript
+++ b/source4/lib/ldb/wscript
@@ -177,7 +177,7 @@ def build(bld):
LDB_TOOLS='ldbadd ldbsearch ldbdel ldbmodify ldbedit ldbrename'
for t in LDB_TOOLS.split():
- bld.SAMBA_BINARY(t, 'tools/%s.c' % t, deps='LIBLDB_CMDLINE')
+ bld.SAMBA_BINARY(t, 'tools/%s.c' % t, deps='LIBLDB_CMDLINE', manpages='man/%s.1' % t)
# ldbtest doesn't get installed
bld.SAMBA_BINARY('ldbtest', 'tools/ldbtest.c', deps='LIBLDB_CMDLINE', install=False)
@@ -187,9 +187,7 @@ def build(bld):
realname='ldb.so')
if bld.env.XSLTPROC:
- manpages = 'man/ad2oLschema.1 man/ldb.3 man/ldbadd.1 man/ldbdel.1 ' \
- 'man/ldbedit.1 man/ldbmodify.1 man/ldbrename.1 ' \
- 'man/ldbsearch.1 man/oLschema2ldif.1'
+ manpages = 'man/ldb.3'
bld.env.LDB_MAN_XSL = 'http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl'
@@ -200,7 +198,7 @@ def build(bld):
target=m,
rule='${XSLTPROC} -o ${TGT} ${LDB_MAN_XSL} ${SRC}'
)
- bld.INSTALL_FILES('${MANDIR}/man1 ${MANDIR}/man3', m, flat=True)
+ bld.INSTALL_FILES('${MANDIR}/man%s' % m[-1], m, flat=True)
def test(ctx):
diff --git a/source4/wscript b/source4/wscript
index 5d6392c..2be159c 100644
--- a/source4/wscript
+++ b/source4/wscript
@@ -77,6 +77,7 @@ def configure(conf):
conf.find_program('python', var='PYTHON', mandatory=True)
conf.find_program('perl', var='PERL', mandatory=True)
+ conf.find_program('xsltproc', var='XSLTPROC')
# enable tool to build python extensions
conf.check_tool('python')
--
Samba Shared Repository
More information about the samba-cvs
mailing list