[SCM] Samba Shared Repository - branch master updated

[Andrew Tridgell]

The branch, master has been updated
       via  2c0ff51 s4-waf: we don't need the smbtorture.static for s3 any more
       via  6120ef9 autobuild: don't cleanup the pid file within the retry loop
       via  4fa0ceb waf: RPC_NDR_WINBIND is samba4 specific
      from  3c74871 ldb:ldb_modules.c - "dlclose" could cause inference on "dlerror"

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 2c0ff5113cd9ef966f9ee3bcc723a6a28f1197da
Author: Andrew Tridgell <tridge at samba.org>
Date:   Thu Oct 21 21:17:57 2010 +1100

    s4-waf: we don't need the smbtorture.static for s3 any more
    
    this breaks the build farm
    
    Pair-Programmed-With: Andrew Bartlett <abartlet at samba.org>
    
    Autobuild-User: Andrew Tridgell <tridge at samba.org>
    Autobuild-Date: Thu Oct 21 11:04:21 UTC 2010 on sn-devel-104

commit 6120ef9f9e76c417cc105db8be3834516312a9eb
Author: Andrew Tridgell <tridge at samba.org>
Date:   Thu Oct 21 20:41:06 2010 +1100

    autobuild: don't cleanup the pid file within the retry loop
    
    if we rebase and retry we need to keep the pid file

commit 4fa0ceb7517de755b20179f2728532811f62c845
Author: Andrew Tridgell <tridge at samba.org>
Date:   Thu Oct 21 20:21:10 2010 +1100

    waf: RPC_NDR_WINBIND is samba4 specific
    
    this caused problems with the s3 waf build

-----------------------------------------------------------------------

Summary of changes:
 librpc/wscript_build          |    2 +-
 script/autobuild.py           |    3 ++-
 source4/librpc/wscript_build  |    8 ++++++++
 source4/torture/wscript_build |   11 -----------
 4 files changed, 11 insertions(+), 13 deletions(-)


Changeset truncated at 500 lines:

diff --git a/librpc/wscript_build b/librpc/wscript_build
index c40d07b..4a45095 100644
--- a/librpc/wscript_build
+++ b/librpc/wscript_build
@@ -484,7 +484,7 @@ bld.SAMBA_LIBRARY('NDR_SAMBA',
 # a grouping library for RPC_NDR subsystems that may be used by more than one target
 bld.SAMBA_LIBRARY('RPC_NDR_SAMBA',
                   source=[],
-                  deps='RPC_NDR_DRSUAPI RPC_NDR_LSA RPC_NDR_WINBIND RPC_NDR_WINREG',
+                  deps='RPC_NDR_DRSUAPI RPC_NDR_LSA RPC_NDR_WINREG',
                   private_library=True,
                   grouping_library=True
                   )
diff --git a/script/autobuild.py b/script/autobuild.py
index 3fae59f..357cb16 100755
--- a/script/autobuild.py
+++ b/script/autobuild.py
@@ -278,7 +278,6 @@ def write_pidfile(fname):
     f = open(fname, mode='w')
     f.write("%u\n" % os.getpid())
     f.close()
-    cleanup_list.append(fname)
 
 
 def rebase_tree(url):
@@ -473,6 +472,8 @@ while True:
         cleanup()
         raise
 
+cleanup_list.append(gitroot + "/autobuild.pid")
+
 blist.kill_kids()
 if options.tail:
     print("waiting for tail to flush")
diff --git a/source4/librpc/wscript_build b/source4/librpc/wscript_build
index 83f7df3..920d6a2 100755
--- a/source4/librpc/wscript_build
+++ b/source4/librpc/wscript_build
@@ -110,6 +110,14 @@ bld.SAMBA_LIBRARY('NDR_SAMBA4',
                   grouping_library=True
                   )
 
+# a grouping library for RPC_NDR subsystems that may be used by more than one target
+bld.SAMBA_LIBRARY('RPC_NDR_SAMBA4',
+                  source=[],
+                  deps='RPC_NDR_WINBIND',
+                  private_library=True,
+                  grouping_library=True
+                  )
+
 
 bld.SAMBA_PIDL_TABLES('GEN_NDR_TABLES', 'gen_ndr/tables.c')
 
diff --git a/source4/torture/wscript_build b/source4/torture/wscript_build
index bb0964a..7371965 100644
--- a/source4/torture/wscript_build
+++ b/source4/torture/wscript_build
@@ -154,17 +154,6 @@ bld.SAMBA_BINARY('smbtorture',
                  pyembed=True
                  )
 
-# this is used in the build farm to build a smbtorture.static binary for s3
-bld.SAMBA_BINARY('smbtorture.static',
-                 source=[],
-                 deps='torturemain torture popt POPT_SAMBA POPT_CREDENTIALS dcerpc LIBCLI_SMB SMBREADLINE ' + TORTURE_MODULES,
-                 enabled = bld.env.BUILD_FARM,
-                 pyembed=True
-                 )
-bld.env.NONSHARED_BINARIES.append('smbtorture.static')
-
-
-
 bld.SAMBA_BINARY('gentest',
 	source='gentest.c',
 	manpages='man/gentest.1',


-- 
Samba Shared Repository