diff options
| author | Andrew Tridgell <tridge@samba.org> | 2010-04-04 10:06:34 +1000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2010-04-06 20:27:25 +1000 |
| commit | 528d7c7cf39fe9d8867d751f0a3c26f413301515 (patch) | |
| tree | 3c1f25dadfd96ba179ec338740c3906d37ed6076 /buildtools | |
| parent | c8062fb65ee108fa948fd8d8ed4055ffa3af7027 (diff) | |
| download | samba-528d7c7cf39fe9d8867d751f0a3c26f413301515.tar.gz samba-528d7c7cf39fe9d8867d751f0a3c26f413301515.tar.xz samba-528d7c7cf39fe9d8867d751f0a3c26f413301515.zip | |
s4-waf: added 'waf dist' to our standalone libs as well
Diffstat (limited to 'buildtools')
| -rw-r--r-- | buildtools/wafsamba/samba_dist.py | 10 | ||||
| -rw-r--r-- | buildtools/wafsamba/wafsamba.py | 1 |
2 files changed, 7 insertions, 4 deletions
diff --git a/buildtools/wafsamba/samba_dist.py b/buildtools/wafsamba/samba_dist.py index 88268b53cea..87ea8ccbefe 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 diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py index 2cfbe7a5835..f9cb1a882fd 100644 --- a/buildtools/wafsamba/wafsamba.py +++ b/buildtools/wafsamba/wafsamba.py @@ -23,6 +23,7 @@ import samba_conftests import tru64cc import irixcc import generic_cc +import samba_dist # some systems have broken threading in python if os.environ.get('WAF_NOTHREADS') == '1': |