s4-build: fixed some formatting

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

diff --git a/lib/talloc/wscript b/lib/talloc/wscript
index bd47be8eaab243b09dd946379869a111f758525b..9550ea4cc6d83710d20766b65b64e267e5b8e716 100644 (file)
--- a/lib/talloc/wscript
+++ b/lib/talloc/wscript
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
 APPNAME = 'talloc'
-VERSION = '2.0.2'
+VERSION = '2.0.3'
 
 
 blddir = 'bin'
@@ -24,7 +24,7 @@ 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.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]"),
@@ -33,12 +33,13 @@ def set_options(opt):
 def configure(conf):
     conf.RECURSE('lib/replace')
 
-    if conf.CHECK_BUNDLED_SYSTEM('talloc', minversion=VERSION,
-                                 implied_deps='replace'):
-        conf.define('USING_SYSTEM_TALLOC', 1)
-
     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:
@@ -56,14 +57,20 @@ def build(bld):
         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,
+                          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)
+                          vnum=VERSION,
+                          is_bundled=not bld.env.standalone_talloc)
 
     if not getattr(bld.env, '_SAMBA_BUILD_', 0) == 4:
         # s4 already has the talloc testsuite builtin to smbtorture
@@ -78,27 +85,13 @@ def build(bld):
         bld.PKG_CONFIG_FILES('talloc.pc', vnum=VERSION)
         bld.INSTALL_FILES('${INCLUDEDIR}', 'talloc.h')
 
-        if bld.env.XSLTPROC:
-            bld.env.TALLOC_MAN_XSL = 'http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl'
-            bld.env.TALLOC_WEB_XSL = 'http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl'
-            bld.SAMBA_GENERATOR('talloc.3',
-                                source='talloc.3.xml',
-                                target='talloc.3',
-                                rule='${XSLTPROC} -o ${TGT} ${TALLOC_MAN_XSL} ${SRC}'
-                                )
-            bld.SAMBA_GENERATOR('talloc.3.html',
-                                source='talloc.3.xml',
-                                target='talloc.3.html',
-                                rule='${XSLTPROC} -o ${TGT} ${TALLOC_WEB_XSL} ${SRC}'
-                                )
-            bld.INSTALL_FILES('${MANDIR}/man3', 'talloc.3')
-
-
 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'''