From: fred Date: Wed, 27 Mar 2002 01:21:44 +0000 (+0000) Subject: lilypond-1.5.18 X-Git-Tag: release/1.5.59~539 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=3679e6b3bd1d96c7ea5423f8dddb4a5a57f46ca5;p=lilypond.git lilypond-1.5.18 --- diff --git a/buildscripts/GNUmakefile b/buildscripts/GNUmakefile index d75ba0987b..c8f569c25b 100644 --- a/buildscripts/GNUmakefile +++ b/buildscripts/GNUmakefile @@ -3,7 +3,7 @@ depth = .. #STEPMAKE_TEMPLATES=script install install-out po STEPMAKE_TEMPLATES=script install po -INSTALLATION_FILES=$(outdir)/gettext.py +INSTALLATION_FILES=$(outdir)/gettext.py $(outdir)/lilylib.py INSTALLATION_DIR=$(datadir)/python include $(depth)/make/stepmake.make @@ -14,5 +14,5 @@ include $(depth)/make/stepmake.make #INSTALLATION_OUT_DIR1=$(datadir)/scripts #INSTALLATION_OUT_FILES1=$(outdir)/lilypond-login $(outdir)/lilypond-profile -all: $(outdir)/gettext.py +all: $(INSTALLATION_FILES) diff --git a/scripts/mup2ly.py b/scripts/mup2ly.py index 208aa76ae3..f7b7da1eff 100644 --- a/scripts/mup2ly.py +++ b/scripts/mup2ly.py @@ -34,194 +34,49 @@ import __main__ import operator import tempfile -# let's not yet clutter lily's po with this mup converter junk -def _ (s): - return s - -#sys.path.append ('@datadir@/python') -#import gettext -#gettext.bindtextdomain ('lilypond', '@localedir@') -#gettext.textdomain('lilypond') -#_ = gettext.gettext - +sys.path.append ('@datadir@/python') +sys.path.append ('@datadir@/buildscripts/out') +sys.path.append ('@datadir@/modules/out') +try: + import gettext + gettext.bindtextdomain ('lilypond', '@localedir@') + gettext.textdomain ('lilypond') + _ = gettext.gettext +except: + def _ (s): + return s +# Attempt to fix problems with limited stack size set by Python! +# Sets unlimited stack size. Note that the resource module only +# is available on UNIX. +try: + import resource + resource.setrlimit (resource.RLIMIT_STACK, (-1, -1)) +except: + pass program_name = 'mup2ly' -help_summary = _("Convert mup to ly") -output = 0 - -# lily_py.py -- options and stuff -# -# source file of the GNU LilyPond music typesetter - -# BEGIN Library for these? -# cut-n-paste from ly2dvi - -program_version = '@TOPLEVEL_VERSION@' -if program_version == '@' + 'TOPLEVEL_VERSION' + '@': - program_version = '1.3.142' - - -original_dir = os.getcwd () -temp_dir = '%s.dir' % program_name -keep_temp_dir_p = 0 -verbose_p = 0 - -def identify (): - sys.stdout.write ('%s (GNU LilyPond) %s\n' % (program_name, program_version)) - -def warranty (): - identify () - sys.stdout.write ('\n') - sys.stdout.write (_ ('Copyright (c) %s by' % ' 2001')) - sys.stdout.write ('\n') - sys.stdout.write (' Han-Wen Nienhuys') - sys.stdout.write (' Jan Nieuwenhuizen') - sys.stdout.write ('\n') - sys.stdout.write (_ (r''' -Distributed under terms of the GNU General Public License. It comes with -absolutely NO WARRANTY.''')) - sys.stdout.write ('\n') - -def progress (s): - if s[-1] != '\n': - s = s + '\n' - sys.stderr.write (s) - -def warning (s): - sys.stderr.write (_ ("warning: ") + s) - sys.stderr.write ('\n') - - -def error (s): - sys.stderr.write (_ ("error: ") + s) - sys.stderr.write ('\n') - raise _ ("Exiting ... ") - -def getopt_args (opts): - '''Construct arguments (LONG, SHORT) for getopt from list of options.''' - short = '' - long = [] - for o in opts: - if o[1]: - short = short + o[1] - if o[0]: - short = short + ':' - if o[2]: - l = o[2] - if o[0]: - l = l + '=' - long.append (l) - return (short, long) - -def option_help_str (o): - '''Transform one option description (4-tuple ) into neatly formatted string''' - sh = ' ' - if o[1]: - sh = '-%s' % o[1] - - sep = ' ' - if o[1] and o[2]: - sep = ',' - - long = '' - if o[2]: - long= '--%s' % o[2] - - arg = '' - if o[0]: - if o[2]: - arg = '=' - arg = arg + o[0] - return ' ' + sh + sep + long + arg - - -def options_help_str (opts): - '''Convert a list of options into a neatly formatted string''' - w = 0 - strs =[] - helps = [] - - for o in opts: - s = option_help_str (o) - strs.append ((s, o[3])) - if len (s) > w: - w = len (s) - - str = '' - for s in strs: - str = str + '%s%s%s\n' % (s[0], ' ' * (w - len(s[0]) + 3), s[1]) - return str - -def help (): - sys.stdout.write (_ ("Usage: %s [OPTION]... FILE") % program_name) - sys.stdout.write ('\n\n') - sys.stdout.write (help_summary) - sys.stdout.write ('\n\n') - sys.stdout.write (_ ("Options:")) - sys.stdout.write ('\n') - sys.stdout.write (options_help_str (option_definitions)) - sys.stdout.write ('\n') - warning (_ ("%s is far from completed. Not all constructs are recognised.") % program_name) - sys.stdout.write ('\n') - sys.stdout.write (_ ("Report bugs to %s") % 'bug-gnu-music@gnu.org') - sys.stdout.write ('\n') - sys.exit (0) - - -def setup_temp (): - global temp_dir - if not keep_temp_dir_p: - temp_dir = tempfile.mktemp (program_name) - try: - os.mkdir (temp_dir, 0777) - except OSError: - pass - - -def system (cmd, ignore_error = 0): - if verbose_p: - progress (_ ("Invoking `%s\'") % cmd) - st = os.system (cmd) - if st: - msg = ( _ ("error: ") + _ ("command exited with value %d") % st) - if ignore_error: - sys.stderr.write (msg + ' ' + _ ("(ignored)") + ' ') - else: - error (msg) - - return st - - -def cleanup_temp (): - if not keep_temp_dir_p: - if verbose_p: - progress (_ ('Cleaning up `%s\'') % temp_dir) - system ('rm -rf %s' % temp_dir) +package_name = 'lilypond' +help_summary = _ ("Convert mup to LilyPond source") +option_definitions = [ + ('', 'd', 'debug', _ ("debug")), + ('NAME[=EXP]', 'D', 'define', _ ("define macro NAME [optional expansion EXP]")), + ('', 'h', 'help', _ ("this help")), + ('FILE', 'o', 'output', _ ("write output to FILE")), + ('', 'E', 'pre-process', _ ("only pre-process")), + ('', 'V', 'verbose', _ ("verbose")), + ('', 'v', 'version', _ ("print version number")), + ('', 'w', 'warranty', _ ("show warranty and copyright")), + ] -def set_setting (dict, key, val): - try: - val = string.atof (val) - except ValueError: - #warning (_ ("invalid value: %s") % `val`) - pass - try: - dict[key].append (val) - except KeyError: - warning (_ ("no such setting: %s") % `key`) - dict[key] = [val] +from lilylib import * -def strip_extension (f, ext): - (p, e) = os.path.splitext (f) - if e == ext: - e = '' - return p + e -# END Library +output = 0 # # PMX cut and paste @@ -1110,18 +965,6 @@ class Pre_processor: s = '' - -option_definitions = [ - ('', 'd', 'debug', _ ("debug")), - ('NAME[=EXP]', 'D', 'define', _ ("define macro NAME [optional expansion EXP]")), - ('', 'h', 'help', _ ("this help")), - ('FILE', 'o', 'output', _ ("write output to FILE")), - ('', 'E', 'pre-process', _ ("only pre-process")), - ('', 'V', 'verbose', _ ("verbose")), - ('', 'v', 'version', _ ("print version number")), - ('', 'w', 'warranty', _ ("show warranty and copyright")), - ] - debug_p = 0 only_pre_process_p = 0 def debug (s): diff --git a/scripts/update-lily.py b/scripts/update-lily.py index 79f8040fc6..e60de66dba 100644 --- a/scripts/update-lily.py +++ b/scripts/update-lily.py @@ -31,208 +31,46 @@ import string import sys import __main__ + +url = 'file:/home/ftp/pub/gnu/LilyPond/development/lilypond-*.tar.gz' +url = 'ftp://appel.lilypond.org/pub/gnu/LilyPond/development/lilypond-*.tar.gz' +url = 'ftp://ftp.cs.uu.nl/pub/GNU/LilyPond/development/lilypond-*.tar.gz' + +remove_previous_p = 0 + + sys.path.append ('@datadir@/python') +sys.path.append ('@datadir@/buildscripts/out') + try: import gettext gettext.bindtextdomain ('lilypond', '@localedir@') - gettext.textdomain('lilypond') + gettext.textdomain ('lilypond') _ = gettext.gettext except: def _ (s): return s +# Attempt to fix problems with limited stack size set by Python! +# Sets unlimited stack size. Note that the resource module only +# is available on UNIX. +try: + import resource + resource.setrlimit (resource.RLIMIT_STACK, (-1, -1)) +except: + pass + + program_name = 'build-lily' package_name = 'lilypond' -help_summary = _("Fetch and rebuild from latest source package") +help_summary = _ ("Fetch and rebuild from latest source package") + build_root = os.path.join (os.environ ['HOME'], 'usr', 'src') release_dir = build_root + '/releases' patch_dir = build_root + '/patches' -notify = 0 - -build_command = ''' -set -x -cd %b && -[ -d %n-%v ] && exit 1 || true; -mkdir -p %n-%v -( -tar xzf %r/%t && -rm -f building && -ln -s %n-%v building && -cd %n-%v && -./configure --prefix=$HOME/usr && make all web -) >> %n-%v/log.txt 2>&1 && -rm -f %n && -ln -s %n-%v %n -''' - - -url = 'file:/home/ftp/pub/gnu/LilyPond/development/lilypond-*.tar.gz' -url = 'ftp://appel.lilypond.org/pub/gnu/LilyPond/development/lilypond-*.tar.gz' -url = 'ftp://ftp.cs.uu.nl/pub/GNU/LilyPond/development/lilypond-*.tar.gz' - -remove_previous_p = 0 - - -# lily_py.py -- options and stuff -# -# source file of the GNU LilyPond music typesetter - -# BEGIN Library for these? -# cut-n-paste from ly2dvi - -program_version = '@TOPLEVEL_VERSION@' -if program_version == '@' + 'TOPLEVEL_VERSION' + '@': - program_version = '1.3.142' - - original_dir = os.getcwd () -temp_dir = '%s.dir' % program_name -keep_temp_dir_p = 0 -verbose_p = 0 - -def identify (): - sys.stdout.write ('%s (GNU LilyPond) %s\n' % (program_name, program_version)) - -def warranty (): - identify () - sys.stdout.write ('\n') - sys.stdout.write (_ ('Copyright (c) %s by' % ' 2001')) - sys.stdout.write ('\n') - sys.stdout.write (' Han-Wen Nienhuys') - sys.stdout.write (' Jan Nieuwenhuizen') - sys.stdout.write ('\n') - sys.stdout.write (_ (r''' -Distributed under terms of the GNU General Public License. It comes with -NO WARRANTY.''')) - sys.stdout.write ('\n') - -def progress (s): - sys.stderr.write (s + '\n') - -def warning (s): - sys.stderr.write (_ ("warning: ") + s) - sys.stderr.write ('\n') - - -def error (s): - sys.stderr.write (_ ("error: ") + s) - sys.stderr.write ('\n') - raise _ ("Exiting ... ") - -def getopt_args (opts): - '''Construct arguments (LONG, SHORT) for getopt from list of options.''' - short = '' - long = [] - for o in opts: - if o[1]: - short = short + o[1] - if o[0]: - short = short + ':' - if o[2]: - l = o[2] - if o[0]: - l = l + '=' - long.append (l) - return (short, long) - -def option_help_str (o): - '''Transform one option description (4-tuple ) into neatly formatted string''' - sh = ' ' - if o[1]: - sh = '-%s' % o[1] - - sep = ' ' - if o[1] and o[2]: - sep = ',' - - long = '' - if o[2]: - long= '--%s' % o[2] - - arg = '' - if o[0]: - if o[2]: - arg = '=' - arg = arg + o[0] - return ' ' + sh + sep + long + arg - - -def options_help_str (opts): - '''Convert a list of options into a neatly formatted string''' - w = 0 - strs =[] - helps = [] - - for o in opts: - s = option_help_str (o) - strs.append ((s, o[3])) - if len (s) > w: - w = len (s) - - str = '' - for s in strs: - str = str + '%s%s%s\n' % (s[0], ' ' * (w - len(s[0]) + 3), s[1]) - return str - -def help (): - sys.stdout.write (_ ("Usage: %s [OPTION]... FILE") % program_name) - sys.stdout.write ('\n\n') - sys.stdout.write (help_summary) - sys.stdout.write ('\n\n') - sys.stdout.write (_ ("Options:")) - sys.stdout.write ('\n') - sys.stdout.write (options_help_str (option_definitions)) - sys.stdout.write ('\n\n') - sys.stdout.write (_ ("Report bugs to %s") % 'bug-gnu-music@gnu.org') - sys.stdout.write ('\n') - sys.exit (0) - - -def setup_temp (): - global temp_dir - if not keep_temp_dir_p: - temp_dir = tempfile.mktemp (program_name) - try: - os.mkdir (temp_dir, 0777) - except OSError: - pass - - -def system (cmd, ignore_error = 0): - if verbose_p: - progress (_ ("Invoking `%s\'") % cmd) - st = os.system (cmd) - if st: - msg = ( _ ("error: ") + _ ("command exited with value %d") % st) - if ignore_error: - sys.stderr.write (msg + ' ' + _ ("(ignored)") + ' ') - else: - error (msg) - - return st - +temp_dir = os.path.join (original_dir, '%s.dir' % program_name) -def cleanup_temp (): - if not keep_temp_dir_p: - if verbose_p: - progress (_ ("Cleaning `%s'...") % temp_dir) - system ('rm -rf %s' % temp_dir) - - -def set_setting (dict, key, val): - try: - val = string.atof (val) - except ValueError: - #warning (_ ("invalid value: %s") % `val`) - pass - - try: - dict[key].append (val) - except KeyError: - warning (_ ("no such setting: %s") % `key`) - dict[key] = [val] - -# END Library option_definitions = [ ('DIR', 'b', 'build-root', _ ("unpack and build in DIR [%s]") % build_root), @@ -253,6 +91,28 @@ option_definitions = [ ('', 'w', 'warranty', _ ("show warranty and copyright")), ] +from lilylib import * + + +notify = 0 + +build_command = ''' +set -x +cd %b && +[ -d %n-%v ] && exit 1 || true; +mkdir -p %n-%v +( +tar xzf %r/%t && +rm -f building && +ln -s %n-%v building && +cd %n-%v && +./configure --prefix=$HOME/usr && make all web +) >> %n-%v/log.txt 2>&1 && +rm -f %n && +ln -s %n-%v %n +''' + + def list_file (user, passwd, host, dir, file): match = [] for i in os.listdir (dir): @@ -379,13 +239,19 @@ def build (p): c = re.sub (i, expand[i], c) return system (c, 1) + + (sh, long) = getopt_args (__main__.option_definitions) try: - (options, files) = getopt.getopt (sys.argv[1:], sh, long) -except: + (options, files) = getopt.getopt(sys.argv[1:], sh, long) +except getopt.error, s: + errorport.write ('\n') + errorport.write (_ ("error: ") + _ ("getopt says: `%s\'" % s)) + errorport.write ('\n') + errorport.write ('\n') help () sys.exit (2) - + for opt in options: o = opt[0] a = opt[1]