s4:dsdb - fix unsigned integer save problems using the "%u" specifier

[kai/samba.git] / source4 / wscript

diff --git a/source4/wscript b/source4/wscript
index 05bee1a6fed48880ebb9d79e9c9697ef600f335c..de84a09fa16ea8b8bde075cbf493376c7a278e44 100644 (file)
--- a/source4/wscript
+++ b/source4/wscript
@@ -4,20 +4,44 @@ srcdir = '..'
 blddir = 'bin'
 
 APPNAME='samba'
-VERSION='4.0.0-alpha13'
+VERSION=None
 
 import sys, os
 sys.path.insert(0, srcdir+"/buildtools/wafsamba")
-import wafsamba, Options, samba_dist, Scripting
+import wafsamba, Options, samba_dist, Scripting, Utils
+
+
+def load_version(have_git=False):
+    '''load samba versions either from ./VERSION or git
+    return a version object for detailed breakdown'''
+    import samba_utils, Utils
+    if not have_git:
+        env = samba_utils.LOAD_ENVIRONMENT()
+        have_git = 'GIT' in env
+    version = wafsamba.samba_version_file("./VERSION", have_git=have_git)
+    Utils.g_module.VERSION = version.STRING
+    return version
+
 
 samba_dist.DIST_DIRS('.')
 
+#This is a list of files that we don't want in the package, for
+#whatever reason.  Directories should be listed with a trailing / to
+#avoid over-exclusion.
+
+#This list includes files that would confuse the recipient of a
+#samba-4.0.0 branded tarball (until the merge is complete) and the
+#core elements of the autotools build system (which is known to
+#produce buggy binaries).
+samba_dist.DIST_BLACKLIST('README Manifest Read-Manifest-Now Roadmap source3/ ' +
+                          'packaging/ docs-xml/ examples/ swat/ WHATSNEW.txt MAINTAINERS ' +
+                          'source4/autogen-autotools.sh source4/Makefile.in source4/configure.ac')
 # install in /usr/local/samba by default
 Options.default_prefix = '/usr/local/samba'
 
 
 def set_options(opt):
-    opt.BUILTIN_DEFAULT('NONE')
+    opt.BUILTIN_DEFAULT('replace')
     opt.BUNDLED_EXTENSION_DEFAULT('samba4')
     opt.RECURSE('../lib/replace')
     opt.RECURSE('dynconfig')
@@ -37,15 +61,17 @@ def set_options(opt):
 
 
 def configure(conf):
+    version = load_version(have_git=True)
+
     conf.DEFINE('PACKAGE_NAME', 'samba', quote=True)
-    conf.DEFINE('PACKAGE_STRING', 'samba 4', quote=True)
+    conf.DEFINE('PACKAGE_STRING', 'Samba ' + version.STRING, quote=True)
     conf.DEFINE('PACKAGE_TARNAME',  'samba', quote=True)
     conf.DEFINE('PACKAGE_URL', "http://www.samba.org/", quote=True)
-    conf.DEFINE('PACKAGE_VERSION', "4", quote=True)
+    conf.DEFINE('PACKAGE_VERSION', version.STRING, quote=True)
     conf.DEFINE('PACKAGE_BUGREPORT', 'http://bugzilla.samba.org/', quote=True)
 
     conf.DEFINE('CONFIG_H_IS_FROM_SAMBA', 1)
-    conf.DEFINE('_SAMBA_BUILD_', 4, add_to_cflags=True)
+    conf.DEFINE('_SAMBA_BUILD_', version.MAJOR, add_to_cflags=True)
     conf.DEFINE('HAVE_CONFIG_H', 1, add_to_cflags=True)
 
     if Options.options.developer:
@@ -54,21 +80,22 @@ def configure(conf):
     # 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
-
     conf.ADD_EXTRA_INCLUDES('#source4 #lib #source4/lib #source4/include')
 
     conf.RECURSE('../lib/replace')
 
     conf.find_program('python', var='PYTHON', mandatory=True)
     conf.find_program('perl', var='PERL', mandatory=True)
+    conf.find_program('xsltproc', var='XSLTPROC')
 
     # enable tool to build python extensions
     conf.check_tool('python')
     conf.check_python_version((2,4,2))
     conf.check_python_headers(mandatory=True)
 
+    if int(conf.env['PYTHON_VERSION'][0]) >= 3:
+        raise Utils.WafError('Python version 3.x is not supported by Samba yet')
+
     conf.RECURSE('dynconfig')
     conf.RECURSE('scripting/python')
     conf.RECURSE('lib/ldb')
@@ -84,7 +111,8 @@ def configure(conf):
     conf.RECURSE('../lib/socket_wrapper')
     conf.RECURSE('../lib/uid_wrapper')
     conf.RECURSE('../lib/popt')
-    conf.RECURSE('lib/smbreadline')
+    conf.RECURSE('../lib/subunit/c')
+    conf.RECURSE('../libcli/smbreadline')
     conf.RECURSE('../pidl')
     conf.RECURSE('selftest')
 
@@ -114,6 +142,7 @@ def ctags(ctx):
 # of commands in --help
 def build(bld):
     '''build all targets'''
+    load_version()
     pass
 
 
@@ -139,10 +168,12 @@ def wafdocs(ctx):
 
 def dist():
     '''makes a tarball for distribution'''
+    load_version()
     samba_dist.dist()
 
 def distcheck():
     '''test that distribution tarball builds and installs'''
+    load_version()
     import Scripting
     d = Scripting.distcheck
     d(subdir='source4')