s4-waf: fixed waf distcheck for our standalone libs and s4

buildtools/wafsamba/samba_dist.py

@@ -18,9 +18,13 @@ def add_tarfile(tar, fname, abspath):
     fh.close()
 
 
-def dist():
-    appname = Utils.g_module.APPNAME
-    version = Utils.g_module.VERSION
+def dist(appname='',version=''):
+    if not isinstance(appname, str):
+        # this copes with a mismatch in the calling arguments for dist()
+        appname = Utils.g_module.APPNAME
+        version = Utils.g_module.VERSION
+    if not version:
+        version = Utils.g_module.VERSION
 
     srcdir = os.path.normpath(os.path.join(os.path.dirname(Utils.g_module.root_path), Utils.g_module.srcdir))
 
@@ -58,6 +62,7 @@ def dist():
     tar.close()
 
     print('Created %s' % dist_name)
+    return dist_name
 
 
 @conf

lib/replace/wscript

@@ -353,3 +353,7 @@ def build(bld):
                         source='hdr_replace.h',
                         target='stdbool.h',
                         enabled = not bld.CONFIG_SET('HAVE_STDBOOL_H'))
+
+def dist():
+    '''makes a tarball for distribution'''
+    samba_dist.dist()

lib/talloc/wscript

@@ -66,3 +66,7 @@ def test(ctx):
     import Utils
     cmd = os.path.join(Utils.g_module.blddir, 'talloc_testsuite')
     os.system(cmd)
+
+def dist():
+    '''makes a tarball for distribution'''
+    samba_dist.dist()

lib/tdb/wscript

@@ -76,3 +76,7 @@ def test(ctx):
     import Utils
     cmd = os.path.join(Utils.g_module.blddir, 'tdbtorture')
     os.system(cmd)
+
+def dist():
+    '''makes a tarball for distribution'''
+    samba_dist.dist()

lib/tevent/wscript

@@ -58,3 +58,7 @@ 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()

source4/lib/ldb/wscript

@@ -15,8 +15,9 @@ sys.path.insert(0, srcdir + '/buildtools/wafsamba')
 
 import wafsamba, samba_dist
 
-samba_dist.DIST_DIRS('''lib/ldb:. lib/replace:lib/replace lib/talloc:lib/talloc
-                        lib/tdb:lib/tdb lib/tevent:lib/tevent buildtools:buildtools''')
+samba_dist.DIST_DIRS('''source4/lib/ldb:. lib/replace:lib/replace lib/talloc:lib/talloc
+                        lib/tdb:lib/tdb lib/tevent:lib/tevent lib/popt:lib/popt
+                        buildtools:buildtools''')
 
 
 def set_options(opt):
@@ -180,3 +181,7 @@ def test(ctx):
     import Utils
     cmd = 'tests/test-tdb.sh'
     os.system(cmd)
+
+def dist():
+    '''makes a tarball for distribution'''
+    samba_dist.dist()