X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=buildscripts%2Fmakelsr.py;h=f8ba3b0fb5810ef0a53ef7be8f8fa791ea40b96c;hb=e123c55b63ffdf006eeb8d24a2e0809ec49f1bfc;hp=f6e1c42629d1b72a87ee8a4376b3e8aa8e86d082;hpb=4cde44323fd02af2a12622bc29eb903a1e2d36be;p=lilypond.git

diff --git a/buildscripts/makelsr.py b/buildscripts/makelsr.py
index f6e1c42629..f8ba3b0fb5 100755
--- a/buildscripts/makelsr.py
+++ b/buildscripts/makelsr.py
@@ -4,8 +4,8 @@ import os
 import os.path
 import shutil
 
-# 'expressive' not available yet
-dirs = ['ancient','chords','connecting','contemporary','expressive','guitar','parts','repeats','spacing','staff','text','vocal']
+dirs = ['pitches']
+#dirs = ['ancient','chords','connecting','contemporary','expressive','education','guitar','parts','pitch','repeats','scheme','spacing','staff','text','vocal','other','nonmusic','engravers','instrument']
 notsafe=[]
 
 try:
@@ -18,6 +18,29 @@ def copy_with_warning(src, dest):
 	msg = '%%  Do not edit this file; it is auto-generated from LSR!\n'
 	open (dest, 'w').write( msg + open (src).read() )
 
+
+def copy_dir_with_test(srcdir, destdir):
+	global notsafe
+	global notconvert
+	if not(os.path.exists(srcdir)):
+		return
+	file_names = os.listdir (srcdir)
+	for file in file_names:
+		if (file.endswith ('.ly')):
+			src = os.path.join (srcdir, file)
+			destname = file.replace (';', '-')
+			dest = os.path.join (destdir, destname)
+			copy_with_warning(src, dest)
+			os.system('convert-ly -e ' + dest)
+			if os.path.exists( dest + '~' ):
+				os.remove( dest + '~' )
+			# the -V seems to make unsafe snippets fail nicer/sooner.
+			s = os.system('nice lilypond -V -dno-print-pages -dsafe -o /tmp/lsrtest ' + dest)
+			#s = os.system('nice lilypond -dno-print-pages -dsafe -o /tmp/lsrtest ' + dest)
+			if s:
+				notsafe.append(dest)
+
+
 for dir in dirs:
 	srcdir = os.path.join (in_dir, dir)
 	destdir = os.path.join ('input', 'lsr', dir)
@@ -26,31 +49,25 @@ for dir in dirs:
 		print "  and/or check that you have the right categories."
 		sys.exit()
 
+	## clean out existing files
 	file_names = os.listdir (destdir)
 	for file in file_names:
 		if (file.endswith ('.ly')):
-			if (file[:3] != 'AAA'):
-				os.remove( os.path.join(destdir,file) )
+			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', 'new', dir), destdir )
 
-	file_names = os.listdir (in_dir + dir)
-	for file in file_names:
-		src = os.path.join (srcdir, file)
-		dest = os.path.join (destdir, file)
-		copy_with_warning(src, dest)
-#		shutil.copyfile (src, dest)
-		s = os.system('lilypond -dsafe -dbackend=svg -o /tmp/lsrtest ' + dest)
-		if s:
-			notsafe.append(dest)
-			#raise 'Failed'
 
 file=open("lsr-unsafe.txt", 'w')
 for s in notsafe:
 	file.write(s+'\n')
 file.close()
+
 print
 print
 print "Unsafe files printed in lsr-unsafe.txt: CHECK MANUALLY!"
-print "  (probably with  xargs git-diff < lsr-unsafe.txt  )"
+print "  xargs git-diff < lsr-unsafe.txt"
 print
 
-