[SCM] Samba Shared Repository - branch master updated
Jelmer Vernooij
jelmer at samba.org
Mon May 31 05:59:27 MDT 2010
The branch, master has been updated
via 8c01702... talloc: Don't set is_bundled for standalone build.
via 151e239... ldb/waf: Fix build with system and bundled ldb.
via f89e390... waf: Refactor manpage building code.
via f98bb7f... Add manpages argument to SAMBA_LIBRARY().
from cc77e79... s4-waf: Fixed the ldb build.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 8c017022dbb78966589fa98e03dea01d91d003b0
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Mon May 31 13:55:17 2010 +0200
talloc: Don't set is_bundled for standalone build.
commit 151e239bcf2860411527a953d627b2d724c0a57e
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Mon May 31 13:51:49 2010 +0200
ldb/waf: Fix build with system and bundled ldb.
commit f89e390fbc6e4f3d8269c40ccab7c718bfcd394f
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Mon May 31 12:17:33 2010 +0200
waf: Refactor manpage building code.
commit f98bb7ffc33bf161caf301c50c55c8e3cc858b85
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Mon May 31 12:08:01 2010 +0200
Add manpages argument to SAMBA_LIBRARY().
-----------------------------------------------------------------------
Summary of changes:
buildtools/wafsamba/wafsamba.py | 30 ++++++++++++++++++---------
lib/talloc/wscript | 23 ++++----------------
source4/lib/ldb/ABI/ldb-samba4-0.9.11.sigs | 5 ----
source4/lib/ldb/wscript | 26 +++++++----------------
4 files changed, 33 insertions(+), 51 deletions(-)
Changeset truncated at 500 lines:
diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
index 41b866d..01e2ce8 100644
--- a/buildtools/wafsamba/wafsamba.py
+++ b/buildtools/wafsamba/wafsamba.py
@@ -116,6 +116,7 @@ def SAMBA_LIBRARY(bld, libname, source,
abi_match=None,
hide_symbols=False,
is_bundled=False,
+ manpages=None,
enabled=True):
'''define a Samba library'''
@@ -196,7 +197,7 @@ def SAMBA_LIBRARY(bld, libname, source,
vnum = vnum,
install_path = None,
samba_inst_path = install_path,
- name = libname,
+ name = libname,
samba_realname = realname,
samba_install = install,
abi_file = abi_file,
@@ -212,6 +213,10 @@ def SAMBA_LIBRARY(bld, libname, source,
if pc_files is not None:
bld.PKG_CONFIG_FILES(pc_files, vnum=vnum)
+ if manpages is not None and 'XSLTPROC' in bld.env:
+ bld.MANPAGES(manpages)
+
+
Build.BuildContext.SAMBA_LIBRARY = SAMBA_LIBRARY
@@ -300,15 +305,7 @@ def SAMBA_BINARY(bld, binname, source,
bld.TARGET_ALIAS(subsystem_name, binname)
if manpages is not None and 'XSLTPROC' in bld.env:
- 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)
+ bld.MANPAGES(manpages)
Build.BuildContext.SAMBA_BINARY = SAMBA_BINARY
@@ -813,6 +810,19 @@ def PKG_CONFIG_FILES(bld, pc_files, vnum=None):
Build.BuildContext.PKG_CONFIG_FILES = PKG_CONFIG_FILES
+def MANPAGES(bld, manpages):
+ '''build and install manual pages'''
+ 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.MANPAGES = MANPAGES
+
#############################################################
# give a nicer display when building different types of files
diff --git a/lib/talloc/wscript b/lib/talloc/wscript
index 61930f6..be80b27 100644
--- a/lib/talloc/wscript
+++ b/lib/talloc/wscript
@@ -60,14 +60,17 @@ def build(bld):
abi_file='ABI/talloc-%s.sigs' % VERSION,
abi_match='talloc* _talloc*',
hide_symbols=True,
- vnum=VERSION, is_bundled=True)
+ vnum=VERSION,
+ is_bundled=not bld.env.standalone_talloc,
+ manpages='talloc.3')
# should we also install the symlink to libtalloc1.so here?
bld.SAMBA_LIBRARY('talloc-compat1',
'compat/talloc_compat1.c',
deps='talloc',
enabled = bld.env.TALLOC_COMPAT1,
- vnum=VERSION, is_bundled=True)
+ vnum=VERSION,
+ is_bundled=not bld.env.standalone_talloc)
if not getattr(bld.env, '_SAMBA_BUILD_', 0) == 4:
# s4 already has the talloc testsuite builtin to smbtorture
@@ -82,22 +85,6 @@ def build(bld):
bld.PKG_CONFIG_FILES('talloc.pc', vnum=VERSION)
bld.INSTALL_FILES('${INCLUDEDIR}', 'talloc.h')
- if bld.env.XSLTPROC:
- bld.env.TALLOC_MAN_XSL = 'http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl'
- bld.env.TALLOC_WEB_XSL = 'http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl'
- bld.SAMBA_GENERATOR('talloc.3',
- source='talloc.3.xml',
- target='talloc.3',
- rule='${XSLTPROC} -o ${TGT} ${TALLOC_MAN_XSL} ${SRC}'
- )
- bld.SAMBA_GENERATOR('talloc.3.html',
- source='talloc.3.xml',
- target='talloc.3.html',
- rule='${XSLTPROC} -o ${TGT} ${TALLOC_WEB_XSL} ${SRC}'
- )
- bld.INSTALL_FILES('${MANDIR}/man3', 'talloc.3')
-
-
def test(ctx):
'''run talloc testsuite'''
import Utils
diff --git a/source4/lib/ldb/ABI/ldb-samba4-0.9.11.sigs b/source4/lib/ldb/ABI/ldb-samba4-0.9.11.sigs
index 4639220..2206e79 100644
--- a/source4/lib/ldb/ABI/ldb-samba4-0.9.11.sigs
+++ b/source4/lib/ldb/ABI/ldb-samba4-0.9.11.sigs
@@ -166,7 +166,6 @@ ldb_parse_tree_copy_shallow: struct ldb_parse_tree *(TALLOC_CTX *, const struct
ldb_qsort: void (void * const, size_t, size_t, void *, ldb_qsort_cmp_fn_t)
ldb_register_backend: int (const char *, ldb_connect_fn)
ldb_register_module: int (const struct ldb_module_ops *)
-ldb_register_samba_handlers: int (struct ldb_context *)
ldb_rename: int (struct ldb_context *, struct ldb_dn *, struct ldb_dn *)
ldb_reply_add_control: int (struct ldb_reply *, const char *, bool, void *)
ldb_reply_get_control: struct ldb_control *(struct ldb_reply *, const char *)
@@ -177,8 +176,6 @@ ldb_request_get_control: struct ldb_control *(struct ldb_request *, const char *
ldb_request_get_status: int (struct ldb_request *)
ldb_request_set_state: void (struct ldb_request *, int)
ldb_reset_err_string: void (struct ldb_context *)
-ldb_samba_syntax_by_lDAPDisplayName: const struct ldb_schema_syntax *(struct ldb_context *, const char *)
-ldb_samba_syntax_by_name: const struct ldb_schema_syntax *(struct ldb_context *, const char *)
ldb_schema_attribute_add: int (struct ldb_context *, const char *, unsigned int, const char *)
ldb_schema_attribute_add_with_syntax: int (struct ldb_context *, const char *, unsigned int, const struct ldb_schema_syntax *)
ldb_schema_attribute_by_name: const struct ldb_schema_attribute *(struct ldb_context *, const char *)
@@ -220,5 +217,3 @@ ldb_val_map_remote: struct ldb_val (struct ldb_module *, void *, const struct ld
ldb_val_to_time: int (const struct ldb_val *, time_t *)
ldb_valid_attr_name: int (const char *)
ldb_wait: int (struct ldb_handle *, enum ldb_wait_type)
-ldb_wrap_connect: struct ldb_context *(TALLOC_CTX *, struct tevent_context *, struct loadparm_context *, const char *, struct auth_session_info *, struct cli_credentials *, unsigned int)
-ldb_wrap_fork_hook: void (void)
diff --git a/source4/lib/ldb/wscript b/source4/lib/ldb/wscript
index 15740d6..2d54b61 100644
--- a/source4/lib/ldb/wscript
+++ b/source4/lib/ldb/wscript
@@ -163,12 +163,14 @@ def build(bld):
COMMON_SRC + ' ' + LDB_MAP_SRC,
deps=ldb_deps,
includes='include',
- public_headers='include/ldb.h include/ldb_errors.h',
+ public_headers='include/ldb.h include/ldb_errors.h '\
+ 'include/ldb_module.h',
pc_files='ldb.pc',
cflags='-DLDB_MODULESDIR=\"%s\"' % modules_dir,
abi_file=abi_file,
abi_match='!ldb_*module_ops !ldb_*backend_ops ldb_*',
- vnum=VERSION)
+ vnum=VERSION, manpages='man/ldb.3',
+ is_bundled=not bld.env.standalone_ldb)
bld.SAMBA_SUBSYSTEM('LIBLDB_CMDLINE',
'tools/ldbutil.c tools/cmdline.c',
@@ -176,29 +178,17 @@ 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', manpages='man/%s.1' % t)
+ 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)
+ bld.SAMBA_BINARY('ldbtest', 'tools/ldbtest.c', deps='LIBLDB_CMDLINE',
+ install=False)
bld.SAMBA_PYTHON('pyldb', 'pyldb.c',
deps='ldb',
realname='ldb.so')
- if bld.env.XSLTPROC:
- manpages = 'man/ldb.3'
-
- bld.env.LDB_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} ${LDB_MAN_XSL} ${SRC}'
- )
- bld.INSTALL_FILES('${MANDIR}/man%s' % m[-1], m, flat=True)
-
def test(ctx):
'''run ldb testsuite'''
--
Samba Shared Repository
More information about the samba-cvs
mailing list