summaryrefslogtreecommitdiff
path: root/buildtools/wafsamba
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2010-04-05 09:58:23 +1000
committerAndrew Tridgell <tridge@samba.org>2010-04-06 20:27:26 +1000
commit7ae4372124a7fde2404f9e626054e7856c18f733 (patch)
tree59364b75d27fbe530032e0ac0648004567719b2a /buildtools/wafsamba
parentfe060c8f50de23c4f3503a32c3237bb80bd68331 (diff)
downloadsamba-7ae4372124a7fde2404f9e626054e7856c18f733.tar.gz
samba-7ae4372124a7fde2404f9e626054e7856c18f733.tar.bz2
samba-7ae4372124a7fde2404f9e626054e7856c18f733.zip
s4-waf: fixed waf distcheck for our standalone libs and s4
Diffstat (limited to 'buildtools/wafsamba')
-rw-r--r--buildtools/wafsamba/samba_dist.py11
1 files changed, 8 insertions, 3 deletions
diff --git a/buildtools/wafsamba/samba_dist.py b/buildtools/wafsamba/samba_dist.py
index 3663bc0bf5..e01bebe9ed 100644
--- a/buildtools/wafsamba/samba_dist.py
+++ b/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