Build status as of Wed Apr 14 06:00:03 2010
URL: http://build.samba.org/ --- /home/build/master/cache/broken_results.txt.old 2010-04-13 00:00:21.0 -0600 +++ /home/build/master/cache/broken_results.txt 2010-04-14 00:00:04.0 -0600 @@ -1,9 +1,9 @@ -Build status as of Tue Apr 13 06:00:03 2010 +Build status as of Wed Apr 14 06:00:03 2010 Build counts: Tree Total Broken Panic build_farm 0 0 0 -ccache 29 12 0 +ccache 29 11 0 ldb 29 29 0 libreplace 29 10 0 lorikeet 0 0 0 @@ -14,9 +14,9 @@ samba-web0 0 0 samba_3_current 27 25 1 samba_3_master 27 27 1 -samba_3_next 27 25 3 -samba_4_0_test 29 29 1 -samba_4_0_waf 27 27 3 +samba_3_next 27 24 3 +samba_4_0_test 29 29 0 +samba_4_0_waf 27 27 5 talloc 29 10 0 tdb 27 17 0
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via bc6a43a... s4:torture/rpc/winreg: fix compiler warnings
via d018057... s4:torture/rpc/dsgetinfo: first check the rpc layer
status before looking at the application result
from 74c4c7f... Don't set requested_posix_capabilities in the sync
code, already done in the async.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit bc6a43aeb41fc5ccf3a34f2ec91e1328ae82d90e
Author: Stefan Metzmacher me...@samba.org
Date: Tue Apr 13 17:36:51 2010 +0200
s4:torture/rpc/winreg: fix compiler warnings
metze
commit d0180570b3e1d0a4aa9c7a55af9fd3b4c925ec77
Author: Stefan Metzmacher me...@samba.org
Date: Mon Apr 12 14:13:08 2010 +0200
s4:torture/rpc/dsgetinfo: first check the rpc layer status before looking
at the application result
metze
---
Summary of changes:
source4/torture/rpc/dsgetinfo.c | 21 +
source4/torture/rpc/winreg.c|6 +++---
2 files changed, 16 insertions(+), 11 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/torture/rpc/dsgetinfo.c b/source4/torture/rpc/dsgetinfo.c
index b01dd77..acf93e8 100644
--- a/source4/torture/rpc/dsgetinfo.c
+++ b/source4/torture/rpc/dsgetinfo.c
@@ -345,20 +345,25 @@ static bool test_getinfo(struct torture_context *tctx,
r.out.info_type = info_type;
status = dcerpc_drsuapi_DsReplicaGetInfo_r(b, tctx, r);
-
+ if (!NT_STATUS_IS_OK(status) p-last_fault_code ==
DCERPC_FAULT_INVALID_TAG) {
+ torture_comment(tctx,
+ DsReplicaGetInfo level %d and/or
infotype %d not supported by server\n,
+ array[i].level, array[i].infotype);
+ continue;
+ }
+ torture_assert_ntstatus_ok(tctx, status, talloc_asprintf(tctx,
+ DsReplicaGetInfo level %d and/or
infotype %d failed\n,
+ array[i].level, array[i].infotype));
if (W_ERROR_EQUAL(r.out.result, WERR_INVALID_LEVEL)) {
/* this is a not yet supported level */
torture_comment(tctx,
DsReplicaGetInfo level %d and/or
infotype %d not yet supported by server\n,
array[i].level, array[i].infotype);
invalid_levels++;
- } else if (!NT_STATUS_IS_OK(status) p-last_fault_code ==
DCERPC_FAULT_INVALID_TAG) {
- torture_comment(tctx,
- DsReplicaGetInfo level %d and/or
infotype %d not supported by server\n,
- array[i].level, array[i].infotype);
- }/* else {
- torture_drsuapi_assert_call(tctx, p, status, r,
dcerpc_drsuapi_DsReplicaGetInfo);
- }*/
+ continue;
+ }
+
+ torture_drsuapi_assert_call(tctx, p, status, r,
dcerpc_drsuapi_DsReplicaGetInfo);
}
if (invalid_levels 0) {
diff --git a/source4/torture/rpc/winreg.c b/source4/torture/rpc/winreg.c
index d7e1247..461deff 100644
--- a/source4/torture/rpc/winreg.c
+++ b/source4/torture/rpc/winreg.c
@@ -2437,7 +2437,7 @@ static bool test_Open(struct torture_context *tctx,
struct dcerpc_pipe *p,
struct winreg_OpenHKLM r;
struct dcerpc_binding_handle *b = p-binding_handle;
- winreg_open_fn open_fn = userdata;
+ winreg_open_fn open_fn = (winreg_open_fn)userdata;
r.in.system_name = 0;
r.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
@@ -2451,7 +2451,7 @@ static bool test_Open(struct torture_context *tctx,
struct dcerpc_pipe *p,
ret = false;
}
- if (open_fn == (void *)dcerpc_winreg_OpenHKLM_r) {
+ if (open_fn == (winreg_open_fn)dcerpc_winreg_OpenHKLM_r) {
torture_assert(tctx,
test_HKLM_wellknown(tctx, b, handle),
failed to test HKLM wellknown keys);
@@ -2468,7 +2468,7 @@ static bool test_Open(struct torture_context *tctx,
struct dcerpc_pipe *p,
}
/* The HKCR hive has a very large fanout */
- if (open_fn == (void *)dcerpc_winreg_OpenHKCR_r) {
+ if (open_fn == (winreg_open_fn)dcerpc_winreg_OpenHKCR_r) {
if(!test_key(p, tctx, handle, MAX_DEPTH - 1, false)) {
ret = false;
}
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via bcd647f... Merge branch 'master' of
ssh://git.samba.org/data/git/samba
via e81e057... build: try to honor MAKEFLAGS from make
from bc6a43a... s4:torture/rpc/winreg: fix compiler warnings
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit bcd647f943e391bdb98233c168d2b35e244e2bf4
Merge: e81e057b6d70d70616132593dc2acbfe77cb459c
bc6a43aeb41fc5ccf3a34f2ec91e1328ae82d90e
Author: Andrew Tridgell tri...@samba.org
Date: Wed Apr 14 23:38:05 2010 +1000
Merge branch 'master' of ssh://git.samba.org/data/git/samba
commit e81e057b6d70d70616132593dc2acbfe77cb459c
Author: Andrew Tridgell tri...@samba.org
Date: Wed Apr 14 23:37:47 2010 +1000
build: try to honor MAKEFLAGS from make
This means make -j and make -k now do roughly what is expected
make -j will use the number of CPUs on the system, regardless of the
number after the -j (as MAKEFLAGS doesn't contain that value).
make -k will will continue on errors
---
Summary of changes:
buildtools/scripts/Makefile.waf|7 +--
buildtools/wafsamba/samba_utils.py | 26 ++
buildtools/wafsamba/wscript|1 +
3 files changed, 28 insertions(+), 6 deletions(-)
Changeset truncated at 500 lines:
diff --git a/buildtools/scripts/Makefile.waf b/buildtools/scripts/Makefile.waf
index a1c4b69..ac5c013 100644
--- a/buildtools/scripts/Makefile.waf
+++ b/buildtools/scripts/Makefile.waf
@@ -1,11 +1,6 @@
# simple makefile wrapper to run waf
-# default to using only 1 cpu, to be friendly to build
-# farm machines. I wonder how we get at the -jN option
-# from make to pass it to waf?
-JOBS=1
-
-WAF=JOBS=$(JOBS) BUILDTOOLS/bin/waf
+WAF=WAF_MAKE=1 BUILDTOOLS/bin/waf
all:
$(WAF) build
diff --git a/buildtools/wafsamba/samba_utils.py
b/buildtools/wafsamba/samba_utils.py
index 7ee1663..bf051af 100644
--- a/buildtools/wafsamba/samba_utils.py
+++ b/buildtools/wafsamba/samba_utils.py
@@ -438,3 +438,29 @@ def RECURSE(ctx, directory):
raise
Options.Handler.RECURSE = RECURSE
Build.BuildContext.RECURSE = RECURSE
+
+
+def CHECK_MAKEFLAGS(bld):
+'''check for MAKEFLAGS environment variable in case we are being
+called from a Makefile try to honor a few make command line flags'''
+if not 'WAF_MAKE' in os.environ:
+return
+makeflags = os.environ.get('MAKEFLAGS')
+jobs_set = False
+for opt in makeflags.split():
+# options can come either as -x or as x
+if opt[0] != '-':
+for v in opt:
+if v == 'j':
+jobs_set = True
+elif v == 'k':
+Options.options.keep = True
+elif opt == '-j':
+jobs_set = True
+elif opt == '-k':
+Options.options.keep = True
+if not jobs_set:
+# default to one job
+Options.options.jobs = 1
+
+Build.BuildContext.CHECK_MAKEFLAGS = CHECK_MAKEFLAGS
diff --git a/buildtools/wafsamba/wscript b/buildtools/wafsamba/wscript
index a395bfe..b4fcb99 100644
--- a/buildtools/wafsamba/wscript
+++ b/buildtools/wafsamba/wscript
@@ -226,6 +226,7 @@ def configure(conf):
def build(bld):
+bld.CHECK_MAKEFLAGS()
bld.SETUP_BUILD_GROUPS()
bld.ENFORCE_GROUP_ORDERING()
bld.CHECK_PROJECT_RULES()
--
Samba Shared Repository
Re: [SCM] Samba Shared Repository - branch master updated
Author: Andrew Tridgell tri...@samba.org Date: Wed Apr 14 23:38:05 2010 +1000 Merge branch 'master' of ssh://git.samba.org/data/git/samba sorry, I forgot a --rebase on a git pull
Re: [SCM] Samba Shared Repository - branch master updated
tri...@samba.org schrieb: Author: Andrew Tridgell tri...@samba.org Date: Wed Apr 14 23:38:05 2010 +1000 Merge branch 'master' of ssh://git.samba.org/data/git/samba sorry, I forgot a --rebase on a git pull git config --help tells you how to make that the default for a branch...:-) metze signature.asc Description: OpenPGP digital signature
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via e1e2195... s4:torture/rpc: rename rpc.h = torture_rpc.h
from bcd647f... Merge branch 'master' of
ssh://git.samba.org/data/git/samba
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit e1e2195a4ab60a74ca0a11f8eeb0ba1abfbb37a7
Author: Stefan Metzmacher me...@samba.org
Date: Tue Apr 13 22:06:51 2010 +0200
s4:torture/rpc: rename rpc.h = torture_rpc.h
The reason for this is that some systems include
rpc/rpc.h from within system headers. HP-UX 11.00
does so somewhere deep inside of shadow.h.
For torture/winbind/struct_based.c rpc/rpc.h resolves
to torture/rpc/rpc.h and breaks the build.
metze
---
Summary of changes:
source4/torture/libnet/domain.c |2 +-
source4/torture/libnet/groupinfo.c |2 +-
source4/torture/libnet/groupman.c|2 +-
source4/torture/libnet/libnet_BecomeDC.c |2 +-
source4/torture/libnet/libnet_domain.c |2 +-
source4/torture/libnet/libnet_group.c|2 +-
source4/torture/libnet/libnet_lookup.c |2 +-
source4/torture/libnet/libnet_rpc.c |2 +-
source4/torture/libnet/libnet_share.c|2 +-
source4/torture/libnet/libnet_user.c |2 +-
source4/torture/libnet/userinfo.c|2 +-
source4/torture/libnet/userman.c |2 +-
source4/torture/libnet/utils.c |2 +-
source4/torture/nbt/dgram.c |2 +-
source4/torture/ntp/ntp_signd.c |2 +-
source4/torture/rap/rpc.c|2 +-
source4/torture/raw/qfileinfo.c |2 +-
source4/torture/rpc/alter_context.c |2 +-
source4/torture/rpc/async_bind.c |2 +-
source4/torture/rpc/atsvc.c |2 +-
source4/torture/rpc/autoidl.c|2 +-
source4/torture/rpc/bench.c |2 +-
source4/torture/rpc/bind.c |2 +-
source4/torture/rpc/browser.c|2 +-
source4/torture/rpc/countcalls.c |2 +-
source4/torture/rpc/dfs.c|2 +-
source4/torture/rpc/drsuapi.c|2 +-
source4/torture/rpc/drsuapi_cracknames.c |2 +-
source4/torture/rpc/dsgetinfo.c |2 +-
source4/torture/rpc/dssetup.c|2 +-
source4/torture/rpc/dssync.c |2 +-
source4/torture/rpc/echo.c |2 +-
source4/torture/rpc/epmapper.c |2 +-
source4/torture/rpc/eventlog.c |2 +-
source4/torture/rpc/frsapi.c |2 +-
source4/torture/rpc/handles.c|2 +-
source4/torture/rpc/initshutdown.c |2 +-
source4/torture/rpc/join.c |2 +-
source4/torture/rpc/lsa.c|2 +-
source4/torture/rpc/lsa_lookup.c |2 +-
source4/torture/rpc/mgmt.c |2 +-
source4/torture/rpc/netlogon.c |2 +-
source4/torture/rpc/ntsvcs.c |2 +-
source4/torture/rpc/object_uuid.c|2 +-
source4/torture/rpc/oxidresolve.c|2 +-
source4/torture/rpc/remact.c |2 +-
source4/torture/rpc/remote_pac.c |2 +-
source4/torture/rpc/rpc.c|2 +-
source4/torture/rpc/samba3rpc.c |2 +-
source4/torture/rpc/samlogon.c |2 +-
source4/torture/rpc/samr.c |2 +-
source4/torture/rpc/samr_accessmask.c|2 +-
source4/torture/rpc/samsync.c|2 +-
source4/torture/rpc/scanner.c|2 +-
source4/torture/rpc/schannel.c |2 +-
source4/torture/rpc/session_key.c|2 +-
source4/torture/rpc/spoolss.c|2 +-
source4/torture/rpc/spoolss_notify.c |2 +-
source4/torture/rpc/spoolss_win.c|2 +-
source4/torture/rpc/srvsvc.c |2 +-
source4/torture/rpc/svcctl.c |2 +-
source4/torture/rpc/testjoin.c |2 +-
source4/torture/rpc/{rpc.h = torture_rpc.h} |0
source4/torture/rpc/unixinfo.c |2 +-
source4/torture/rpc/winreg.c |2 +-
source4/torture/rpc/wkssvc.c |2 +-
66 files changed, 65 insertions(+), 65 deletions(-)
rename source4/torture/rpc/{rpc.h = torture_rpc.h} (100%)
Changeset truncated at 500 lines:
diff --git a/source4/torture/libnet/domain.c b/source4/torture/libnet/domain.c
index 110a2e8..11a006e 100644
--- a/source4/torture/libnet/domain.c
+++ b/source4/torture/libnet/domain.c
@@ -19,7 +19,7 @@
*/
#include includes.h
-#include torture/rpc/rpc.h
+#include
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 8693ae7... s3: Fix a typo from e1e2195... s4:torture/rpc: rename rpc.h = torture_rpc.h http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 8693ae741c98b42a900d1f3b529326cca56297c9 Author: Volker Lendecke v...@samba.org Date: Wed Apr 14 21:48:38 2010 +0200 s3: Fix a typo --- Summary of changes: source3/groupdb/mapping_tdb.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/groupdb/mapping_tdb.c b/source3/groupdb/mapping_tdb.c index ee8d752..896ad45 100644 --- a/source3/groupdb/mapping_tdb.c +++ b/source3/groupdb/mapping_tdb.c @@ -968,7 +968,7 @@ static bool mapping_switch(const char *ldb_path) return True; failed: - DEBUG(0,(Failed to swith to tdb group mapping database\n)); + DEBUG(0, (Failed to switch to tdb group mapping database\n)); if (ltdb) tdb_close(ltdb); TALLOC_FREE(frame); return False; -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 208eb74... build: check that the user is not using an old
/usr/bin/waf
from 8693ae7... s3: Fix a typo
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 208eb7469d9208f2aa8bff5f07ef90be3f3d7b1d
Author: Andrew Tridgell tri...@samba.org
Date: Thu Apr 15 08:55:26 2010 +1000
build: check that the user is not using an old /usr/bin/waf
some systems have /usr/bin/waf installed, and its quite old
---
Summary of changes:
buildtools/wafsamba/wafsamba.py | 12 +++-
1 files changed, 11 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
index 386ed3c..de244e1 100644
--- a/buildtools/wafsamba/wafsamba.py
+++ b/buildtools/wafsamba/wafsamba.py
@@ -1,7 +1,7 @@
# a waf tool to add autoconf-like macros to the configure section
# and for SAMBA_ macros for building libraries, binaries etc
-import Build, os, Options, Task, Utils, cc, TaskGen, fnmatch, re, shutil, Logs
+import Build, os, Options, Task, Utils, cc, TaskGen, fnmatch, re, shutil,
Logs, Constants
from Configure import conf
from Logs import debug
from samba_utils import SUBST_VARS_RECURSIVE
@@ -35,6 +35,16 @@ LIB_PATH=shared
os.putenv('PYTHONUNBUFFERED', '1')
+
+if Constants.HEXVERSION 0x105016:
+Logs.error('''
+Please use the version of waf that comes with Samba, not
+a system installed version. See http://wiki.samba.org/index.php/Waf
+for details
+''')
+sys.exit(1)
+
+
@conf
def SAMBA_BUILD_ENV(conf):
'''create the samba build environment'''
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 167ba0e... build: make the 'wrong version of waf' message even
clearer
from 208eb74... build: check that the user is not using an old
/usr/bin/waf
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 167ba0eac902238d970b8312a6cbc87cf48af91a
Author: Andrew Tridgell tri...@samba.org
Date: Thu Apr 15 09:14:10 2010 +1000
build: make the 'wrong version of waf' message even clearer
suggest ./autogen-waf.sh
---
Summary of changes:
buildtools/wafsamba/wafsamba.py |5 -
1 files changed, 4 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
index de244e1..dd9cbd6 100644
--- a/buildtools/wafsamba/wafsamba.py
+++ b/buildtools/wafsamba/wafsamba.py
@@ -40,7 +40,10 @@ if Constants.HEXVERSION 0x105016:
Logs.error('''
Please use the version of waf that comes with Samba, not
a system installed version. See http://wiki.samba.org/index.php/Waf
-for details
+for details.
+
+Alternatively, please use ./autogen-waf.sh, and then
+run ./configure and make as usual. That will call the right version of waf.
''')
sys.exit(1)
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 34887de... build: ensure we don't recreate library loops in
expansions
from 167ba0e... build: make the 'wrong version of waf' message even
clearer
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 34887de6b0615f0f63f497f9020d1c059643f8ec
Author: Andrew Tridgell tri...@samba.org
Date: Thu Apr 15 13:59:51 2010 +1000
build: ensure we don't recreate library loops in expansions
after removing library loops from the dependeny graph, we re-add
parent dependencies. We need to ensure that we don't re-add a
dependency which re-creates the loop we so carefully removed.
This also adds a final check for library dependency loops, and shows
an appropriate error if one is found.
---
Summary of changes:
buildtools/wafsamba/samba_deps.py | 27 ++-
1 files changed, 26 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/buildtools/wafsamba/samba_deps.py
b/buildtools/wafsamba/samba_deps.py
index fbc3223..7beec29 100644
--- a/buildtools/wafsamba/samba_deps.py
+++ b/buildtools/wafsamba/samba_deps.py
@@ -605,6 +605,8 @@ def reduce_objects(bld, tgt_list):
t2 = bld.name_to_obj(l, bld.env)
t2_obj = extended_objects(bld, t2, set())
dup = new.intersection(t2_obj)
+if t.sname in rely_on:
+dup = dup.difference(rely_on[t.sname])
if dup:
debug('deps: removing dups from %s of type %s: %s also in
%s %s',
t.sname, t.samba_type, dup, t2.samba_type, l)
@@ -669,8 +671,18 @@ def calculate_final_deps(bld, tgt_list, loops):
diff = loops[loop].difference(t.final_libs)
if t.sname in diff:
diff.remove(t.sname)
+if t.sname in diff:
+diff.remove(t.sname)
+# make sure we don't recreate the loop again!
+for d in diff.copy():
+t2 = bld.name_to_obj(d, bld.env)
+if t2.samba_type == 'LIBRARY':
+if t.sname in t2.final_libs:
+debug('deps: removing expansion %s from %s',
d, t.sname)
+diff.remove(d)
if diff:
-debug('deps: Expanded target %s by loop %s libraries
%s', t.sname, loop, diff)
+debug('deps: Expanded target %s by loop %s libraries
(loop %s) %s', t.sname, loop,
+ loops[loop], diff)
t.final_libs = t.final_libs.union(diff)
# remove objects that are also available in linked libs
@@ -697,6 +709,19 @@ def calculate_final_deps(bld, tgt_list, loops):
syslibs = syslibs.union(t2.direct_syslibs)
t.final_syslibs = syslibs
+
+# find any unresolved library loops
+lib_loop_error = False
+for t in tgt_list:
+if t.samba_type in ['LIBRARY', 'PYTHON']:
+for l in t.final_libs.copy():
+t2 = bld.name_to_obj(l, bld.env)
+if t.sname in t2.final_libs:
+Logs.error('ERROR: Unresolved library loop %s from %s' %
(t.sname, t2.sname))
+lib_loop_error = True
+if lib_loop_error:
+sys.exit(1)
+
debug('deps: removed duplicate dependencies')
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 0bda3ba... build: throw a fatal error for duplicate target
declarations
via daf4ad5... s4-waf: removed a duplicate declaration of python_netbios
from 34887de... build: ensure we don't recreate library loops in
expansions
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 0bda3bae4cd68285e106261ffe79a1da1f778861
Author: Andrew Tridgell tri...@samba.org
Date: Thu Apr 15 14:43:43 2010 +1000
build: throw a fatal error for duplicate target declarations
We don't want someone to declare two subsystems of the same name but
with different source files
Pair-Programmed-With: Andrew Bartlett abart...@samba.org
commit daf4ad59057d9a7970393d94a4f1c3dfd1e77d21
Author: Andrew Tridgell tri...@samba.org
Date: Thu Apr 15 14:42:13 2010 +1000
s4-waf: removed a duplicate declaration of python_netbios
---
Summary of changes:
buildtools/wafsamba/samba_autoproto.py |5 -
buildtools/wafsamba/samba_utils.py |8
buildtools/wafsamba/wafsamba.py| 10 --
source4/libcli/wscript_build |7 ---
4 files changed, 8 insertions(+), 22 deletions(-)
Changeset truncated at 500 lines:
diff --git a/buildtools/wafsamba/samba_autoproto.py
b/buildtools/wafsamba/samba_autoproto.py
index 2a903d9..edabc7e 100644
--- a/buildtools/wafsamba/samba_autoproto.py
+++ b/buildtools/wafsamba/samba_autoproto.py
@@ -29,8 +29,11 @@ Build.BuildContext.HEIMDAL_AUTOPROTO_PRIVATE =
HEIMDAL_AUTOPROTO_PRIVATE
def SAMBA_AUTOPROTO(bld, header, source):
'''rule for samba prototype generation'''
bld.SET_BUILD_GROUP('prototypes')
-SET_TARGET_TYPE(bld, header, 'PROTOTYPE')
+relpath = os_path_relpath(bld.curdir, bld.srcnode.abspath())
+name = os.path.join(relpath, header)
+SET_TARGET_TYPE(bld, name, 'PROTOTYPE')
t = bld(
+name = name,
source = source,
target = header,
on_results=True,
diff --git a/buildtools/wafsamba/samba_utils.py
b/buildtools/wafsamba/samba_utils.py
index bf051af..94975c6 100644
--- a/buildtools/wafsamba/samba_utils.py
+++ b/buildtools/wafsamba/samba_utils.py
@@ -16,10 +16,10 @@ def SET_TARGET_TYPE(ctx, target, value):
'''set the target type of a target'''
cache = LOCAL_CACHE(ctx, 'TARGET_TYPE')
if target in cache and cache[target] != 'EMPTY':
-ASSERT(ctx, cache[target] == value,
- Target '%s' re-defined as %s - was %s % (target, value,
cache[target]))
-debug(task_gen: Skipping duplicate target %s (curdir=%s) % (target,
ctx.curdir))
-return False
+Logs.error(ERROR: Target '%s' in directory %s re-defined as %s - was
%s % (target,
+
ctx.curdir,
+
value, cache[target]))
+sys.exit(1)
LOCAL_CACHE_SET(ctx, 'TARGET_TYPE', target, value)
debug(task_gen: Target '%s' created of type '%s' in %s % (target, value,
ctx.curdir))
return True
diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
index dd9cbd6..633484b 100644
--- a/buildtools/wafsamba/wafsamba.py
+++ b/buildtools/wafsamba/wafsamba.py
@@ -187,12 +187,6 @@ def SAMBA_LIBRARY(bld, libname, source,
if link_name:
t.link_name = link_name
-if autoproto is not None:
-bld.SAMBA_AUTOPROTO(autoproto, source)
-
-if public_headers is not None:
-bld.PUBLIC_HEADERS(public_headers, header_path=header_path)
-
if pc_files is not None:
bld.PKG_CONFIG_FILES(pc_files, vnum=vnum)
@@ -278,10 +272,6 @@ def SAMBA_BINARY(bld, binname, source,
if subsystem_name is not None:
bld.TARGET_ALIAS(subsystem_name, binname)
-if autoproto is not None:
-bld.SAMBA_AUTOPROTO(autoproto, source)
-if public_headers is not None:
-bld.PUBLIC_HEADERS(public_headers, header_path=header_path)
Build.BuildContext.SAMBA_BINARY = SAMBA_BINARY
diff --git a/source4/libcli/wscript_build b/source4/libcli/wscript_build
index d46fed7..82f0253 100644
--- a/source4/libcli/wscript_build
+++ b/source4/libcli/wscript_build
@@ -41,13 +41,6 @@ bld.SAMBA_SUBSYSTEM('LIBCLI_SMB_COMPOSITE',
)
-bld.SAMBA_PYTHON('python_netbios',
- source='../../libcli/nbt/pynbt.c',
- public_deps='LIBCLI_NBT DYNCONFIG LIBSAMBA-HOSTCONFIG',
- realname='samba/netbios.so'
- )
-
-
bld.SAMBA_SUBSYSTEM('LIBCLI_DGRAM',
source='dgram/dgramsocket.c dgram/mailslot.c dgram/netlogon.c
dgram/browse.c',
public_deps='LIBCLI_NBT LIBNDR LIBCLI_RESOLVE LIBCLI_NETLOGON'
--
Samba Shared Repository
