wafsamba: Support make dist from bzr checkout.

diff --git a/buildtools/wafsamba/samba_dist.py b/buildtools/wafsamba/samba_dist.py
index 7cd4d54b013a27e08fc927f7145b364f30de67bb..b62f256ee42eb214f1918feb08bf0b55ddab52ef 100644 (file)
--- a/buildtools/wafsamba/samba_dist.py
+++ b/buildtools/wafsamba/samba_dist.py
@@ -103,11 +103,17 @@ def dist(appname='',version=''):
         else:
             destdir = '.'
         absdir = os.path.join(srcdir, dir)
-        git_cmd = [ 'git', 'ls-files', '--full-name', absdir ]
+        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(git_cmd).split()
+            files = Utils.cmd_output(ls_files_cmd).split()
         except:
-            Logs.error('git command failed: %s' % ' '.join(git_cmd))
+            Logs.error('command failed: %s' % ' '.join(ls_files_cmd))
             sys.exit(1)
         for f in files:
             abspath = os.path.join(srcdir, f)
@@ -124,6 +130,8 @@ def dist(appname='',version=''):
                     blacklisted = True
             if blacklisted:
                 continue
+            if os.path.isdir(abspath):
+                continue
             if destdir != '.':
                 f = destdir + '/' + f
             fname = dist_base + '/' + f