spoolss: add SPOOLSS_DRIVER_VERSION_2012 (4) define to IDL.

[kai/samba.git] / wscript

diff --git a/wscript b/wscript
old mode 100755 (executable)
new mode 100644 (file)
index bceace1..4f82310
--- a/wscript
+++ b/wscript
@@ -6,13 +6,13 @@ blddir = 'bin'
 APPNAME='samba'
 VERSION=None
 
 APPNAME='samba'
 VERSION=None
 

-import sys, os
+import sys, os, tempfile

 sys.path.insert(0, srcdir+"/buildtools/wafsamba")
 import wafsamba, Options, samba_dist, Scripting, Utils, samba_version
 
 
 samba_dist.DIST_DIRS('.')
 sys.path.insert(0, srcdir+"/buildtools/wafsamba")
 import wafsamba, Options, samba_dist, Scripting, Utils, samba_version
 
 
 samba_dist.DIST_DIRS('.')

-samba_dist.DIST_BLACKLIST('.gitignore .bzrignore')
+samba_dist.DIST_BLACKLIST('.gitignore .bzrignore source4/selftest/provisions/alpha13')

 
 # install in /usr/local/samba by default
 Options.default_prefix = '/usr/local/samba'
 
 # install in /usr/local/samba by default
 Options.default_prefix = '/usr/local/samba'


@@ -57,9 +57,11 @@ def set_options(opt):
                    action='store_true', dest='without_ad_dc', default=False)
 
     gr = opt.option_group('developer options')
                    action='store_true', dest='without_ad_dc', default=False)
 
     gr = opt.option_group('developer options')

-    gr.add_option('--enable-build-farm',
-                   help='enable special build farm options',
-                   action='store_true', dest='BUILD_FARM')
+
+    opt.add_option('--disable-ntdb',
+                   help=("disable ntdb"),
+                   action="store_true", dest='disable_ntdb', default=False)
+

 
     opt.tool_options('python') # options for disabling pyc or pyo compilation
     # enable options related to building python extensions
 
     opt.tool_options('python') # options for disabling pyc or pyo compilation
     # enable options related to building python extensions


@@ -76,9 +78,6 @@ def configure(conf):
         conf.ADD_CFLAGS('-DDEVELOPER -DDEBUG_PASSWORD')
         conf.env.DEVELOPER = True
 
         conf.ADD_CFLAGS('-DDEVELOPER -DDEBUG_PASSWORD')
         conf.env.DEVELOPER = True
 

-    # 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')
-

     conf.ADD_EXTRA_INCLUDES('#include/public #source4 #lib #source4/lib #source4/include #include #lib/replace')
 
     conf.RECURSE('lib/replace')
     conf.ADD_EXTRA_INCLUDES('#include/public #source4 #lib #source4/lib #source4/include #include #lib/replace')
 
     conf.RECURSE('lib/replace')


@@ -124,7 +123,11 @@ def configure(conf):
     conf.RECURSE('source4/ntvfs/sysdep')
     conf.RECURSE('lib/util')
     conf.RECURSE('lib/ccan')
     conf.RECURSE('source4/ntvfs/sysdep')
     conf.RECURSE('lib/util')
     conf.RECURSE('lib/ccan')

-    conf.RECURSE('lib/ntdb')
+    conf.env.disable_ntdb = getattr(Options.options, 'disable_ntdb', False)
+    if not Options.options.disable_ntdb:
+        conf.RECURSE('lib/ntdb')
+    else:
+        conf.DEFINE('DISABLE_NTDB', 1)

     conf.RECURSE('lib/zlib')
     conf.RECURSE('lib/util/charset')
     conf.RECURSE('source4/auth')
     conf.RECURSE('lib/zlib')
     conf.RECURSE('lib/util/charset')
     conf.RECURSE('source4/auth')


@@ -173,7 +176,7 @@ def etags(ctx):
     '''build TAGS file using etags'''
     import Utils
     source_root = os.path.dirname(Utils.g_module.root_path)
     '''build TAGS file using etags'''
     import Utils
     source_root = os.path.dirname(Utils.g_module.root_path)

-    cmd = 'etags $(find %s -name "*.[ch]" | egrep -v \.inst\.)' % source_root
+    cmd = 'rm -f %s/TAGS && (find %s -name "*.[ch]" | egrep -v \.inst\. | xargs -n 100 etags -a)' % (source_root, source_root)

     print("Running: %s" % cmd)
     os.system(cmd)
 
     print("Running: %s" % cmd)
     os.system(cmd)
 


@@ -232,15 +235,41 @@ def wafdocs(ctx):
 
 def dist():
     '''makes a tarball for distribution'''
 
 def dist():
     '''makes a tarball for distribution'''

-    samba_version.load_version(env=None)
-    samba_dist.dist()
+    sambaversion = samba_version.load_version(env=None)
+
+    os.system(srcdir + "/release-scripts/build-manpages-nogit")
+    samba_dist.DIST_FILES('bin/docs:docs', extend=True)
+
+    os.system(srcdir + "/source3/autogen.sh")
+    samba_dist.DIST_FILES('source3/configure', extend=True)
+    samba_dist.DIST_FILES('source3/autoconf', extend=True)
+    samba_dist.DIST_FILES('source3/include/autoconf', extend=True)
+    samba_dist.DIST_FILES('examples/VFS/configure', extend=True)
+    samba_dist.DIST_FILES('examples/VFS/module_config.h.in', extend=True)
+
+    if sambaversion.IS_SNAPSHOT:
+        # write .distversion file and add to tar
+        if not os.path.isdir(blddir):
+            os.makedirs(blddir)
+        distversionf = tempfile.NamedTemporaryFile(mode='w', prefix='.distversion',dir=blddir)
+        for field in sambaversion.vcs_fields:
+            distveroption = field + '=' + str(sambaversion.vcs_fields[field])
+            distversionf.write(distveroption + '\n')
+        distversionf.flush()
+        samba_dist.DIST_FILES('%s:.distversion' % distversionf.name, extend=True)
+
+        samba_dist.dist()
+        distversionf.close()
+    else:
+        samba_dist.dist()
+

 
 def distcheck():
     '''test that distribution tarball builds and installs'''
     samba_version.load_version(env=None)
     import Scripting
     d = Scripting.distcheck
 
 def distcheck():
     '''test that distribution tarball builds and installs'''
     samba_version.load_version(env=None)
     import Scripting
     d = Scripting.distcheck

-    d(subdir='source4')
+    d()

 
 def wildcard_cmd(cmd):
     '''called on a unknown command'''
 
 def wildcard_cmd(cmd):
     '''called on a unknown command'''