# customised version of 'waf dist' for Samba tools
# uses git ls-files to get file lists
-import Utils, os, sys, tarfile, gzip, stat, Scripting, Logs, Options
-from samba_utils import *
+import os, sys, tarfile
+from waflib import Utils, Scripting, Logs, Options
+from waflib.Configure import conf
+from samba_utils import os_path_relpath
+from waflib import Context
dist_dirs = None
+dist_files = None
dist_blacklist = ""
+dist_archive = None
+
+class Dist(Context.Context):
+ # TODO remove
+ cmd = 'dist'
+ fun = 'dist'
+ def execute(self):
+ Context.g_module.dist()
+
+class DistCheck(Scripting.DistCheck):
+ fun = 'distcheck'
+ cmd = 'distcheck'
+ def execute(self):
+ Options.options.distcheck_args = ''
+ if Context.g_module.distcheck is Scripting.distcheck:
+ # default
+ Context.g_module.distcheck(self)
+ else:
+ Context.g_module.distcheck()
+ Context.g_module.dist()
+ self.check()
+ def get_arch_name(self):
+ global dist_archive
+ return dist_archive
+ def make_distcheck_cmd(self, tmpdir):
+ waf = os.path.abspath(sys.argv[0])
+ return [sys.executable, waf, 'configure', 'build', 'install', 'uninstall', '--destdir=' + tmpdir]
def add_symlink(tar, fname, abspath, basedir):
'''handle symlinks to directories that may move during packaging'''
fh.close()
-def dist(appname='',version=''):
+def vcs_dir_contents(path):
+ """Return the versioned files under a path.
+
+ :return: List of paths relative to path
+ """
+ repo = path
+ while repo != "/":
+ if os.path.isdir(os.path.join(repo, ".git")):
+ ls_files_cmd = [ 'git', 'ls-files', '--full-name',
+ os_path_relpath(path, repo) ]
+ cwd = None
+ env = dict(os.environ)
+ env["GIT_DIR"] = os.path.join(repo, ".git")
+ break
+ repo = os.path.dirname(repo)
+ if repo == "/":
+ raise Exception("unsupported or no vcs for %s" % path)
+ return Utils.cmd_output(ls_files_cmd, cwd=cwd, env=env).split('\n')
+
+
+def dist(appname='', version=''):
+
+ def add_files_to_tarball(tar, srcdir, srcsubdir, dstdir, dstsubdir, blacklist, files):
+ if blacklist is None:
+ blacklist = []
+ for f in files:
+ abspath = os.path.join(srcdir, f)
+
+ if srcsubdir != '.':
+ f = f[len(srcsubdir)+1:]
+
+ # Remove files in the blacklist
+ if f in blacklist:
+ continue
+ blacklisted = False
+ # Remove directories in the blacklist
+ for d in blacklist:
+ if f.startswith(d):
+ blacklisted = True
+ if blacklisted:
+ continue
+ if os.path.isdir(abspath) and not os.path.islink(abspath):
+ continue
+ if dstsubdir != '.':
+ f = dstsubdir + '/' + f
+ fname = dstdir + '/' + f
+ add_tarfile(tar, fname, abspath, srcsubdir)
+
+
+ def list_directory_files(path):
+ curdir = os.getcwd()
+ os.chdir(srcdir)
+ out_files = []
+ for root, dirs, files in os.walk(path):
+ for f in files:
+ out_files.append(os.path.join(root, f))
+ os.chdir(curdir)
+ return out_files
+
+
if not isinstance(appname, str) or not appname:
# this copes with a mismatch in the calling arguments for dist()
- appname = Utils.g_module.APPNAME
- version = Utils.g_module.VERSION
+ appname = Context.g_module.APPNAME
+ version = Context.g_module.VERSION
if not version:
- version = Utils.g_module.VERSION
+ version = Context.g_module.VERSION
- srcdir = os.path.normpath(os.path.join(os.path.dirname(Utils.g_module.root_path), Utils.g_module.srcdir))
+ srcdir = os.path.normpath(
+ os.path.join(os.path.dirname(Context.g_module.root_path),
+ Context.g_module.top))
if not dist_dirs:
Logs.error('You must use samba_dist.DIST_DIRS() to set which directories to package')
else:
destdir = '.'
absdir = os.path.join(srcdir, dir)
- if os.path.isdir(os.path.join(absdir, ".git")):
- ls_files_cmd = [ 'git', 'ls-files', '--full-name', absdir ]
- elif os.path.isdir(os.path.join(absdir, ".bzr")):
- ls_files_cmd = [ 'bzr', 'ls', '--from-root', '--recursive', '-d', absdir ]
- else:
- Logs.error('unknown or no vcs for %s' % absdir)
- sys.exit(1)
try:
- files = Utils.cmd_output(ls_files_cmd).split()
- except:
- Logs.error('command failed: %s' % ' '.join(ls_files_cmd))
+ files = vcs_dir_contents(absdir)
+ except Exception as e:
+ Logs.error('unable to get contents of %s: %s' % (absdir, e))
sys.exit(1)
- for f in files:
- abspath = os.path.join(srcdir, f)
- if dir != '.':
- f = f[len(dir)+1:]
+ add_files_to_tarball(tar, srcdir, dir, dist_base, destdir, blacklist, files)
- # Remove files in the blacklist
- if f in dist_blacklist:
- continue
- blacklisted = False
- # Remove directories in the blacklist
- for d in blacklist:
- if f.startswith(d):
- blacklisted = True
- if blacklisted:
- continue
- if os.path.isdir(abspath):
- continue
- if destdir != '.':
- f = destdir + '/' + f
- 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 os.path.isdir(absfile) and not os.path.islink(absfile):
+ destdir = destfile
+ dir = file
+ files = list_directory_files(dir)
+ add_files_to_tarball(tar, srcdir, dir, dist_base, destdir, blacklist, files)
+ else:
+ fname = dist_base + '/' + destfile
+ add_tarfile(tar, fname, absfile, destfile)
tar.close()
if Options.options.SIGN_RELEASE:
+ import gzip
try:
os.unlink(dist_name + '.asc')
except OSError:
else:
Logs.info('Created %s' % dist_name)
+ # TODO use the ctx object instead
+ global dist_archive
+ dist_archive = dist_name
return dist_name
if not dist_dirs:
dist_dirs = dirs
+@conf
+def DIST_FILES(files, extend=False):
+ '''set additional files for packaging, relative to top srcdir'''
+ global dist_files
+ if not dist_files:
+ dist_files = files
+ elif extend:
+ dist_files = dist_files + " " + files
+
@conf
def DIST_BLACKLIST(blacklist):
'''set the files to exclude from packaging, relative to top srcdir'''
git.samba.org / samba.git / blobdiff