X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scripts%2Fauxiliar%2Fmakelsr.py;h=71c8179f36721a047821e23cd25d9bf20fbe3618;hb=HEAD;hp=61526963bed97875e7b1bb1fb4a61bdc678a3d46;hpb=512d405d07aba8742658902b105a94ebbd40c2dc;p=lilypond.git diff --git a/scripts/auxiliar/makelsr.py b/scripts/auxiliar/makelsr.py index 61526963be..71c8179f36 100755 --- a/scripts/auxiliar/makelsr.py +++ b/scripts/auxiliar/makelsr.py @@ -13,33 +13,36 @@ lys_from_lsr = os.path.join ('Documentation', 'snippets') new_lys = os.path.join ('Documentation', 'snippets', 'new') ly_output = os.path.join (tempfile.gettempdir (), 'lsrtest') -# which convert-ly to use -if os.path.isfile ("out/bin/convert-ly"): - conv_path = "out/bin/" +# which convert-ly and lilypond to use +P = os.path.join (os.environ.get ("LILYPOND_BUILD_DIR", ""), + "out/bin/convert-ly") +if os.path.isfile (P): + conv_path = os.path.dirname (P) elif os.path.isfile ("build/out/bin/convert-ly"): conv_path = "build/out/bin/" else: conv_path='' -convert_ly = conv_path + 'convert-ly' -lilypond_bin = conv_path + 'lilypond' +convert_ly = os.path.join (conv_path, 'convert-ly') +lilypond_bin = os.path.join (conv_path, 'lilypond') LY_HEADER_LSR = '''%% DO NOT EDIT this file manually; it is automatically -%% generated from LSR http://lsr.dsi.unimi.it +%% generated from LSR http://lsr.di.unimi.it %% Make any changes in LSR itself, or in Documentation/snippets/new/ , %% and then run scripts/auxiliar/makelsr.py %% %% This file is in the public domain. ''' +new_lys_marker = "%% generated from %s" % new_lys LY_HEADER_NEW = '''%% DO NOT EDIT this file manually; it is automatically -%% generated from %s +%s %% Make any changes in Documentation/snippets/new/ %% and then run scripts/auxiliar/makelsr.py %% %% This file is in the public domain. -''' % new_lys +''' % new_lys_marker options_parser = optparse.OptionParser ( description = "makelsr - update snippets directory from LSR", @@ -76,7 +79,7 @@ options_parser.add_option ('-p', '--path', dest="bin_path", action="store", metavar="LY_PATH", - default="out/bin", + default=conv_path, help="directory where looking for LilyPond binaries") options_parser.add_option ('-c', '--convert-ly', @@ -154,27 +157,30 @@ if len (args): sys.exit (4) if len (args) > 1: exit_with_usage (2) + tags = os.listdir (in_dir) else: - in_dir = '.' + in_dir = '' + tags = [os.path.splitext (os.path.basename (f))[0] + for f in glob.glob (os.path.join (lys_from_lsr, '*.snippet-list'))] +## Make sure all users get the same ordering of tags +tags.sort () if options.convert_ly == "LY_PATH/convert-ly": convert_ly = os.path.join (options.bin_path, "convert-ly") else: convert_ly = options.convert_ly -if not os.path.isfile (convert_ly): - sys.stderr.write ("Warning: %s: no such file") +if not os.path.exists (convert_ly): + sys.stderr.write ("Warning: %s: no such file\n" % convert_ly) convert_ly = "convert-ly" if options.lilypond_bin == "LY_PATH/lilypond": lilypond_bin = os.path.join (options.bin_path, "lilypond") else: lilypond_bin = options.lilypond_bin -if not os.path.isfile (lilypond_bin): - sys.stderr.write ("Warning: %s: no such file") +if not os.path.exists (lilypond_bin): + sys.stderr.write ("Warning: %s: no such file\n" % lilypond_bin) lilypond_bin = "lilypond" sys.stderr.write ("Using %s, %s\n" % (convert_ly, lilypond_bin)) -tags = os.listdir (in_dir) - unsafe = [] unconverted = [] notags_files = [] @@ -200,13 +206,14 @@ lsr_comment_re = re.compile (r'\s*%+\s*LSR.*') begin_header_re = re.compile (r'\\header\s*{', re.M) ly_new_version_re = re.compile (r'\\version\s*"(.+?)"') strip_white_spaces_re = re.compile (r'[ \t]+(?=\n)') +final_empty_lines_re = re.compile (r'\n{2,}$') # add tags to ly files from LSR def add_tags (ly_code, tags): return begin_header_re.sub ('\\g<0>\n lsrtags = "' + tags + '"\n', ly_code, 1) -# for snippets from input/new, add message for earliest working version +# for snippets from Documentation/snippets/new, add message for earliest working version def add_version (ly_code): return '''%% Note: this file works from version ''' + \ ly_new_version_re.search (ly_code).group (1) + '\n' @@ -242,7 +249,9 @@ def copy_ly (srcdir, name, tags): s = mark_verbatim_section (s) s = lsr_comment_re.sub ('', s) s = strip_white_spaces_re.sub ('', s) + s = final_empty_lines_re.sub ('\n', s) s = escape_backslashes_in_header (s) + s = s.replace ("\r\n", "\n") sys.stderr.write ("makelsr.py: writing %s\n" % dest) open (dest, 'w').write (s) @@ -260,65 +269,74 @@ def copy_ly (srcdir, name, tags): unsafe.append (dest) def read_source_with_dirs (src): - s = {} - l = {} + snippet_list = {} + tag_list = {} for tag in tags: srcdir = os.path.join (src, tag) - l[tag] = set (map (os.path.basename, + tag_list[tag] = set (map (os.path.basename, glob.glob (os.path.join (srcdir, '*.ly')))) - for f in l[tag]: - if f in s: - s[f][1].append (tag) + for f in tag_list[tag]: + if f in snippet_list: + snippet_list[f][1].append (tag) else: - s[f] = (srcdir, [tag]) - return s, l + snippet_list[f] = (srcdir, [tag]) + return snippet_list tags_re = re.compile ('lsrtags\\s*=\\s*"(.+?)"') def read_source (src): - s = {} - l = dict ([(tag, set()) for tag in tags]) + snippet_list = {} + tag_list = dict ([(tag, set()) for tag in tags]) for f in glob.glob (os.path.join (src, '*.ly')): basename = os.path.basename (f) m = tags_re.search (open (f, 'r').read ()) if m: file_tags = [tag.strip() for tag in m.group (1). split(',')] - s[basename] = (src, file_tags) - [l[tag].add (basename) for tag in file_tags if tag in tags] + snippet_list[basename] = (src, file_tags) + for tag in file_tags: + if tag in tags: + tag_list[tag].add (basename) + else: + tag_list[tag] = set ((basename,)) else: notags_files.append (f) - return s, l + return snippet_list, tag_list -def dump_file_list (file, file_list, update=False): - if update: - old_list = set (open (file, 'r').read ().splitlines ()) - old_list.update (file_list) - new_list = list (old_list) - else: - new_list = file_list +def dump_file_list (file, file_list): + new_list = file_list f = open (file, 'w') f.write ('\n'.join (sorted (new_list)) + '\n') -## clean out existing lys and generated files -map (os.remove, glob.glob (os.path.join (lys_from_lsr, '*.ly')) + - glob.glob (os.path.join (lys_from_lsr, '*.snippet-list'))) +## clean out existing lys and generated files - but when we're +## not recreating all of them from the tarball don't delete +## snippets that came from LSR. +if in_dir: + map (os.remove, glob.glob (os.path.join (lys_from_lsr, '*.ly')) + + glob.glob (os.path.join (lys_from_lsr, '*.snippet-list'))) +else: + map (os.remove, glob.glob (os.path.join (lys_from_lsr, '*.snippet-list'))) + for f in glob.glob (os.path.join (lys_from_lsr, '*.ly')): + if new_lys_marker in open (f).read (): + os.remove (f) +snippets = {} +if in_dir: + # read LSR source where tags are defined by subdirs + snippets = read_source_with_dirs (in_dir) + +# read Documentation/snippets/new where tags are directly defined +snippets_new, not_used_list = read_source (new_lys) +snippets.update (snippets_new) -# read LSR source where tags are defined by subdirs -snippets, tag_lists = read_source_with_dirs (in_dir) +for (name, (srcdir, file_tags)) in snippets.items (): + copy_ly (srcdir, name, file_tags) -# read input/new where tags are directly defined -s, l = read_source (new_lys) -snippets.update (s) -for t in tags: - tag_lists[t].update (l[t]) +not_used_snippets, tag_lists = read_source (lys_from_lsr) -for (name, (srcdir, tags)) in snippets.items (): - copy_ly (srcdir, name, tags) for (tag, file_set) in tag_lists.items (): dump_file_list (os.path.join (lys_from_lsr, tag + '.snippet-list'), - file_set, update=not(in_dir)) + file_set) if unconverted: sys.stderr.write ('These files could not be converted successfully by convert-ly:\n') sys.stderr.write ('\n'.join (unconverted) + '\n\n')