From 528d7c7cf39fe9d8867d751f0a3c26f413301515 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Sun, 4 Apr 2010 10:06:34 +1000 Subject: s4-waf: added 'waf dist' to our standalone libs as well --- buildtools/wafsamba/samba_dist.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'buildtools/wafsamba/samba_dist.py') diff --git a/buildtools/wafsamba/samba_dist.py b/buildtools/wafsamba/samba_dist.py index 88268b53ce..87ea8ccbef 100644 --- a/buildtools/wafsamba/samba_dist.py +++ b/buildtools/wafsamba/samba_dist.py @@ -1,7 +1,7 @@ # customised version of 'waf dist' for Samba tools # uses git ls-files to get file lists -import Utils, os, sys, tarfile, stat +import Utils, os, sys, tarfile, stat, Scripting from samba_utils import * def add_tarfile(tar, fname, abspath): @@ -16,10 +16,10 @@ def add_tarfile(tar, fname, abspath): fh.close() -def dist(appname='', version=''): +def dist(): - if not appname: appname = Utils.g_module.APPNAME - if not version: version = Utils.g_module.VERSION + appname = Utils.g_module.APPNAME + version = Utils.g_module.VERSION env = LOAD_ENVIRONMENT() srcdir = os.path.normpath(os.path.join(os.path.dirname(Utils.g_module.root_path), Utils.g_module.srcdir)) @@ -65,3 +65,5 @@ def DIST_DIRS(conf, dirs): '''set the directories to package, relative to top srcdir''' if not conf.env.DIST_DIRS: conf.env.DIST_DIRS = dirs + +Scripting.dist = dist -- cgit