waf: replace the is_bundled option with private_library

[abartlet/samba.git/.git] / lib / talloc / wscript

diff --git a/lib/talloc/wscript b/lib/talloc/wscript
index 9c6316289e651c5ff20abc2c2cdfea138e663bf2..bdf21a347bee372966b0a8e677f4af051f9e5441 100644 (file)
--- a/lib/talloc/wscript
+++ b/lib/talloc/wscript
@@ -1,26 +1,22 @@
 #!/usr/bin/env python
 
 APPNAME = 'talloc'
-VERSION = '2.0.2'
+VERSION = '2.0.3'
+
 
 blddir = 'bin'
 
 import os, sys
 
 # find the buildtools directory
-buildtools = 'buildtools'
-while not os.path.exists(buildtools) and len(buildtools.split('/')) < 5:
-    buildtools = '../' + buildtools
-srcdir = os.path.dirname(buildtools) or '.'
-
-sys.path.insert(0, buildtools + "/wafsamba")
-
-
-LIBREPLACE_DIR= '../replace'
+srcdir = '.'
+while not os.path.exists(srcdir+'/buildtools') and len(srcdir.split('/')) < 5:
+    srcdir = '../' + srcdir
+sys.path.insert(0, srcdir + '/buildtools/wafsamba')
 
 import sys
 sys.path.insert(0, srcdir+"/buildtools/wafsamba")
-import wafsamba, samba_dist
+import wafsamba, samba_dist, Options
 
 # setup what directories to put in a tarball
 samba_dist.DIST_DIRS('lib/talloc:. lib/replace:lib/replace buildtools:buildtools')
@@ -28,30 +24,53 @@ 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', noextenion='talloc')
-    opt.RECURSE(LIBREPLACE_DIR)
+    opt.BUNDLED_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)
 
 def configure(conf):
-    conf.RECURSE(LIBREPLACE_DIR)
-
-    if conf.CHECK_BUNDLED_SYSTEM('talloc', minversion=VERSION,
-                                 implied_deps='replace'):
-        conf.define('USING_SYSTEM_TALLOC', 1)
+    conf.RECURSE('lib/replace')
 
     conf.env.standalone_talloc = conf.IN_LAUNCH_DIR()
 
+    if not conf.env.standalone_talloc:
+        if conf.CHECK_BUNDLED_SYSTEM('talloc', minversion=VERSION,
+                                     implied_deps='replace'):
+            conf.define('USING_SYSTEM_TALLOC', 1)
+
+    conf.env.TALLOC_COMPAT1 = Options.options.TALLOC_COMPAT1
+
+    if conf.env.standalone_talloc:
+        conf.find_program('xsltproc', var='XSLTPROC')
+
     conf.SAMBA_CONFIG_H()
 
 
 
 def build(bld):
-    bld.RECURSE(LIBREPLACE_DIR)
+    bld.RECURSE('lib/replace')
 
     if not bld.CONFIG_SET('USING_SYSTEM_TALLOC'):
+
         bld.SAMBA_LIBRARY('talloc',
                           'talloc.c',
                           deps='replace',
-                          vnum=VERSION)
+                          abi_file='ABI/talloc-%s.sigs' % VERSION,
+                          abi_match='talloc* _talloc*',
+                          hide_symbols=True,
+                          vnum=VERSION,
+                          private_library=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,
+                          private_library=not bld.env.standalone_talloc)
 
     if not getattr(bld.env, '_SAMBA_BUILD_', 0) == 4:
         # s4 already has the talloc testsuite builtin to smbtorture
@@ -64,9 +83,16 @@ def build(bld):
         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, samba_utils
+    cmd = os.path.join(Utils.g_module.blddir, 'talloc_testsuite')
+    ret = samba_utils.RUN_COMMAND(cmd)
+    print("testsuite returned %d" % ret)
+    sys.exit(ret)
 
 def dist():
     '''makes a tarball for distribution'''
     samba_dist.dist()
-