X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=buildscripts%2Fmirrortree.py;h=507d56639ae8ad1723073abbd9c184f991722943;hb=5157c9ae198de75060258eb33ddc14ace0fdd1e0;hp=72a5672dcbfe7a03123d3ff5d7d7c814a5de5b2f;hpb=93d046c0e72b2d48c36472c6fc3dbaafd336eaa8;p=lilypond.git

diff --git a/buildscripts/mirrortree.py b/buildscripts/mirrortree.py
index 72a5672dcb..507d56639a 100644
--- a/buildscripts/mirrortree.py
+++ b/buildscripts/mirrortree.py
@@ -14,74 +14,49 @@ def new_link_path (link, dir, r):
             i += 1
     return '/'.join ([x for x in l if not r.match (x)])
 
-def hardlink_tree (input_roots = [],
-                   process_dirs = '.*',
-                   strip_dir_names = '',
-                   exclude_dirs = '',
-                   process_files = '.*',
-                   find_files = '',
-                   exclude_files = '',
-                   target_pattern = '',
-                   targets = ['.']):
-    """Mirror trees for different targets by hardlinking files.
+def walk_tree (tree_roots = [],
+               process_dirs = '.*',
+               exclude_dirs = '',
+               find_files = '.*',
+               exclude_files = ''):
+    """Walk directory trees and.returns (dirs, symlinks, files, extra_files) tuple.
 
     Arguments:
-     input_roots=DIRLIST      use DIRLIST as input tree roots list
+     tree_roots=DIRLIST      use DIRLIST as tree roots list
      process_dir=PATTERN      only process files in directories named PATTERN
-     strip_dir_names=PATTERN  strip directories names matching PATTERN 
-                                 (write their content to parent)
      exclude_dir=PATTERN      don't recurse into directories named PATTERN
-     process_files=PATTERN    filters files which are hardlinked
-     find_files=PATTERN       find files named PATTERN. The files list will be returned.
+     find_files=PATTERN    filters files which are hardlinked
      exclude_files=PATTERN    exclude files named PATTERN
-     target_pattern=STRING    use STRING as target root directory name pattern
-     targets=DIRLIST          mkdir each directory in DIRLIST and mirrors the tree into each
     """
-    process_files_re = re.compile (process_files)
     find_files_re = re.compile (find_files)
     exclude_dirs_re = re.compile (exclude_dirs)
     exclude_files_re = re.compile (exclude_files)
     process_dirs_re = re.compile (process_dirs)
-    strip_dir_names_re = re.compile (strip_dir_names)
-    do_strip_dir_names_re = re.compile ('/(?:' + strip_dir_names + ')')
 
-    found_files = []
+    dirs_paths = []
+    symlinks_paths = []
+    files_paths = []
 
-    if not '%s' in target_pattern:
-        target_pattern += '%s'
-    target_dirs = [target_pattern % s for s in targets]
-
-    map (os.mkdir, target_dirs)
-
-    for d in input_roots:
-        for in_dir, dirs, files in os.walk(d):
-            out_dir = strip_dir_names_re.sub ('', in_dir)
+    for d in tree_roots:
+        for current_dir, dirs, files in os.walk(d):
             i = 0
             while i < len(dirs):
                 if exclude_dirs_re.search (dirs[i]):
                     del dirs[i]
                 else:
-                    if os.path.islink (os.path.join (in_dir, dirs[i])):
-                        files.append (dirs[i])
+                    p = os.path.join (current_dir, dirs[i])
+                    if os.path.islink (p):
+                        symlinks_paths.append (p)
                     i += 1
-            if not strip_dir_names_re.match (os.path.basename (in_dir)):
-                for t in target_dirs:
-                    p = os.path.join (t, out_dir)
-                    if not os.path.isdir (p):
-                        os.mkdir (p)
-            if not process_dirs_re.search (in_dir):
+            if not process_dirs_re.search (current_dir):
                 continue
+            dirs_paths.append (current_dir)
             for f in files:
                 if exclude_files_re.match (f):
                     continue
-                in_file = os.path.join (in_dir, f)
-                if find_files_re.match (f):
-                    found_files.append (in_file)
-                if os.path.islink (in_file): # all symlinks are assumed to be relative and to point to files in the input trees
-                    link_path = new_link_path (os.path.normpath (os.readlink (in_file)), in_dir, do_strip_dir_names_re)
-                    for t in target_dirs:
-                        os.symlink (link_path, os.path.join (t, out_dir, f))
-                elif process_files_re.match (f):
-                    for t in target_dirs:
-                        os.link (in_file, os.path.join (t, out_dir, f))
-    return found_files
+                p = os.path.join (current_dir, f)
+                if os.path.islink (p):
+                    symlinks_paths.append (p)
+                elif find_files_re.match (f):
+                    files_paths.append (p)
+    return (dirs_paths, symlinks_paths, files_paths)