X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scripts%2Fconvert-ly.py;h=fd4dc3b8d8affc03d968c79011efc51c8466cbce;hb=7ed798f3a52a870f18a0df4ab62bca3a5ce459e6;hp=32345fc5ba503f16f784e10e9cb308e1fce00c8a;hpb=78048997cc654f95111ffac3c0d36b57d28e1cd7;p=lilypond.git diff --git a/scripts/convert-ly.py b/scripts/convert-ly.py index 32345fc5ba..fd4dc3b8d8 100644 --- a/scripts/convert-ly.py +++ b/scripts/convert-ly.py @@ -1,14 +1,25 @@ #!@TARGET_PYTHON@ -# + # convert-ly.py -- Update old LilyPond input files (fix name?) +# converting rules are found in python/convertrules.py + +# This file is part of LilyPond, the GNU music typesetter. # -# source file of the GNU LilyPond music typesetter -# -# (c) 1998--2007 Han-Wen Nienhuys +# Copyright (C) 1998--2010 Han-Wen Nienhuys # Jan Nieuwenhuizen # -# converting rules are found in python/convertrules.py +# LilyPond is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# LilyPond is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. # +# You should have received a copy of the GNU General Public License +# along with LilyPond. If not, see . import os import sys @@ -21,6 +32,8 @@ import re import lilylib as ly global _;_=ly._ +ly.require_python_version () + import convertrules lilypond_version_re_str = '\\\\version *\"([0-9.]+)"' @@ -32,8 +45,8 @@ _ ('''Update LilyPond input to newer version. By default, update from the version taken from the \\version command, to the current LilyPond version.''') + _ ("Examples:") + ''' - convert-ly -e old.ly - convert-ly --from=2.3.28 --to 2.5.21 foobar.ly + $ convert-ly -e old.ly + $ convert-ly --from=2.3.28 --to=2.5.21 foobar.ly > foobar-new.ly ''') copyright = ('Jan Nieuwenhuizen ', @@ -42,6 +55,9 @@ copyright = ('Jan Nieuwenhuizen ', program_name = os.path.basename (sys.argv[0]) program_version = '@TOPLEVEL_VERSION@' +authors = ('Jan Nieuwenhuizen ', + 'Han-Wen Nienhuys ') + error_file_write = ly.stderr_write def warning (s): @@ -56,17 +72,16 @@ def identify (port=sys.stderr): def warranty (): identify () ly.encoded_write (sys.stdout, ''' -Copyright (c) %s by +%s - Han-Wen Nienhuys - Jan Nieuwenhuizen +%s %s %s -''' ( '2001--2006', - _ ("Distributed under terms of the GNU General Public License."), - _ ('It comes with NO WARRANTY.'))) - +''' % ( _ ('Copyright (c) %s by') % '2001--2010', + ' '.join (authors), + _ ('Distributed under terms of the GNU General Public License.'), + _ ('It comes with NO WARRANTY.'))) def get_option_parser (): p = ly.get_option_parser (usage=_ ("%s [OPTION]... FILE") % 'convert-ly', @@ -105,7 +120,7 @@ def get_option_parser (): default=False) p.add_option ("-s", '--show-rules', - help=_ ("show rules [default: --from=0, --to=%s]") % program_version, + help=_ ("show rules [default: -f 0, -t %s]") % program_version, dest='show_rules', action='store_true', default=False) @@ -115,18 +130,21 @@ def get_option_parser (): action='store', dest="to_version", default='') - - p.add_option_group (ly.display_encode (_ ('Bugs')), - description=(_ ("Report bugs via") - + ''' http://post.gmane.org/post.php''' - '''?group=gmane.comp.gnu.lilypond.bugs\n''')) + p.add_option ('-w', '--warranty', help=_ ("show warranty and copyright"), + action='store_true', + ), + p.add_option_group ('', + description=( + _ ("Report bugs via %s") + % 'http://post.gmane.org/post.php' + '?group=gmane.comp.gnu.lilypond.bugs') + '\n') return p def str_to_tuple (s): - return tuple ([int n for n in s.split ('.')]) + return tuple ([int(n) for n in s.split ('.')]) def tup_to_str (t): return '.'.join (['%s' % x for x in t]) @@ -143,8 +161,6 @@ def get_conversions (from_version, to_version): return filter (is_applicable, convertrules.conversions) def latest_version (): - if global_options.force_current_version: - return str_to_tuple (program_version) return convertrules.conversions[-1][0] def show_rules (file, from_version, to_version): @@ -174,7 +190,7 @@ string.""" error_file_write ('\n' + _ ("Error while converting") + '\n' - + _ ("Stopping at last succesful rule") + + _ ("Stopping at last successful rule") + '\n') return (last_conversion, str) @@ -188,12 +204,16 @@ def guess_lilypond_version (input): else: return '' -class FatalConversionError: +class FatalConversionError (Exception): pass -class UnknownVersion: +class UnknownVersion (Exception): pass +class InvalidVersion (Exception): + def __init__ (self, version): + self.version = version + def do_one_file (infile_name): ly.stderr_write (_ ("Processing `%s\'... ") % infile_name) sys.stderr.write ('\n') @@ -220,11 +240,16 @@ def do_one_file (infile_name): else: to_version = latest_version () + if len (from_version) != 3: + raise InvalidVersion (".".join ([str(n) for n in from_version])) + (last, result) = do_conversion (input, from_version, to_version) - infile.close () if last: + if global_options.force_current_version and last == to_version: + last = str_to_tuple (program_version) + newversion = r'\version "%s"' % tup_to_str (last) if lilypond_version_re.search (result): result = re.sub (lilypond_version_re_str, @@ -253,6 +278,9 @@ def do_options (): opt_parser = get_option_parser() (options, args) = opt_parser.parse_args () + if options.warranty: + warranty () + sys.exit (0) if options.from_version: options.from_version = str_to_tuple (options.from_version) @@ -283,14 +311,21 @@ def main (): if f == '-': f = '' elif not os.path.isfile (f): - error (_ ("cannot open file: `%s'") % f) + error (_ ("%s: Unable to open file") % f) if len (files) == 1: sys.exit (1) continue try: do_one_file (f) except UnknownVersion: - error (_ ("cannot determine version for `%s'. Skipping") % f) + error (_ ("%s: Unable to determine version. Skipping") % f) + except InvalidVersion: + # Compat code for 2.x and 3.0 syntax ("except .. as v" doesn't + # work in python 2.4!): + t, v, b = sys.exc_info () + error (_ ("%s: Invalid version string `%s' \n" + "Valid version strings consist of three numbers, " + "separated by dots, e.g. `2.8.12'") % (f, v.version) ) sys.stderr.write ('\n')