(usage): Fix --help description. Apply

range also for --show-rules.

diff --git a/ChangeLog b/ChangeLog
index 3e5a54d57ec64fe191609e623aebd61e02b6b248..dceb344708606db8857f4d77a53b7008c4af2e2c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-10-18  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+       * scripts/convert-ly.py (usage): Fix --help description.  Apply
+       range also for --show-rules.
+
 2004-10-18  Werner Lemberg  <wl@gnu.org>
 
        * scripts/lilypond-book.py (Snippet, Include_snippet)

diff --git a/buildscripts/guile-gnome.sh b/buildscripts/guile-gnome.sh
index 92d82f4353b9b5d2262c977b0c8a07aea7e0b9df..194dad2c27e649bccdaa49c6724e4b306c593efe 100644 (file)
--- a/buildscripts/guile-gnome.sh
+++ b/buildscripts/guile-gnome.sh
@@ -21,10 +21,8 @@ SLIB_PATH=`locate slib/require.scm | head -1 | sed -s 's/require.scm//g'`
 
 # What extra modules to pull (eg: EXTRA="libgnomecanvas libwnck")
 EXTRA=${EXTRA-libgnomecanvas}
-GGVERSION=2.5.995
-#GGVERSION=2.5.991
-GWRAPVERSION=1.9.3rc1
-#GWRAPVERSION=1.9.1
+GGVERSION=2.7.91
+GWRAPVERSION=1.9.3
 
 download=$HOME/usr/src/releases
 [ -d $download ] || mkdir -p $download
@@ -111,8 +109,7 @@ if ! pkg-config --exact-version=1.9.1 g-wrap-2.0-guile; then
         ## ughr:
        mkdir -p g-wrap/libffi
     else
-       #$WGET http://savannah.nongnu.org/download/g-wrap/g-wrap-$GWRAPVERSION.tar.gz
-       $WGET http://stud3.tuwien.ac.at/~e9926584/tmp/g-wrap-$GWRAPVERSION.tar.gz
+       $WGET http://savannah.nongnu.org/download/g-wrap/g-wrap-$GWRAPVERSION.tar.gz
        tar xzf $download/g-wrap-$GWRAPVERSION.tar.gz
        ln -s g-wrap-$GWRAPVERSION g-wrap
     fi
@@ -180,7 +177,7 @@ if ! pkg-config --atleast-version=$GGVERSION guile-gnome-glib; then
        fi
        cd ..
     else
-       $WGET http://ambient.2y.net/wingo/tmp/guile-gnome-platform-$GGVERSION.tar.gz
+       $WGET http://download.gna.org/guile-gnome/releases/guile-gnome-platform-$GGVERSION.tar.gz
        tar xzf $download/guile-gnome-platform-$GGVERSION.tar.gz
        ln -s guile-gnome-platform-$GGVERSION guile-gnome
        cd guile-gnome

diff --git a/scripts/convert-ly.py b/scripts/convert-ly.py
index 9c32f628a4a644213036b36a55bf6659193b61bc..7b8fec0457351323c2e6fe3f2e990fd00c6ba98a 100644 (file)
--- a/scripts/convert-ly.py
+++ b/scripts/convert-ly.py
@@ -35,7 +35,7 @@ add_version = 1
 
 
 def program_id ():
-       return '%s (GNU LilyPond) %s' %(program_name,  version);
+       return '%s (GNU LilyPond) %s' % (program_name, version)
 
 def identify ():
        sys.stderr.write (program_id () + '\n')
@@ -49,9 +49,9 @@ input is guessed by default from \version directive.
 Options:
   -h, --help             print this help
   -e, --edit             edit in place
-  -f, --from=VERSION     start from version; overrides \version found in file
+  -f, --from=VERSION     start from version [default: \version found in file]
   -s, --show-rules       print all rules
-  -t, --to=VERSION       show target version
+  -t, --to=VERSION       end at version [default: @TOPLEVEL_VERSION@]
   -n, --no-version       don't add new version stamp
       --version          print program version
 
@@ -71,37 +71,22 @@ License, and you are welcome to change it and/or distribute copies of
 it under certain conditions.  invoke as `%s --warranty' for more
 information.
 
-""" % (program_id() , program_name))
+""" % (program_id (), program_name))
        
-def gulp_file(f):
-       try:
-               i = open(f)
-               i.seek (0, 2)
-               n = i.tell ()
-               i.seek (0,0)
-       except:
-               print 'can\'t open file: ' + f + '\n'
-               return ''
-       s = i.read (n)
-       if len (s) <= 0:
-               print 'gulped empty file: ' + f + '\n'
-       i.close ()
-       return s
-
 def str_to_tuple (s):
-       return tuple (map (string.atoi, string.split (s,'.')))
+       return tuple (map (string.atoi, string.split (s, '.')))
 
 def tup_to_str (t):
        return string.join (map (lambda x: '%s' % x, list (t)), '.')
 
 def version_cmp (t1, t2):
-       for x in [0,1,2]:
+       for x in [0, 1, 2]:
                if t1[x] - t2[x]:
                        return t1[x] - t2[x]
        return 0
 
 def guess_lilypond_version (filename):
-       s = gulp_file (filename)
+       s = open (filename).read ()
        m = lilypond_version_re.search (s)
        if m:
                return m.group (2)
@@ -115,7 +100,9 @@ conversions = []
 
 def show_rules (file):
        for x in conversions:
-               file.write  ('%s: %s\n' % (tup_to_str (x[0]), x[2]))
+               if (not from_version or x[0] > from_version) \
+                  and (not to_version or x[0] <= to_version):
+                       file.write  ('%s: %s\n' % (tup_to_str (x[0]), x[2]))
 
 ############################
                
@@ -2080,7 +2067,7 @@ conversions.append (((2,1, 36), conv,
 def conv (str):
        return str
 
-conversions.append (((2,2, 0), conv,
+conversions.append (((2, 2, 0), conv,
                     '''clean up version. '''))
 
 def conv (str):
@@ -2248,7 +2235,7 @@ def do_conversion (infile, from_version, outfile, to_version):
        last_conversion = ()
        try:
                for x in conv_list:
-                       sys.stderr.write (tup_to_str (x[0])  + ', ')
+                       sys.stderr.write (tup_to_str (x[0]) + ', ')
                        str = x[1] (str)
                        last_conversion = x[0]
 
@@ -2260,11 +2247,11 @@ def do_conversion (infile, from_version, outfile, to_version):
                new_ver =  '\\version \"%s\"' % tup_to_str (last_conversion)
 
                if re.search (lilypond_version_re_str, str):
-                       str = re.sub (lilypond_version_re_str,'\\'+new_ver , str)
+                       str = re.sub (lilypond_version_re_str,'\\'+new_ver, str)
                elif add_version:
                        str = new_ver + '\n' + str
 
-               outfile.write(str)
+               outfile.write (str)
 
        return last_conversion
        
@@ -2284,7 +2271,7 @@ def do_one_file (infile_name):
        else:
                guess = guess_lilypond_version (infile_name)
                if not guess:
-                       raise UnknownVersion()
+                       raise UnknownVersion ()
                from_version = str_to_tuple (guess)
 
        if __main__.to_version:
@@ -2327,17 +2314,20 @@ assume_old = 0
 to_version = ()
 from_version = ()
 outfile_name = ''
+show_rules_p = 0
 
-(options, files) = getopt.getopt (
-       sys.argv[1:], 'ao:f:t:senh', ['no-version', 'version', 'output', 'show-rules', 'help', 'edit', 'from=', 'to='])
+(options, files) = getopt.getopt (sys.argv[1:], 'ao:f:t:senh',
+                                 ['no-version', 'version', 'output',
+                                 'show-rules', 'help', 'edit',
+                                 'from=', 'to='])
 
 for opt in options:
        o = opt[0]
        a = opt[1]
-       if o== '--help' or o == '-h':
+       if o == '--help' or o == '-h':
                usage ()
                sys.exit (0)
-       if o == '--version' or o == '-v':
+       elif o == '--version' or o == '-v':
                print_version ()
                sys.exit (0)
        elif o== '--from' or o=='-f':
@@ -2347,8 +2337,7 @@ for opt in options:
        elif o== '--edit' or o == '-e':
                edit = 1
        elif o== '--show-rules' or o == '-s':
-               show_rules (sys.stdout)
-               sys.exit(0)
+               show_rules_p = 1
        elif o == '--output' or o == '-o':
                outfile_name = a
        elif o == '--no-version' or o == '-n':
@@ -2357,6 +2346,11 @@ for opt in options:
                print o
                raise getopt.error
 
+# should parse files[] to read \version?
+if show_rules_p:
+       show_rules (sys.stdout)
+       sys.exit (0)
+               
 identify ()
 for f in files:
        if f == '-':
@@ -2371,7 +2365,7 @@ for f in files:
                sys.stderr.write ('\n')
                if assume_old:
                        fv = from_version
-                       from_version = (0,0,0)
+                       from_version = (0, 0, 0)
                        do_one_file (f)
                        from_version = fv
                else: