Fix some bugs in the dynamic engraver and PostScript backend

[lilypond.git] / buildscripts / output-distance.py

diff --git a/buildscripts/output-distance.py b/buildscripts/output-distance.py
index 64811dbaa9448a8ebd30144dbef753737f9c48a3..a19380f1f28b4c9cfbd4aad84749d89e3c733954 100644 (file)
--- a/buildscripts/output-distance.py
+++ b/buildscripts/output-distance.py
@@ -217,13 +217,10 @@ class ComparisonData:
     def compare_trees (self, dir1, dir2):
         self.compare_directories (dir1, dir2)
         
-        (root, dirs, files) = os.walk (dir1).next ()
+        (root, files, dirs) = os.walk (dir1).next ()
         for d in dirs:
             d1 = os.path.join (dir1, d)
             d2 = os.path.join (dir2, d)
-
-            if os.path.islink (d1) or os.path.islink (d2):
-                continue
             
             if os.path.isdir (d2):
                 self.compare_trees (d1, d2)
@@ -281,16 +278,13 @@ class ComparisonData:
 
         html = ''
         old_prefix = os.path.split (dir1)[1]
-
-        dest_dir = os.path.join (dir2, old_prefix)
-        shutil.rmtree  (dest_dir, ignore_errors=True)
-        os.mkdir (dest_dir)
+        os.mkdir (dir2 + '/' + old_prefix)
         for (score, oldfile, newfile) in  results:
             old_base = re.sub ("-[0-9]+.signature", '', os.path.split (oldfile)[1])
             new_base = re.sub ("-[0-9]+.signature", '', newfile)
             
             for ext in 'png', 'ly':
-                shutil.copy2 (old_base + '.' + ext, dest_dir)
+                shutil.copy2 (old_base + '.' + ext, dir2 + '/' + old_prefix)
 
             img_1 = os.path.join (old_prefix, old_base + '.png')
             ly_1 = os.path.join (old_prefix, old_base + '.ly')