samba_version: When working from git checkout, display git revision SHA1 rather

[abartlet/samba.git/.git] / source4 / wscript

diff --git a/source4/wscript b/source4/wscript
index e973d6f0ac92624d37b61ccc46fe8080313a99b0..bf4ccbdfcaedde954f280ca0049cd2e4205dc78d 100644 (file)
--- a/source4/wscript
+++ b/source4/wscript
@@ -4,14 +4,24 @@ srcdir = '..'
 blddir = 'bin'
 
 APPNAME='samba'
+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
 
-version = wafsamba.samba_version_file("./VERSION")
 
-VERSION=version.STRING
+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('.')
 
@@ -31,8 +41,8 @@ Options.default_prefix = '/usr/local/samba'
 
 
 def set_options(opt):
-    opt.BUILTIN_DEFAULT('replace')
-    opt.BUNDLED_EXTENSION_DEFAULT('samba4')
+    opt.BUILTIN_DEFAULT('NONE')
+    opt.PRIVATE_EXTENSION_DEFAULT('samba4')
     opt.RECURSE('../lib/replace')
     opt.RECURSE('dynconfig')
     opt.RECURSE('scripting/python')
@@ -51,12 +61,7 @@ def set_options(opt):
 
 
 def configure(conf):
-    conf.DEFINE('PACKAGE_NAME', 'samba', 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', version.STRING, quote=True)
-    conf.DEFINE('PACKAGE_BUGREPORT', 'http://bugzilla.samba.org/', quote=True)
+    version = load_version(have_git=True)
 
     conf.DEFINE('CONFIG_H_IS_FROM_SAMBA', 1)
     conf.DEFINE('_SAMBA_BUILD_', version.MAJOR, add_to_cflags=True)
@@ -68,9 +73,6 @@ 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')
@@ -84,6 +86,14 @@ def configure(conf):
     conf.check_python_version((2,4,2))
     conf.check_python_headers(mandatory=True)
 
+    if sys.platform == 'darwin' and not conf.env['HAVE_ENVIRON_DECL']:
+        if not conf.CHECK_SHLIB_W_PYTHON("Checking if -single_module is not needed"):
+            conf.env.append_value('shlib_LINKFLAGS', ['-single_module'])
+        if not conf.CHECK_SHLIB_W_PYTHON("Checking if -undefined dynamic_lookup is not need"):
+            conf.env.append_value('shlib_LINKFLAGS', ['-undefined', 'dynamic_lookup'])
+    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')
@@ -99,10 +109,21 @@ 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')
 
+    # we don't want any libraries or modules to rely on runtime
+    # resolution of symbols
+    conf.ADD_LDFLAGS('-Wl,-no-undefined', testflags=True)
+
+    # gentoo always adds this. We want our normal build to be as
+    # strict as the strictest OS we support, so adding this here
+    # allows us to find problems on our development hosts faster.
+    # It also results in faster load time.
+    conf.ADD_LDFLAGS('-Wl,--as-needed', testflags=True)
+
     # we don't want PYTHONDIR in config.h, as otherwise changing
     # --prefix causes a complete rebuild
     del(conf.env.defines['PYTHONDIR'])
@@ -113,7 +134,7 @@ def etags(ctx):
     '''build TAGS file using etags'''
     import Utils
     source_root = os.path.dirname(Utils.g_module.root_path)
-    cmd = 'etags $(find %s/.. -name "*.[ch]")' % source_root
+    cmd = 'etags $(find %s/.. -name "*.[ch]" | egrep -v \.inst\.)' % source_root
     print("Running: %s" % cmd)
     os.system(cmd)
 
@@ -121,7 +142,7 @@ def ctags(ctx):
     "build 'tags' file using ctags"
     import Utils
     source_root = os.path.dirname(Utils.g_module.root_path)
-    cmd = 'ctags $(find %s/.. -name "*.[ch]" | grep -v "*_proto\.h")' % source_root
+    cmd = 'ctags $(find %s/.. -name "*.[ch]" | grep -v "*_proto\.h" | egrep -v \.inst\.)' % source_root
     print("Running: %s" % cmd)
     os.system(cmd)
 
@@ -129,12 +150,13 @@ def ctags(ctx):
 # of commands in --help
 def build(bld):
     '''build all targets'''
+    load_version()
     pass
 
 
 def pydoctor(ctx):
     '''build python apidocs'''
-    cmd='LD_LIBRARY_PATH=bin/shared PYTHONPATH=bin/python pydoctor --project-name=Samba --project-url=http://www.samba.org --make-html --docformat=restructuredtext --add-package bin/python/samba'
+    cmd='PYTHONPATH=bin/python pydoctor --project-name=Samba --project-url=http://www.samba.org --make-html --docformat=restructuredtext --add-package bin/python/samba'
     print("Running: %s" % cmd)
     os.system(cmd)
 
@@ -144,7 +166,7 @@ def wafdocs(ctx):
     os.system('pwd')
     list = recursive_dirlist('../buildtools/wafsamba', '.', pattern='*.py')
 
-    cmd='LD_LIBRARY_PATH=bin/shared PYTHONPATH=bin/python pydoctor --project-name=wafsamba --project-url=http://www.samba.org --make-html --docformat=restructuredtext'
+    cmd='PYTHONPATH=bin/python pydoctor --project-name=wafsamba --project-url=http://www.samba.org --make-html --docformat=restructuredtext'
     print(list)
     for f in list:
         cmd += ' --add-module %s' % f
@@ -154,10 +176,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')