patch::: 1.5.14.jcn4

[lilypond.git] / stepmake / bin / package-diff.py

diff --git a/stepmake/bin/package-diff.py b/stepmake/bin/package-diff.py
index bc2c8a8eba31a2527f3c761b311dc49a05404cc4..e07dd3ade3c95d2b43dde802c13b49c524ab427d 100644 (file)
--- a/stepmake/bin/package-diff.py
+++ b/stepmake/bin/package-diff.py
@@ -6,11 +6,14 @@
 
 
 import find
+import fnmatch
 import sys
 import os
+import re
 import string
 import getopt
 import pipes
+
 topdir = ''
 def gulp_file(f):
        try:
@@ -90,12 +93,14 @@ def remove_automatic (dirnames):
                        cleanup ()
                        sys.exit (1)
 
-       dirs = map (lambda d: find.find ('out', d), dirnames)
+       dirs = map (lambda d: find.find ('out*', d), dirnames)
        dirs = reduce (lambda x,y:  x + y, dirs)
        
-       print dirs 
+       #print dirs
+
        for d in dirs:
-               files = files + find.find ('*', d)
+               if os.path.isdir (d):
+                       files = files + find.find ('*', d)
                
        for f in files:
                try:
@@ -172,8 +177,8 @@ def makediff (fromdir, todir, patch_name):
                        
        sys.stderr.write ('diffing to %s... ' % patch_name)
        os.system ('pwd')
-       print ('diff -urN %s . >> %s' % (fromdir, patch_name))
-       os.system ('diff -urN %s . >> %s' % (fromdir, patch_name))
+       print ('diff -purN %s . >> %s' % (fromdir, patch_name))
+       os.system ('diff -purN %s . >> %s' % (fromdir, patch_name))
        os.system ('gzip --quiet -9f %s' % patch_name)