diff options
author | Björn Baumbach <bb@sernet.de> | 2012-06-14 19:07:23 +0200 |
---|---|---|
committer | Andrew Bartlett <abartlet@samba.org> | 2012-07-03 15:32:09 +0200 |
commit | f48f65e695da57cb12e68a5b1d82d05874863344 (patch) | |
tree | 3a646f356ea6511086c9d978827e7b36b9ae711b /buildtools/wafsamba/samba_dist.py | |
parent | ec3d1f09fa7ad50297e832cd25e2859cafbf00c5 (diff) | |
download | samba-f48f65e695da57cb12e68a5b1d82d05874863344.tar.gz samba-f48f65e695da57cb12e68a5b1d82d05874863344.tar.bz2 samba-f48f65e695da57cb12e68a5b1d82d05874863344.zip |
wafsamba: samba_version: add samba version suffix to vcs_fields
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'buildtools/wafsamba/samba_dist.py')
-rw-r--r-- | buildtools/wafsamba/samba_dist.py | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/buildtools/wafsamba/samba_dist.py b/buildtools/wafsamba/samba_dist.py index 79cb721b25..1f56f2e3ec 100644 --- a/buildtools/wafsamba/samba_dist.py +++ b/buildtools/wafsamba/samba_dist.py @@ -5,6 +5,7 @@ import Utils, os, sys, tarfile, stat, Scripting, Logs, Options from samba_utils import * dist_dirs = None +dist_files = None dist_blacklist = "" def add_symlink(tar, fname, abspath, basedir): @@ -157,6 +158,22 @@ def dist(appname='',version=''): fname = dist_base + '/' + f add_tarfile(tar, fname, abspath, dir) + if dist_files: + for file in dist_files.split(): + if file.find(':') != -1: + destfile = file.split(':')[1] + file = file.split(':')[0] + else: + destfile = file + + absfile = os.path.join(srcdir, file) + + if destfile != file: + file = destfile + + fname = dist_base + '/' + file + add_tarfile(tar, fname, absfile, file) + tar.close() if Options.options.SIGN_RELEASE: @@ -195,6 +212,13 @@ def DIST_DIRS(dirs): dist_dirs = dirs @conf +def DIST_FILES(files): + '''set additional files for packaging, relative to top srcdir''' + global dist_files + if not dist_files: + dist_files = files + +@conf def DIST_BLACKLIST(blacklist): '''set the files to exclude from packaging, relative to top srcdir''' global dist_blacklist |