Merge branch 'master' of ssh+git://hanwen@git.sv.gnu.org/srv/git/lilypond

[lilypond.git] / buildscripts / makelsr.py

diff --git a/buildscripts/makelsr.py b/buildscripts/makelsr.py
index 5f56d4b5831b226ca52f3e1c1f0a02355505f6e6..6b72bbebee64fa69e4b4fc7079e483bbd70d2e45 100755 (executable)
--- a/buildscripts/makelsr.py
+++ b/buildscripts/makelsr.py
@@ -4,7 +4,7 @@ import os
 import os.path
 import shutil
 
-dirs = ['ancient','chords','connecting','contemporary','expressive','guitar','parts','repeats','spacing','staff','text','vocal']
+dirs = ['ancient','chords','connecting','contemporary','expressive','education','guitar','parts','pitch','repeats','scheme','spacing','staff','text','vocal','other']
 notsafe=[]
 
 try:
@@ -23,12 +23,14 @@ def copy_dir_with_test(srcdir, destdir):
                return
        file_names = os.listdir (srcdir)
        for file in file_names:
-               src = os.path.join (srcdir, file)
-               dest = os.path.join (destdir, file)
-               copy_with_warning(src, dest)
-               s = os.system('lilypond -dsafe -dbackend=svg -o /tmp/lsrtest ' + dest)
-               if s:
-                       notsafe.append(dest)
+               if (file.endswith ('.ly')):
+                       src = os.path.join (srcdir, file)
+                       dest = os.path.join (destdir, file)
+                       copy_with_warning(src, dest)
+                       os.system('convert-ly -e ' + dest)
+                       s = os.system('lilypond -dno-print-pages -dsafe -o /tmp/lsrtest ' + dest)
+                       if s:
+                               notsafe.append(dest)
 
 
 for dir in dirs:
@@ -45,11 +47,10 @@ for dir in dirs:
                if (file.endswith ('.ly')):
                        if (file[:3] != 'AAA'):
                                os.remove( os.path.join(destdir,file) )
-
        ## copy in new files from LSR download
        copy_dir_with_test( srcdir, destdir )
        ## copy in new files in source tree
-       copy_dir_with_test( os.path.join ('input', 'tolsr', dir), destdir )
+       copy_dir_with_test( os.path.join ('input', 'new', dir), destdir )
 
 
 file=open("lsr-unsafe.txt", 'w')
@@ -62,4 +63,3 @@ print "Unsafe files printed in lsr-unsafe.txt: CHECK MANUALLY!"
 print "  xargs git-diff < lsr-unsafe.txt"
 print
 
-