The branch, master has been updated via b86c8fd waf: Fix bug #8801 - build s3fs manpages. via b29dff8 waf: Rename nmblookup manpage to nmblookup4. via 022e0ae docs: Remove old tdb manpages. via 90c0e75 docs: Remove old ldb manpages. via f0da7c5 waf: Create catalog file for manpage generation. via 802708b wafsamba: Add a CONFIGURE_FILE option. via 18eb505 wafsamba: Add support for manpages in SAMBA_MODULE. from 51a3845 selftest/knownfail: samba3.smb2.durable-open.alloc-size fails currently
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit b86c8fd92d4c1b238572690660a2093f50ba88b1 Author: Andreas Schneider <a...@samba.org> Date: Thu Sep 6 16:10:08 2012 +0200 waf: Fix bug #8801 - build s3fs manpages. Autobuild-User(master): Andreas Schneider <a...@cryptomilk.org> Autobuild-Date(master): Fri Sep 7 12:30:08 CEST 2012 on sn-devel-104 commit b29dff802a4aab7d8132aec033b2858bd6e35dca Author: Andreas Schneider <a...@samba.org> Date: Thu Sep 6 15:26:37 2012 +0200 waf: Rename nmblookup manpage to nmblookup4. commit 022e0ae62e05cfdb3b0f8508eedef3ec794088a4 Author: Andreas Schneider <a...@samba.org> Date: Thu Sep 6 16:18:01 2012 +0200 docs: Remove old tdb manpages. They are part of lib/tdb/manpages/ now. commit 90c0e75df749f072731e2541354cc89f25dee219 Author: Andreas Schneider <a...@samba.org> Date: Wed Sep 5 20:46:05 2012 +0200 docs: Remove old ldb manpages. The ldb manpages can be found in lib/ldb/man/. commit f0da7c509c3bd51cd07919b22a83b14fb65b2eb7 Author: Andreas Schneider <a...@samba.org> Date: Thu Sep 6 12:14:46 2012 +0200 waf: Create catalog file for manpage generation. commit 802708b410b6367c01d968565f3f5e3a8751522d Author: Andreas Schneider <a...@samba.org> Date: Thu Sep 6 12:14:34 2012 +0200 wafsamba: Add a CONFIGURE_FILE option. commit 18eb505b895efae8b723ff3ecddc7c528c34b391 Author: Andreas Schneider <a...@samba.org> Date: Wed Sep 5 17:37:19 2012 +0200 wafsamba: Add support for manpages in SAMBA_MODULE. ----------------------------------------------------------------------- Summary of changes: buildtools/wafsamba/configure_file.py | 44 ++++ buildtools/wafsamba/wafsamba.py | 14 +- docs-xml/manpages/ldb.3.xml | 265 -------------------- docs-xml/manpages/ldbadd.1.xml | 108 -------- docs-xml/manpages/ldbdel.1.xml | 108 -------- docs-xml/manpages/ldbedit.1.xml | 203 --------------- docs-xml/manpages/ldbmodify.1.xml | 96 ------- docs-xml/manpages/ldbrename.1.xml | 110 -------- docs-xml/manpages/ldbsearch.1.xml | 122 --------- docs-xml/manpages/tdbbackup.8.xml | 136 ---------- docs-xml/manpages/tdbdump.8.xml | 61 ----- docs-xml/manpages/tdbtool.8.xml | 243 ------------------ docs-xml/wscript_build | 90 +++++++ .../nbt/man/{nmblookup.1.xml => nmblookup4.1.xml} | 130 +++++----- libcli/nbt/wscript_build | 2 +- .../winbindd/man}/idmap_ad.8.xml | 0 .../winbindd/man}/idmap_autorid.8.xml | 2 +- .../winbindd/man}/idmap_hash.8.xml | 0 .../winbindd/man}/idmap_ldap.8.xml | 4 +- .../winbindd/man}/idmap_nss.8.xml | 0 .../winbindd/man}/idmap_rid.8.xml | 0 .../winbindd/man}/idmap_tdb.8.xml | 0 .../winbindd/man}/idmap_tdb2.8.xml | 0 wscript_build | 5 + 24 files changed, 220 insertions(+), 1523 deletions(-) create mode 100644 buildtools/wafsamba/configure_file.py delete mode 100644 docs-xml/manpages/ldb.3.xml delete mode 100644 docs-xml/manpages/ldbadd.1.xml delete mode 100644 docs-xml/manpages/ldbdel.1.xml delete mode 100644 docs-xml/manpages/ldbedit.1.xml delete mode 100644 docs-xml/manpages/ldbmodify.1.xml delete mode 100644 docs-xml/manpages/ldbrename.1.xml delete mode 100644 docs-xml/manpages/ldbsearch.1.xml delete mode 100644 docs-xml/manpages/tdbbackup.8.xml delete mode 100644 docs-xml/manpages/tdbdump.8.xml delete mode 100644 docs-xml/manpages/tdbtool.8.xml create mode 100644 docs-xml/wscript_build rename libcli/nbt/man/{nmblookup.1.xml => nmblookup4.1.xml} (66%) rename {docs-xml/manpages => source3/winbindd/man}/idmap_ad.8.xml (100%) rename {docs-xml/manpages => source3/winbindd/man}/idmap_autorid.8.xml (98%) rename {docs-xml/manpages => source3/winbindd/man}/idmap_hash.8.xml (100%) rename {docs-xml/manpages => source3/winbindd/man}/idmap_ldap.8.xml (99%) rename {docs-xml/manpages => source3/winbindd/man}/idmap_nss.8.xml (100%) rename {docs-xml/manpages => source3/winbindd/man}/idmap_rid.8.xml (100%) rename {docs-xml/manpages => source3/winbindd/man}/idmap_tdb.8.xml (100%) rename {docs-xml/manpages => source3/winbindd/man}/idmap_tdb2.8.xml (100%) Changeset truncated at 500 lines: diff --git a/buildtools/wafsamba/configure_file.py b/buildtools/wafsamba/configure_file.py new file mode 100644 index 0000000..8e2ba3b --- /dev/null +++ b/buildtools/wafsamba/configure_file.py @@ -0,0 +1,44 @@ +# handle substitution of variables in .in files + +import Build, sys, Logs +from samba_utils import * + +def subst_at_vars(task): + '''substiture @VAR@ style variables in a file''' + + env = task.env + src = task.inputs[0].srcpath(env) + tgt = task.outputs[0].bldpath(env) + + f = open(src, 'r') + s = f.read() + f.close() + # split on the vars + a = re.split('(@\w+@)', s) + out = [] + for v in a: + if re.match('@\w+@', v): + vname = v[1:-1] + if not vname in task.env and vname.upper() in task.env: + vname = vname.upper() + if not vname in task.env: + Logs.error("Unknown substitution %s in %s" % (v, task.name)) + sys.exit(1) + v = SUBST_VARS_RECURSIVE(task.env[vname], task.env) + out.append(v) + contents = ''.join(out) + f = open(tgt, 'w') + s = f.write(contents) + f.close() + return 0 + +def CONFIGURE_FILE(bld, in_file, **kwargs): + '''configure file''' + + base=os.path.basename(in_file) + t = bld.SAMBA_GENERATOR('INFILE_%s' % base, + rule = subst_at_vars, + source = in_file + '.in', + target = in_file, + vars = kwargs) +Build.BuildContext.CONFIGURE_FILE = CONFIGURE_FILE diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py index f1e7aff..50c3f36 100644 --- a/buildtools/wafsamba/wafsamba.py +++ b/buildtools/wafsamba/wafsamba.py @@ -31,6 +31,7 @@ import samba_wildcard import stale_files import symbols import pkgconfig +import configure_file # some systems have broken threading in python if os.environ.get('WAF_NOTHREADS') == '1': @@ -404,6 +405,7 @@ def SAMBA_MODULE(bld, modname, source, subdir=None, enabled=True, pyembed=False, + manpages=None, allow_undefined_symbols=False ): '''define a Samba module.''' @@ -469,6 +471,7 @@ def SAMBA_MODULE(bld, modname, source, link_name=build_link_name, install_path="${MODULESDIR}/%s" % subsystem, pyembed=pyembed, + manpages=manpages, allow_undefined_symbols=allow_undefined_symbols ) @@ -577,6 +580,12 @@ def SAMBA_GENERATOR(bld, name, rule, source='', target='', if not enabled: return + dep_vars = [] + if isinstance(vars, dict): + dep_vars = vars.keys() + elif isinstance(vars, list): + dep_vars = vars + bld.SET_BUILD_GROUP(group) t = bld( rule=rule, @@ -587,7 +596,7 @@ def SAMBA_GENERATOR(bld, name, rule, source='', target='', before='cc', ext_out='.c', samba_type='GENERATOR', - dep_vars = [rule] + (vars or []), + dep_vars = [rule] + dep_vars, name=name) if always: @@ -765,13 +774,14 @@ Build.BuildContext.INSTALL_DIRS = INSTALL_DIRS def MANPAGES(bld, manpages): '''build and install manual pages''' bld.env.MAN_XSL = 'http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl' + os.environ["XML_CATALOG_FILES"] = 'file:///etc/xml/catalog file://' + bld.srcnode.abspath() + '/bin/default/docs-xml/build/catalog.xml' for m in manpages.split(): source = m + '.xml' bld.SAMBA_GENERATOR(m, source=source, target=m, group='final', - rule='${XSLTPROC} -o ${TGT} --nonet ${MAN_XSL} ${SRC}' + rule='${XSLTPROC} --xinclude -o ${TGT} --nonet ${MAN_XSL} ${SRC}' ) bld.INSTALL_FILES('${MANDIR}/man%s' % m[-1], m, flat=True) Build.BuildContext.MANPAGES = MANPAGES diff --git a/docs-xml/manpages/ldb.3.xml b/docs-xml/manpages/ldb.3.xml deleted file mode 100644 index 715fd80..0000000 --- a/docs-xml/manpages/ldb.3.xml +++ /dev/null @@ -1,265 +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="ldb.3"> - -<refmeta> - <refentrytitle>ldb</refentrytitle> - <manvolnum>3</manvolnum> - <refmiscinfo class="source">Samba</refmiscinfo> - <refmiscinfo class="manual">C Library Functions</refmiscinfo> - <refmiscinfo class="version">3.6</refmiscinfo> -</refmeta> - -<refnamediv> - <refname>ldb</refname> - <refclass>The Samba Project</refclass> - <refpurpose>A light-weight database library</refpurpose> -</refnamediv> - -<refsynopsisdiv> - <synopsis>#include <ldb.h></synopsis> -</refsynopsisdiv> - -<refsect1> - <title>description</title> - - <para> -ldb is a light weight embedded database library and API. With a -programming interface that is very similar to LDAP, ldb can store its -data either in a tdb(3) database or in a real LDAP database. - </para> - - <para> -When used with the tdb backend ldb does not require any database -daemon. Instead, ldb function calls are processed immediately by the -ldb library, which does IO directly on the database, while allowing -multiple readers/writers using operating system byte range locks. This -leads to an API with very low overheads, often resulting in speeds of -more than 10x what can be achieved with a more traditional LDAP -architecture. - </para> - - <para> -In a taxonomy of databases ldb would sit half way between key/value -pair databases (such as berkley db or tdb) and a full LDAP -database. With a structured attribute oriented API like LDAP and good -indexing capabilities, ldb can be used for quite sophisticated -applications that need a light weight database, without the -administrative overhead of a full LDAP installation. - </para> - - <para> -Included with ldb are a number of useful command line tools for -manipulating a ldb database. These tools are similar in style to the -equivalent ldap command line tools. - </para> - - <para> -In its default mode of operation with a tdb backend, ldb can also be -seen as a "schema-less LDAP". By default ldb does not require a -schema, which greatly reduces the complexity of getting started with -ldb databases. As the complexity of you application grows you can take -advantage of some of the optional schema-like attributes that ldb -offers, or you can migrate to using the full LDAP api while keeping -your exiting ldb code. - </para> - - <para> -If you are new to ldb, then I suggest starting with the manual pages -for ldbsearch(1) and ldbedit(1), and experimenting with a local -database. Then I suggest you look at the ldb_connect(3) and -ldb_search(3) manual pages. - </para> -</refsect1> - -<refsect1> - <title>TOOLS</title> - - <itemizedlist> - <listitem><para> - <application>ldbsearch(1)</application> - - command line ldb search utility - </para></listitem> - - <listitem><para> - <application>ldbedit(1)</application> - - edit all or part of a ldb database using your favourite editor - </para></listitem> - - <listitem><para> - <application>ldbadd(1)</application> - - add records to a ldb database using LDIF formatted input - </para></listitem> - - <listitem><para> - <application>ldbdel(1)</application> - - delete records from a ldb database - </para></listitem> - - <listitem><para> - <application>ldbmodify(1)</application> - - modify records in a ldb database using LDIF formatted input - </para></listitem> - </itemizedlist> -</refsect1> - -<refsect1> - <title>FUNCTIONS</title> - - <itemizedlist> - <listitem><para> - <function>ldb_connect(3)</function> - - connect to a ldb backend - </para></listitem> - - <listitem><para> - <function>ldb_search(3)</function> - - perform a database search - </para></listitem> - - <listitem><para> - <function>ldb_add(3)</function> - - add a record to the database - </para></listitem> - - <listitem><para> - <function>ldb_delete(3)</function> - - delete a record from the database - </para></listitem> - - <listitem><para> - <function>ldb_modify(3)</function> - - modify a record in the database - </para></listitem> - - <listitem><para> - <function>ldb_errstring(3)</function> - - retrieve extended error information from the last operation - </para></listitem> - - <listitem><para> - <function>ldb_ldif_write(3)</function> - - write a LDIF formatted message - </para></listitem> - - <listitem><para> - <function>ldb_ldif_write_file(3)</function> - - write a LDIF formatted message to a file - </para></listitem> - - <listitem><para> - <function>ldb_ldif_read(3)</function> - - read a LDIF formatted message - </para></listitem> - - <listitem><para> - <function>ldb_ldif_read_free(3)</function> - - free the result of a ldb_ldif_read() - </para></listitem> - - <listitem><para> - <function>ldb_ldif_read_file(3)</function> - - read a LDIF message from a file - </para></listitem> - - <listitem><para> - <function>ldb_ldif_read_string(3)</function> - - read a LDIF message from a string - </para></listitem> - - <listitem><para> - <function>ldb_msg_find_element(3)</function> - - find an element in a ldb_message - </para></listitem> - - <listitem><para> - <function>ldb_val_equal_exact(3)</function> - - compare two ldb_val structures - </para></listitem> - - <listitem><para> - <function>ldb_msg_find_val(3)</function> - - find an element by value - </para></listitem> - - <listitem><para> - <function>ldb_msg_add_empty(3)</function> - - add an empty message element to a ldb_message - </para></listitem> - - - <listitem><para> - <function>ldb_msg_add(3)</function> - - add a non-empty message element to a ldb_message - </para></listitem> - - - <listitem><para> - <function>ldb_msg_element_compare(3)</function> - - compare two ldb_message_element structures - </para></listitem> - - - <listitem><para> - <function>ldb_msg_find_int(3)</function> - - return an integer value from a ldb_message - </para></listitem> - - - <listitem><para> - <function>ldb_msg_find_uint(3)</function> - - return an unsigned integer value from a ldb_message - </para></listitem> - - - <listitem><para> - <function>ldb_msg_find_double(3)</function> - - return a double value from a ldb_message - </para></listitem> - - - <listitem><para> - <function>ldb_msg_find_string(3)</function> - - return a string value from a ldb_message - </para></listitem> - - - <listitem><para> - <function>ldb_set_alloc(3)</function> - - set the memory allocation function to be used by ldb - </para></listitem> - - - <listitem><para> - <function>ldb_set_debug(3)</function> - - set a debug handler to be used by ldb - </para></listitem> - - - <listitem><para> - <function>ldb_set_debug_stderr(3)</function> - - set a debug handler for stderr output - </para></listitem> - </itemizedlist> -</refsect1> - -<refsect1> - <title>Author</title> - - <para> - ldb was written by - <ulink url="http://samba.org/~tridge/">Andrew Tridgell</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> - - <para> -ldb is released under the GNU Lesser General Public License version 2 -or later. Please see the file COPYING for license details. - </para> -</refsect1> -</refentry> diff --git a/docs-xml/manpages/ldbadd.1.xml b/docs-xml/manpages/ldbadd.1.xml deleted file mode 100644 index b0c25e7..0000000 --- a/docs-xml/manpages/ldbadd.1.xml +++ /dev/null @@ -1,108 +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="ldbadd.1"> - -<refmeta> - <refentrytitle>ldbadd</refentrytitle> - <manvolnum>1</manvolnum> - <refmiscinfo class="source">Samba</refmiscinfo> - <refmiscinfo class="manual">User Commands</refmiscinfo> - <refmiscinfo class="version">3.6</refmiscinfo> -</refmeta> - - -<refnamediv> - <refname>ldbadd</refname> - <refpurpose>Command-line utility for adding records to an LDB</refpurpose> -</refnamediv> - -<refsynopsisdiv> - <cmdsynopsis> - <command>ldbadd</command> - <arg choice="opt">-h</arg> - <arg choice="opt">-H LDB-URL</arg> - <arg choice="opt">ldif-file1</arg> - <arg choice="opt">ldif-file2</arg> - <arg choice="opt">...</arg> - </cmdsynopsis> -</refsynopsisdiv> - -<refsect1> - <title>DESCRIPTION</title> - - <para>ldbadd adds records to an ldb(7) database. It reads - the ldif(5) files specified on the command line and adds - the records from these files to the LDB database, which is specified - by the -H option or the LDB_URL environment variable. - </para> - - <para>If - is specified as a ldb file, the ldif input is read from - standard input.</para> - -</refsect1> - - -<refsect1> - <title>OPTIONS</title> - - <variablelist> - <varlistentry> - <term>-h</term> - <listitem><para> - Show list of available options.</para></listitem> - </varlistentry> - - <varlistentry> - <term>-H <ldb-url></term> - <listitem><para> - LDB URL to connect to. See ldb(7) for details. - </para></listitem> - </varlistentry> - - </variablelist> - -</refsect1> - -<refsect1> - <title>ENVIRONMENT</title> - - <variablelist> - <varlistentry><term>LDB_URL</term> - <listitem><para>LDB URL to connect to (can be overridden by using the - -H command-line option.)</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>. - </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> - - <para>This manpage was written by Jelmer Vernooij.</para> - -</refsect1> - -- Samba Shared Repository