wafsamba: Fix typo: noextenion -> noextension.

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

diff --git a/lib/tevent/wscript b/lib/tevent/wscript
index 976048d0163c1da93fa3909fcb8a37da92b3ce4f..aae0d1ef9983b5f9521dea0231030d43e3f042ff 100644 (file)
--- a/lib/tevent/wscript
+++ b/lib/tevent/wscript
@@ -1,40 +1,38 @@
 #!/usr/bin/env python
 
 APPNAME = 'tevent'
-VERSION = '0.9.8'
+VERSION = '0.9.9'
 
 blddir = 'bin'
 
 import sys, os
 
 # find the buildtools directory
-buildtools = 'buildtools ../../buildtools'
-for d in buildtools.split():
-    if os.path.exists(d):
-        srcdir = os.path.dirname(d) or '.'
-        break
+srcdir = '.'
+while not os.path.exists(srcdir+'/buildtools') and len(srcdir.split('/')) < 5:
+    srcdir = '../' + srcdir
+sys.path.insert(0, srcdir + '/buildtools/wafsamba')
 
-sys.path.insert(0, srcdir+"/buildtools/wafsamba")
 import wafsamba, samba_dist
 
 samba_dist.DIST_DIRS('lib/tevent:. lib/replace:lib/replace lib/talloc:lib/talloc buildtools:buildtools')
 
-LIBREPLACE_DIR= srcdir + '/lib/replace'
-LIBTALLOC_DIR=  srcdir + '/lib/talloc'
-
 def set_options(opt):
     opt.BUILTIN_DEFAULT('replace')
-    opt.BUNDLED_EXTENSION_DEFAULT('tevent', noextenion='tevent')
-    opt.recurse(LIBREPLACE_DIR)
-    opt.recurse(LIBTALLOC_DIR)
+    opt.BUNDLED_EXTENSION_DEFAULT('tevent', noextension='tevent')
+    opt.RECURSE('lib/replace')
+    opt.RECURSE('lib/talloc')
 
 def configure(conf):
-    conf.sub_config(LIBREPLACE_DIR)
-    conf.sub_config(LIBTALLOC_DIR)
+    conf.RECURSE('lib/replace')
+    conf.RECURSE('lib/talloc')
+
+    conf.env.standalone_tevent = conf.IN_LAUNCH_DIR()
 
-    if conf.CHECK_BUNDLED_SYSTEM('tevent', minversion=VERSION,
-                                 onlyif='talloc', implied_deps='replace talloc'):
-        conf.define('USING_SYSTEM_TEVENT', 1)
+    if not conf.env.standalone_tevent:
+        if conf.CHECK_BUNDLED_SYSTEM('tevent', minversion=VERSION,
+                                     onlyif='talloc', implied_deps='replace talloc'):
+            conf.define('USING_SYSTEM_TEVENT', 1)
 
     if conf.CHECK_FUNCS('epoll_create', headers='sys/epoll.h'):
         conf.DEFINE('HAVE_EPOLL', 1)
@@ -42,8 +40,8 @@ def configure(conf):
     conf.SAMBA_CONFIG_H()
 
 def build(bld):
-    bld.BUILD_SUBDIR(LIBREPLACE_DIR)
-    bld.BUILD_SUBDIR(LIBTALLOC_DIR)
+    bld.RECURSE('lib/replace')
+    bld.RECURSE('lib/talloc')
 
     SRC = '''tevent.c tevent_debug.c tevent_fd.c tevent_immediate.c
              tevent_queue.c tevent_req.c tevent_select.c
@@ -57,4 +55,21 @@ def build(bld):
                           SRC,
                           deps='replace talloc',
                           enabled= not bld.CONFIG_SET('USING_SYSTEM_TEVENT'),
-                          vnum=VERSION)
+                          abi_file='ABI/tevent-%s.sigs' % VERSION,
+                          abi_match='tevent_* _tevent_*',
+                          vnum=VERSION, 
+                                                 is_bundled=not bld.env.standalone_tevent)
+
+    if bld.env.standalone_tevent:
+        bld.env.PKGCONFIGDIR = '${LIBDIR}/pkgconfig'
+        bld.PKG_CONFIG_FILES('tevent.pc', vnum=VERSION)
+        bld.INSTALL_FILES('${INCLUDEDIR}', 'tevent.h')
+
+def test(ctx):
+    '''test tevent'''
+    print("The tevent testsuite is part of smbtorture in samba4")
+
+
+def dist():
+    '''makes a tarball for distribution'''
+    samba_dist.dist()