From c6d314f038629a7054e72b6212bd5b8b7bba2d2c Mon Sep 17 00:00:00 2001 From: Pedro Kroger Date: Thu, 9 Sep 2004 00:10:22 +0000 Subject: [PATCH] Changed scripts/* to use sys.argv[0] --- ChangeLog | 18 ++++++++++++++++++ scripts/abc2ly.py | 12 ++++++------ scripts/convert-ly.py | 7 ++++--- scripts/etf2ly.py | 11 ++++++----- scripts/lilypond-book.py | 2 +- scripts/lilypond-latex.py | 2 +- scripts/midi2ly.py | 2 +- scripts/mup2ly.py | 2 +- scripts/ps2png.py | 2 +- 9 files changed, 39 insertions(+), 19 deletions(-) diff --git a/ChangeLog b/ChangeLog index fdf0a2ea7e..48a4029013 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,21 @@ +2004-09-08 Pedro Kroger + + * scripts/convert-ly.py (program_name): changed to sys.argv[0] + + * scripts/abc2ly.py (program_name): changed to sys.argv[0] + + * scripts/etf2ly.py (program_name): changed to sys.argv[0] + + * scripts/lilypond-book.py (program_name): changed to sys.argv[0] + + * scripts/lilypond-latex.py (program_name): changed to sys.argv[0] + + * scripts/midi2ly.py (program_name): changed to sys.argv[0] + + * scripts/mup2ly.py (program_name): changed to sys.argv[0] + + * scripts/ps2png.py (program_name): changed to sys.argv[0] + 2004-09-09 Jan Nieuwenhuizen * scm/output-gnome.scm (placebox): Shield affine-relative. diff --git a/scripts/abc2ly.py b/scripts/abc2ly.py index 7f34bbfd9c..9a07613647 100644 --- a/scripts/abc2ly.py +++ b/scripts/abc2ly.py @@ -66,12 +66,7 @@ # UNDEF -> None # - -program_name = 'abc2ly' -version = '@TOPLEVEL_VERSION@' -if version == '@' + 'TOPLEVEL_VERSION' + '@': - version = '(unknown version)' # uGUHGUHGHGUGH - + import __main__ import getopt import sys @@ -79,6 +74,11 @@ import re import string import os +program_name = sys.argv[0] + +version = '@TOPLEVEL_VERSION@' +if version == '@' + 'TOPLEVEL_VERSION' + '@': + version = '(unknown version)' # uGUHGUHGHGUGH UNDEF = 255 state = UNDEF diff --git a/scripts/convert-ly.py b/scripts/convert-ly.py index 5e60e25b90..b683a293f3 100644 --- a/scripts/convert-ly.py +++ b/scripts/convert-ly.py @@ -15,9 +15,6 @@ # 0.2 # - rewrite in python -program_name = 'convert-ly' -version = '@TOPLEVEL_VERSION@' - import os import sys import __main__ @@ -26,6 +23,10 @@ import string import re import time +program_name = sys.argv[0] + +version = '@TOPLEVEL_VERSION@' + # Did we ever have \mudela-version? I doubt it. # lilypond_version_re_str = '\\\\version *\"(.*)\"' lilypond_version_re_str = '\\\\(mudela-)?version *\"([^"]+)\"' diff --git a/scripts/etf2ly.py b/scripts/etf2ly.py index 307f16c449..8e2397b4fd 100644 --- a/scripts/etf2ly.py +++ b/scripts/etf2ly.py @@ -26,11 +26,6 @@ # -program_name = 'etf2ly' -version = '@TOPLEVEL_VERSION@' -if version == '@' + 'TOPLEVEL_VERSION' + '@': - version = '(unknown version)' # uGUHGUHGHGUGH - import __main__ import getopt import sys @@ -38,6 +33,12 @@ import re import string import os +program_name = sys.argv[0] + +version = '@TOPLEVEL_VERSION@' +if version == '@' + 'TOPLEVEL_VERSION' + '@': + version = '(unknown version)' # uGUHGUHGHGUGH + finale_clefs= ['treble', 'alto', 'tenor', 'bass', 'percussion', 'treble_8', 'bass_8', 'baritone'] def lily_clef (fin): diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py index 7d8d2af528..44ba8e60ff 100644 --- a/scripts/lilypond-book.py +++ b/scripts/lilypond-book.py @@ -67,7 +67,7 @@ global re;re = ly.re # lilylib globals program_version = '@TOPLEVEL_VERSION@' -program_name = 'lilypond-book' +program_name = sys.argv[0] verbose_p = 0 pseudo_filter_p = 0 original_dir = os.getcwd () diff --git a/scripts/lilypond-latex.py b/scripts/lilypond-latex.py index 67adc7f4c5..4b2fe4c2ed 100644 --- a/scripts/lilypond-latex.py +++ b/scripts/lilypond-latex.py @@ -82,7 +82,7 @@ global _;_=ly._ global re;re = ly.re # lilylib globals -program_name = 'lilypond-latex' +program_name = sys.argv[0] program_version = '@TOPLEVEL_VERSION@' # input without \book, use classic latex definitions classic_p = 0 diff --git a/scripts/midi2ly.py b/scripts/midi2ly.py index b679a364d4..e8244decf5 100644 --- a/scripts/midi2ly.py +++ b/scripts/midi2ly.py @@ -80,7 +80,7 @@ except: def _ (s): return s -program_name = 'midi2ly' +program_name = sys.argv[0] program_version = '@TOPLEVEL_VERSION@' errorport = sys.stderr diff --git a/scripts/mup2ly.py b/scripts/mup2ly.py index e6e1050baf..e1ba8b8fda 100644 --- a/scripts/mup2ly.py +++ b/scripts/mup2ly.py @@ -47,7 +47,7 @@ else: sys.path.append (os.path.join (datadir, 'python')) sys.path.append (os.path.join (datadir, 'python/out')) -program_name = 'mup2ly' +program_name = sys.argv[0] program_version = '@TOPLEVEL_VERSION@' original_dir = os.getcwd () temp_dir = os.path.join (original_dir, '%s.dir' % program_name) diff --git a/scripts/ps2png.py b/scripts/ps2png.py index 5a1a969183..a84e7ab476 100644 --- a/scripts/ps2png.py +++ b/scripts/ps2png.py @@ -27,7 +27,7 @@ global re;re = ly.re preview_resolution = 90 # lilylib globals -program_name = 'ps2png' +program_name = sys.argv[0] verbose_p = 0 program_version = '@TOPLEVEL_VERSION@' pseudo_filter_p = 0 # ugr. -- 2.39.2