[SCM] Samba Shared Repository - branch master updated
Michael Adam
obnox at samba.org
Mon Sep 23 10:12:03 CEST 2013
The branch, master has been updated
via abb47b6 build: fix spacing in the definition of the "idmap_autorid" target
via 44472c7 build: remove vars=locals() from the nss_info library: there is no need for this
via 7025f5b build: remove vars=locals() from the IDMAP_HASH subsystem: there is no need for this
via 1eef6bd build: clean the idmap sybsystems/modules definitions
via ee71610 build: remove vars=locals() from the IDMAP_AD subsystem: there is no need for this
via c442305 build: reorganize idmap_rw and idmap_tdb int subsystems with proper dependencies
from a3f25f2 selftst: add tests based on 4.1.0rc3 to check for zero invocationID in replPropertyMetaData
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit abb47b6ef8ab8cfadd00c8b10c0d975833981dd3
Author: Michael Adam <obnox at samba.org>
Date: Sun Sep 22 21:11:40 2013 +0200
build: fix spacing in the definition of the "idmap_autorid" target
Signed-off-by: Michael Adam <obnox at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Autobuild-User(master): Michael Adam <obnox at samba.org>
Autobuild-Date(master): Mon Sep 23 10:11:51 CEST 2013 on sn-devel-104
commit 44472c7eae74c295b985630343492e4dbd458f3d
Author: Michael Adam <obnox at samba.org>
Date: Sun Sep 22 23:21:01 2013 +0200
build: remove vars=locals() from the nss_info library: there is no need for this
Might have been a copy'n'paste.
Signed-off-by: Michael Adam <obnox at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 7025f5b4b505b50e77be184cf5979ab2c04cf76b
Author: Michael Adam <obnox at samba.org>
Date: Sun Sep 22 23:20:12 2013 +0200
build: remove vars=locals() from the IDMAP_HASH subsystem: there is no need for this
Might have been a copy'n'paste.
Signed-off-by: Michael Adam <obnox at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 1eef6bd72c14df59dfb5c62220ecc05366a7a65e
Author: Michael Adam <obnox at samba.org>
Date: Sun Sep 22 23:03:10 2013 +0200
build: clean the idmap sybsystems/modules definitions
Directly list the sources in the definitions of subsystems/modules/libraries
Signed-off-by: Michael Adam <obnox at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit ee71610ab36c51ad62c80b7537cce64f5b044362
Author: Michael Adam <obnox at samba.org>
Date: Sun Sep 22 22:51:48 2013 +0200
build: remove vars=locals() from the IDMAP_AD subsystem: there is no need for this
Might have been a copy'n'paste.
Signed-off-by: Michael Adam <obnox at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit c442305d4f1c8a33098998da4971063a70c5de2d
Author: Michael Adam <obnox at samba.org>
Date: Sun Sep 22 22:49:22 2013 +0200
build: reorganize idmap_rw and idmap_tdb int subsystems with proper dependencies
Signed-off-by: Michael Adam <obnox at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
-----------------------------------------------------------------------
Summary of changes:
source3/winbindd/wscript_build | 71 +++++++++++++++------------------------
1 files changed, 27 insertions(+), 44 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/winbindd/wscript_build b/source3/winbindd/wscript_build
index aacd859..1c957e5 100644
--- a/source3/winbindd/wscript_build
+++ b/source3/winbindd/wscript_build
@@ -1,38 +1,26 @@
#!/usr/bin/env python
-IDMAP_AD_SRC = '''idmap_ad.c'''
-IDMAP_RFC2307_SRC = '''idmap_rfc2307.c'''
-IDMAP_RID_SRC = '''idmap_rid.c'''
-IDMAP_PASSDB_SRC = '''idmap_passdb.c'''
-IDMAP_LDAP_SRC = '''idmap_ldap.c'''
-IDMAP_NSS_SRC = '''idmap_nss.c'''
-IDMAP_TDB_SRC = '''idmap_tdb.c'''
-IDMAP_TDB2_SRC = '''idmap_tdb2.c'''
-
-IDMAP_HASH_SRC = '''idmap_hash/idmap_hash.c
- idmap_hash/mapfile.c'''
-
-IDMAP_AUTORID_SRC = '''idmap_autorid.c'''
-
-IDMAP_RW_SRC = 'idmap_rw.c'
-IDMAP_SRC = 'idmap.c idmap_util.c idmap_tdb_common.c ${IDMAP_RW_SRC}'
-
bld.SAMBA3_LIBRARY('idmap',
- source=IDMAP_SRC,
+ source='idmap.c idmap_util.c',
deps='samba-util',
- vars=locals(),
allow_undefined_symbols=True,
private_library=True)
+bld.SAMBA3_SUBSYSTEM('IDMAP_RW',
+ source='idmap_rw.c',
+ deps='samba-util')
+
+bld.SAMBA3_SUBSYSTEM('IDMAP_TDB_COMMON',
+ source='idmap_tdb_common.c',
+ deps='tdb IDMAP_RW')
+
bld.SAMBA3_SUBSYSTEM('IDMAP_HASH',
- source=IDMAP_HASH_SRC,
- deps='samba-util krb5samba',
- vars=locals())
+ source='idmap_hash/idmap_hash.c idmap_hash/mapfile.c',
+ deps='samba-util krb5samba')
bld.SAMBA3_SUBSYSTEM('IDMAP_AD',
- source=IDMAP_AD_SRC,
+ source='idmap_ad.c',
deps='ads nss_info',
- vars=locals(),
enabled=bld.CONFIG_SET("HAVE_LDAP"))
bld.SAMBA3_MODULE('idmap_ad',
@@ -47,7 +35,7 @@ bld.SAMBA3_MODULE('idmap_ad',
bld.SAMBA3_MODULE('idmap_rfc2307',
subsystem='idmap',
allow_undefined_symbols=True,
- source=IDMAP_RFC2307_SRC,
+ source='idmap_rfc2307.c',
init_function='',
deps='ads',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('idmap_rfc2307'),
@@ -56,14 +44,14 @@ bld.SAMBA3_MODULE('idmap_rfc2307',
bld.SAMBA3_MODULE('idmap_rid',
subsystem='idmap',
allow_undefined_symbols=True,
- source=IDMAP_RID_SRC,
+ source='idmap_rid.c',
init_function='',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('idmap_rid'),
enabled=bld.SAMBA3_IS_ENABLED_MODULE('idmap_rid'))
bld.SAMBA3_MODULE('idmap_passdb',
subsystem='idmap',
- source=IDMAP_PASSDB_SRC,
+ source='idmap_passdb.c',
deps='samba-util pdb',
init_function='',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('idmap_passdb'),
@@ -71,8 +59,8 @@ bld.SAMBA3_MODULE('idmap_passdb',
bld.SAMBA3_MODULE('idmap_ldap',
subsystem='idmap',
- source=IDMAP_LDAP_SRC,
- deps='smbldap smbldaphelper pdb',
+ source='idmap_ldap.c',
+ deps='smbldap smbldaphelper pdb IDMAP_RW',
init_function='',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('idmap_ldap'),
enabled=bld.SAMBA3_IS_ENABLED_MODULE('idmap_ldap') and bld.CONFIG_SET("HAVE_LDAP"),
@@ -80,7 +68,7 @@ bld.SAMBA3_MODULE('idmap_ldap',
bld.SAMBA3_MODULE('idmap_nss',
subsystem='idmap',
- source=IDMAP_NSS_SRC,
+ source='idmap_nss.c',
deps='samba-util',
init_function='',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('idmap_nss'),
@@ -88,16 +76,16 @@ bld.SAMBA3_MODULE('idmap_nss',
bld.SAMBA3_MODULE('idmap_tdb',
subsystem='idmap',
- source=IDMAP_TDB_SRC,
- deps='samba-util tdb',
+ source='idmap_tdb.c',
+ deps='samba-util tdb IDMAP_TDB_COMMON',
init_function='',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('idmap_tdb'),
enabled=bld.SAMBA3_IS_ENABLED_MODULE('idmap_tdb'))
bld.SAMBA3_MODULE('idmap_tdb2',
subsystem='idmap',
- source=IDMAP_TDB2_SRC,
- deps='samba-util tdb',
+ source='idmap_tdb2.c',
+ deps='samba-util tdb IDMAP_TDB_COMMON',
init_function='',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('idmap_tdb2'),
enabled=bld.SAMBA3_IS_ENABLED_MODULE('idmap_tdb2'))
@@ -113,26 +101,21 @@ bld.SAMBA3_MODULE('idmap_hash',
bld.SAMBA3_MODULE('idmap_autorid',
subsystem='idmap',
- source=IDMAP_AUTORID_SRC,
- deps='samba-util tdb',
+ source='idmap_autorid.c',
+ deps='samba-util tdb IDMAP_TDB_COMMON',
init_function='',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('idmap_autorid'),
enabled=bld.SAMBA3_IS_ENABLED_MODULE('idmap_autorid'),
- allow_undefined_symbols=True)
-
-
-NSS_INFO_TEMPLATE_SRC = 'nss_info_template.c'
-NSS_INFO_SRC = 'nss_info.c'
+ allow_undefined_symbols=True)
bld.SAMBA3_LIBRARY('nss_info',
- source=NSS_INFO_SRC,
+ source='nss_info.c',
deps='samba-util param',
- vars=locals(),
private_library=True)
bld.SAMBA3_MODULE('nss_info_template',
subsystem='nss_info',
- source=NSS_INFO_TEMPLATE_SRC,
+ source='nss_info_template.c',
deps='samba-util krb5samba',
init_function='',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('nss_info_template'),
--
Samba Shared Repository
More information about the samba-cvs
mailing list