[SCM] Samba Shared Repository - branch master updated
Andrew Tridgell
tridge at samba.org
Sun Apr 25 22:38:47 MDT 2010
The branch, master has been updated
via 0a47bf5... build: automatically run autogen-waf.sh when needed
via b039680... s4-heimdalbuild: remove LIBNETIF dependency from HEIMDAL_GSSAPI
via c6b8ffd... build: normalise paths in unique source checking
via a241daa... build: a library is only empty if it has no deps
via c8824fd... build: use option_group() not add_option_group()
via 6c79b9f... build: cope with duplicates in source lists
from fd3eeb3... s3: async_domain_request is no longer used
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 0a47bf5f15c8fc083125a90cf73ad1a04dc61e48
Author: Andrew Tridgell <tridge at samba.org>
Date: Mon Apr 26 13:24:10 2010 +1000
build: automatically run autogen-waf.sh when needed
commit b0396807d0b357d238ef211275d25cb1852e7fdf
Author: Andrew Tridgell <tridge at samba.org>
Date: Mon Apr 26 11:12:05 2010 +1000
s4-heimdalbuild: remove LIBNETIF dependency from HEIMDAL_GSSAPI
this avoids the s3compat layer from getting duplicate interfaces code
commit c6b8ffd3a507854c0a9379f83c37fa63de4816ef
Author: Andrew Tridgell <tridge at samba.org>
Date: Mon Apr 26 11:11:21 2010 +1000
build: normalise paths in unique source checking
commit a241daae2d2c2acf150993dc90e234a851539963
Author: Andrew Tridgell <tridge at samba.org>
Date: Sun Apr 25 21:00:44 2010 +1000
build: a library is only empty if it has no deps
commit c8824fd9b4cfd5a5925671ce41063764f27d50e8
Author: Andrew Tridgell <tridge at samba.org>
Date: Sun Apr 25 12:58:52 2010 +1000
build: use option_group() not add_option_group()
option_group() ensures we don't end up with duplicate groups
commit 6c79b9f4807f932ad9d09ebfa708d7a75fa35f45
Author: Andrew Tridgell <tridge at samba.org>
Date: Sun Apr 25 12:41:41 2010 +1000
build: cope with duplicates in source lists
-----------------------------------------------------------------------
Summary of changes:
buildtools/scripts/Makefile.waf | 6 ++----
buildtools/wafsamba/samba_deps.py | 2 +-
buildtools/wafsamba/wafsamba.py | 13 ++++++++-----
buildtools/wafsamba/wscript | 2 +-
source4/heimdal_build/wscript_build | 2 +-
5 files changed, 13 insertions(+), 12 deletions(-)
Changeset truncated at 500 lines:
diff --git a/buildtools/scripts/Makefile.waf b/buildtools/scripts/Makefile.waf
index a517bae..e40b635 100644
--- a/buildtools/scripts/Makefile.waf
+++ b/buildtools/scripts/Makefile.waf
@@ -45,9 +45,7 @@ ctags:
$(WAF) ctags
configure: autogen-waf.sh BUILDTOOLS/scripts/configure.waf
- @echo "please run ./autogen-waf.sh to regenerate $@"
- @-false
+ ./autogen-waf.sh
Makefile: autogen-waf.sh configure BUILDTOOLS/scripts/Makefile.waf
- @echo "please run ./autogen-waf.sh to regenerate $@"
- @false
+ ./autogen-waf.sh
diff --git a/buildtools/wafsamba/samba_deps.py b/buildtools/wafsamba/samba_deps.py
index eb66e44..e0c76e4 100644
--- a/buildtools/wafsamba/samba_deps.py
+++ b/buildtools/wafsamba/samba_deps.py
@@ -240,7 +240,7 @@ def check_duplicate_sources(bld, tgt_list):
for t in tgt_list:
obj_sources = getattr(t, 'source', '')
- tpath = os_path_relpath(t.path.abspath(bld.env), t.env.BUILD_DIRECTORY + '/default')
+ tpath = os.path.normpath(os_path_relpath(t.path.abspath(bld.env), t.env.BUILD_DIRECTORY + '/default'))
obj_sources = bld.SUBDIR(tpath, obj_sources)
t.samba_source_set = set(TO_LIST(obj_sources))
diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
index 95410aa..36f8777 100644
--- a/buildtools/wafsamba/wafsamba.py
+++ b/buildtools/wafsamba/wafsamba.py
@@ -123,7 +123,7 @@ def SAMBA_LIBRARY(bld, libname, source,
source = bld.EXPAND_VARIABLES(source, vars=vars)
# remember empty libraries, so we can strip the dependencies
- if (source == '') or (source == []):
+ if ((source == '') or (source == [])) and deps == '' and public_deps == '':
SET_TARGET_TYPE(bld, libname, 'EMPTY')
return
@@ -239,6 +239,7 @@ def SAMBA_BINARY(bld, binname, source,
obj_target = binname + '.objlist'
source = bld.EXPAND_VARIABLES(source, vars=vars)
+ source = unique_list(TO_LIST(source))
# first create a target for building the object files for this binary
# by separating in this way, we avoid recompiling the C files
@@ -325,9 +326,10 @@ def SAMBA_MODULE(bld, modname, source,
return
source = bld.EXPAND_VARIABLES(source, vars=vars)
+ source = unique_list(TO_LIST(source))
# remember empty modules, so we can strip the dependencies
- if (source == '') or (source == []):
+ if ((source == '') or (source == [])) and deps == '' and public_deps == '':
SET_TARGET_TYPE(bld, modname, 'EMPTY')
return
@@ -349,7 +351,7 @@ def SAMBA_MODULE(bld, modname, source,
)
if autoproto is not None:
- bld.SAMBA_AUTOPROTO(autoproto, source + ' ' + autoproto_extra_source)
+ bld.SAMBA_AUTOPROTO(autoproto, source + TO_LIST(autoproto_extra_source))
Build.BuildContext.SAMBA_MODULE = SAMBA_MODULE
@@ -387,7 +389,7 @@ def SAMBA_SUBSYSTEM(bld, modname, source,
return
# remember empty subsystems, so we can strip the dependencies
- if (source == '') or (source == []):
+ if ((source == '') or (source == [])) and deps == '' and public_deps == '':
SET_TARGET_TYPE(bld, modname, 'EMPTY')
return
@@ -395,6 +397,7 @@ def SAMBA_SUBSYSTEM(bld, modname, source,
return
source = bld.EXPAND_VARIABLES(source, vars=vars)
+ source = unique_list(TO_LIST(source))
deps += ' ' + public_deps
@@ -427,7 +430,7 @@ def SAMBA_SUBSYSTEM(bld, modname, source,
if heimdal_autoproto_private is not None:
bld.HEIMDAL_AUTOPROTO_PRIVATE(heimdal_autoproto_private, source)
if autoproto is not None:
- bld.SAMBA_AUTOPROTO(autoproto, source + ' ' + autoproto_extra_source)
+ bld.SAMBA_AUTOPROTO(autoproto, source + TO_LIST(autoproto_extra_source))
if public_headers is not None:
bld.PUBLIC_HEADERS(public_headers, header_path=header_path)
return t
diff --git a/buildtools/wafsamba/wscript b/buildtools/wafsamba/wscript
index 54802a7..0413bb4 100644
--- a/buildtools/wafsamba/wscript
+++ b/buildtools/wafsamba/wscript
@@ -21,7 +21,7 @@ def set_options(opt):
opt.tool_options('gnu_dirs')
- gr = opt.add_option_group('library handling options')
+ gr = opt.option_group('library handling options')
gr.add_option('--bundled-libraries',
help=("comma separated list of bundled libraries. May include !LIBNAME to disable bundling a library. Can be 'NONE' or 'ALL' [auto]"),
diff --git a/source4/heimdal_build/wscript_build b/source4/heimdal_build/wscript_build
index 1bf1ff5..cf80437 100644
--- a/source4/heimdal_build/wscript_build
+++ b/source4/heimdal_build/wscript_build
@@ -359,7 +359,7 @@ bld.SAMBA_SUBSYSTEM('HEIMDAL_KRB5',
heimdal_autoproto='../heimdal/lib/krb5/krb5-protos.h',
heimdal_autoproto_options='-E KRB5_LIB -q -P comment -o',
heimdal_autoproto_private='../heimdal/lib/krb5/krb5-private.h',
- deps='HEIMDAL_ROKEN HEIMDAL_PKINIT_ASN1 HEIMDAL_WIND HEIMDAL_KRB5_ASN1 HEIMDAL_HX509 HEIMDAL_HCRYPTO LIBNETIF LIBSAMBA-HOSTCONFIG intl'
+ deps='HEIMDAL_ROKEN HEIMDAL_PKINIT_ASN1 HEIMDAL_WIND HEIMDAL_KRB5_ASN1 HEIMDAL_HX509 HEIMDAL_HCRYPTO LIBSAMBA-HOSTCONFIG intl'
)
--
Samba Shared Repository
More information about the samba-cvs
mailing list