waf: remove the restriction that private libraries must not have a vnum

[nivanova/samba-autobuild/.git] / lib / talloc / wscript

diff --git a/lib/talloc/wscript b/lib/talloc/wscript
index 4f95da722363f9d8e976ec68dbaf1495b5875707..a23532a189cee1afa85999034a91a96443c64e6d 100644 (file)
--- a/lib/talloc/wscript
+++ b/lib/talloc/wscript
@@ -1,11 +1,12 @@
 #!/usr/bin/env python
 
 APPNAME = 'talloc'
-VERSION = '2.0.3'
+VERSION = '2.0.4'
 
 
 blddir = 'bin'
 
+import Logs
 import os, sys
 
 # find the buildtools directory
@@ -24,53 +25,99 @@ samba_dist.DIST_DIRS('lib/talloc:. lib/replace:lib/replace buildtools:buildtools
 
 def set_options(opt):
     opt.BUILTIN_DEFAULT('replace')
-    opt.BUNDLED_EXTENSION_DEFAULT('talloc', noextension='talloc')
+    opt.PRIVATE_EXTENSION_DEFAULT('talloc', noextension='talloc')
     opt.RECURSE('lib/replace')
     opt.add_option('--enable-talloc-compat1',
                    help=("Build talloc 1.x.x compat library [False]"),
                    action="store_true", dest='TALLOC_COMPAT1', default=False)
+    if opt.IN_LAUNCH_DIR():
+        opt.add_option('--disable-python',
+                       help=("disable the pytalloc module"),
+                       action="store_true", dest='disable_python', default=False)
+
 
 def configure(conf):
     conf.RECURSE('lib/replace')
 
     conf.env.standalone_talloc = conf.IN_LAUNCH_DIR()
 
+    conf.env.disable_python = getattr(Options.options, 'disable_python', False)
+
     if not conf.env.standalone_talloc:
         if conf.CHECK_BUNDLED_SYSTEM('talloc', minversion=VERSION,
                                      implied_deps='replace'):
             conf.define('USING_SYSTEM_TALLOC', 1)
+        if conf.CHECK_BUNDLED_SYSTEM('pytalloc-util', minversion=VERSION,
+                                     implied_deps='talloc replace'):
+            conf.define('USING_SYSTEM_PYTALLOC_UTIL', 1)
 
     conf.env.TALLOC_COMPAT1 = Options.options.TALLOC_COMPAT1
 
-    if conf.env.standalone_talloc:
-        conf.find_program('xsltproc', var='XSLTPROC')
+    conf.CHECK_XSLTPROC_MANPAGES()
 
-    conf.SAMBA_CONFIG_H()
+    if not conf.env.disable_python:
+        # also disable if we don't have the python libs installed
+        conf.check_tool('python')
+        conf.check_python_version((2,4,2))
+        conf.check_python_headers(mandatory=False)
+        if not conf.env.HAVE_PYTHON_H:
+            Logs.warn('Disabling pytalloc-util as python devel libs not found')
+            conf.env.disable_python = True
 
+    conf.SAMBA_CONFIG_H()
 
 
 def build(bld):
     bld.RECURSE('lib/replace')
 
+    if bld.env.standalone_talloc:
+        bld.env.PKGCONFIGDIR = '${LIBDIR}/pkgconfig'
+        bld.env.TALLOC_VERSION = VERSION
+        bld.PKG_CONFIG_FILES('talloc.pc', vnum=VERSION)
+        bld.INSTALL_FILES('${INCLUDEDIR}', 'talloc.h')
+        private_library = False
+
+        # should we also install the symlink to libtalloc1.so here?
+        bld.SAMBA_LIBRARY('talloc-compat1-%s' % (VERSION),
+                          'compat/talloc_compat1.c',
+                          public_deps='talloc',
+                          soname='libtalloc.so.1',
+                          enabled=bld.env.TALLOC_COMPAT1)
+
+        if not bld.env.disable_python:
+            bld.PKG_CONFIG_FILES('pytalloc-util.pc', vnum=VERSION)
+    else:
+        private_library = True
+
     if not bld.CONFIG_SET('USING_SYSTEM_TALLOC'):
 
         bld.SAMBA_LIBRARY('talloc',
                           'talloc.c',
                           deps='replace',
-                          abi_file='ABI/talloc-%s.sigs' % VERSION,
+                          abi_directory='ABI',
                           abi_match='talloc* _talloc*',
                           hide_symbols=True,
                           vnum=VERSION,
-                                                 is_bundled=not bld.env.standalone_talloc, 
-                                                 manpages='talloc.3')
-
-        # should we also install the symlink to libtalloc1.so here?
-        bld.SAMBA_LIBRARY('talloc-compat1',
-                          'compat/talloc_compat1.c',
-                          deps='talloc',
-                          enabled = bld.env.TALLOC_COMPAT1,
-                          vnum=VERSION,
-                                                 is_bundled=not bld.env.standalone_talloc)
+                          private_library=private_library,
+                          manpages='talloc.3')
+
+    if not bld.CONFIG_SET('USING_SYSTEM_PYTALLOC_UTIL') and not bld.env.disable_python:
+
+        bld.SAMBA_LIBRARY('pytalloc-util',
+            source='pytalloc_util.c',
+            public_deps='talloc',
+            abi_directory='ABI',
+            abi_match='py* Py*',
+            pyext=True,
+            vnum=VERSION,
+            private_library=private_library,
+            )
+        bld.INSTALL_FILES('${INCLUDEDIR}', 'pytalloc.h')
+        bld.SAMBA_PYTHON('pytalloc',
+                         'pytalloc.c',
+                         deps='talloc pytalloc-util',
+                         enabled=True,
+                         realname='talloc.so')
 
     if not getattr(bld.env, '_SAMBA_BUILD_', 0) == 4:
         # s4 already has the talloc testsuite builtin to smbtorture
@@ -79,18 +126,20 @@ def build(bld):
                          deps='talloc',
                          install=False)
 
-    if bld.env.standalone_talloc:
-        bld.env.PKGCONFIGDIR = '${LIBDIR}/pkgconfig'
-        bld.env.TALLOC_VERSION = VERSION
-        bld.PKG_CONFIG_FILES('talloc.pc', vnum=VERSION)
-        bld.INSTALL_FILES('${INCLUDEDIR}', 'talloc.h')
 
 def test(ctx):
     '''run talloc testsuite'''
-    import Utils
+    import Utils, samba_utils
     cmd = os.path.join(Utils.g_module.blddir, 'talloc_testsuite')
-    os.system(cmd)
+    ret = samba_utils.RUN_COMMAND(cmd)
+    print("testsuite returned %d" % ret)
+    sys.exit(ret)
 
 def dist():
     '''makes a tarball for distribution'''
     samba_dist.dist()
+
+def reconfigure(ctx):
+    '''reconfigure if config scripts have changed'''
+    import samba_utils
+    samba_utils.reconfigure(ctx)