[SCM] Samba Shared Repository - branch master updated

Andrew Tridgell tridge at samba.org
Wed Apr 28 16:03:34 MDT 2010


The branch, master has been updated
       via  4a87ca2... s4-waf: added --enable-build-farm configure option
       via  08c3ce2... build: added enabled=True/False option to SAMBA_BINARY()
      from  4e7195b... Update (C) for 2010.

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


- Log -----------------------------------------------------------------
commit 4a87ca2028fe301d1d61e5cd365df49ff1f2dd22
Author: Andrew Tridgell <tridge at samba.org>
Date:   Thu Apr 29 07:47:57 2010 +1000

    s4-waf: added --enable-build-farm configure option
    
    this adds a smbtorture.static binary which s3 will use in the build
    farm

commit 08c3ce25c6d0571c6271645ef4dae3c5ca2b0e33
Author: Andrew Tridgell <tridge at samba.org>
Date:   Thu Apr 29 07:47:19 2010 +1000

    build: added enabled=True/False option to SAMBA_BINARY()

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

Summary of changes:
 buildtools/wafsamba/wafsamba.py |    7 ++++++-
 source4/torture/wscript_build   |   29 +++++++++++++++++++++++------
 source4/wscript                 |    9 +++++++++
 3 files changed, 38 insertions(+), 7 deletions(-)


Changeset truncated at 500 lines:

diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
index 6d6416b..d4766b0 100644
--- a/buildtools/wafsamba/wafsamba.py
+++ b/buildtools/wafsamba/wafsamba.py
@@ -229,9 +229,14 @@ def SAMBA_BINARY(bld, binname, source,
                  needs_python=False,
                  vars=None,
                  install=True,
-                 install_path=None):
+                 install_path=None,
+                 enabled=True):
     '''define a Samba binary'''
 
+    if not enabled:
+        SET_TARGET_TYPE(bld, binname, 'DISABLED')
+        return
+
     if not SET_TARGET_TYPE(bld, binname, 'BINARY'):
         return
 
diff --git a/source4/torture/wscript_build b/source4/torture/wscript_build
index 220673a..33f9f15 100644
--- a/source4/torture/wscript_build
+++ b/source4/torture/wscript_build
@@ -131,13 +131,30 @@ bld.SAMBA_MODULE('TORTURE_NTP',
 
 TORTURE_MODULES = 'TORTURE_BASIC TORTURE_RAW torture_rpc TORTURE_RAP TORTURE_AUTH TORTURE_NBENCH TORTURE_UNIX TORTURE_LDAP TORTURE_NBT TORTURE_NET TORTURE_NTP torture_registry'
 
+bld.SAMBA_SUBSYSTEM('torturemain',
+                    source='smbtorture.c torture.c',
+                    subsystem_name='smbtorture',
+                    deps='torture popt POPT_SAMBA POPT_CREDENTIALS dcerpc LIBCLI_SMB SMBREADLINE ' + TORTURE_MODULES,
+                    needs_python=True
+                    )
+
 bld.SAMBA_BINARY('smbtorture',
-	source='smbtorture.c torture.c',
-	manpages='man/smbtorture.1',
-	public_headers='smbtorture.h',
-	deps='torture popt POPT_SAMBA POPT_CREDENTIALS dcerpc LIBCLI_SMB SMBREADLINE ' + TORTURE_MODULES,
-        needs_python=True
-	)
+                 source=[],
+                 manpages='man/smbtorture.1',
+                 public_headers='smbtorture.h',
+                 deps='torturemain torture popt POPT_SAMBA POPT_CREDENTIALS dcerpc LIBCLI_SMB SMBREADLINE ' + TORTURE_MODULES,
+                 needs_python=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,
+                 needs_python=True
+                 )
+bld.env.NONSHARED_BINARIES.append('smbtorture.static')
+
 
 
 bld.SAMBA_BINARY('gentest',
diff --git a/source4/wscript b/source4/wscript
index 4f8042d..e5c8d23 100644
--- a/source4/wscript
+++ b/source4/wscript
@@ -30,6 +30,12 @@ def set_options(opt):
     opt.RECURSE('../lib/uid_wrapper')
     opt.RECURSE('../pidl')
 
+    gr = opt.option_group('developer options')
+    gr.add_option('--enable-build-farm',
+                   help='enable special build farm options',
+                   action='store_true', dest='BUILD_FARM')
+
+
 def configure(conf):
     conf.DEFINE('PACKAGE_NAME', 'samba', quote=True)
     conf.DEFINE('PACKAGE_STRING', 'samba 4', quote=True)
@@ -45,6 +51,9 @@ def configure(conf):
     if Options.options.developer:
         conf.ADD_CFLAGS('-DDEVELOPER -DDEBUG_PASSWORD')
 
+    # this enables smbtorture.static for s3 in the build farm
+    conf.env.BUILD_FARM = Options.options.BUILD_FARM or os.environ.get('RUN_FROM_BUILD_FARM')
+
     # set a lower limit on recursing in waf preprocessor
     conf.env.preprocessor_recursion_limit = 10
 


-- 
Samba Shared Repository


More information about the samba-cvs mailing list