second polish.

[lilypond.git] / python / lilylib.py

diff --git a/python/lilylib.py b/python/lilylib.py
index 9e9abca643d38ffc38fc3692b1759774c4dc53a2..2133ea993b71bea9ce967208708c52946868f944 100644 (file)
--- a/python/lilylib.py
+++ b/python/lilylib.py
@@ -16,6 +16,7 @@ import shutil
 import string
 import sys
 import tempfile
+import glob
 
 ################################################################
 # Users of python modules should include this snippet
@@ -28,6 +29,7 @@ import tempfile
 
 # If set, LILYPONDPREFIX must take prevalence
 # if datadir is not set, we're doing a build and LILYPONDPREFIX
+
 import getopt, os, sys
 datadir = '@local_lilypond_datadir@'
 if not os.path.isdir (datadir):
@@ -58,7 +60,7 @@ if __name__ == '__main__':
        help_summary = _ ("lilylib module")
 
        option_definitions = [
-               ('', 'h', 'help', _ ("this help")),
+               ('', 'h', 'help', _ ("print this help")),
                ]
 
        from lilylib import *
@@ -99,12 +101,8 @@ except:
                return s
 underscore = _
 
-program_version = '@TOPLEVEL_VERSION@'
-if program_version == '@' + 'TOPLEVEL_VERSION' + '@':
-       program_version = '1.7.14'
-
 def identify (port):
-       port.write ('%s (GNU LilyPond) %s\n' % (__main__.program_name, program_version))
+       port.write ('%s (GNU LilyPond) %s\n' % (__main__.program_name, __main__.program_version))
 
 def warranty ():
        identify (sys.stdout)
@@ -197,9 +195,30 @@ def help ():
              ('\n'),
              (options_help_str (__main__.option_definitions)),
              ('\n\n'),
-             (_ ("Report bugs to %s") % 'bug-lilypond@gnu.org'),
+             (_ ("Report bugs to %s.") % 'bug-lilypond@gnu.org'),
              ('\n')]
        map (sys.stdout.write, ls)
+
+def lilypond_version (binary):
+       p = read_pipe ('%s --version ' % binary)
+
+       ls = p.split ('\n')
+       v= '<not found>'
+       for l in ls:
+               m = re.search ('GNU LilyPond ([0-9a-z.]+)', p)
+               if m:
+                       v = m.group (1)
+                       
+       return v
+       
+def lilypond_version_check (binary, req):
+       if req[0] <> '@' :
+               v = lilypond_version (binary)
+               if v <> req:
+                       error (_("Binary %s has version %s, looking for version %s") % \
+                              (binary, v, req))
+                       sys.exit (1)
+       
        
 def setup_temp ():
        
@@ -218,13 +237,17 @@ def command_name (cmd):
        return re.match ('^[ \t]*([^ \t]*)', cmd).group (1)
 
 def error_log (name):
-       return os.path.join (__main__.temp_dir, '%s.errorlog' % name)
+       name = re.sub('[/:]','x',name)
+       return tempfile.mktemp ('%s.errorlog' % name)
 
 def read_pipe (cmd, mode = 'r'):
        redirect = ''
+       error_log_file = ''
        if __main__.verbose_p:
                progress (_ ("Opening pipe `%s\'") % cmd)
-               redirect = ' 2>%s' % error_log (command_name (cmd))
+               error_log_file = error_log (command_name (cmd))
+               redirect = ' 2>%s' % error_log_file
+               
        pipe = os.popen (cmd + redirect, mode)
        output = pipe.read ()
        status = pipe.close ()
@@ -240,8 +263,13 @@ def read_pipe (cmd, mode = 'r'):
                        error (_ ("The error log is as follows:"))
                        sys.stderr.write (open (error_log (command_name (cmd)).read ()))
                exit (status)
+               
        if __main__.verbose_p:
                progress ('\n')
+
+       if error_log_file:
+               os.unlink (error_log_file)
+               
        return output
 
 def system (cmd, ignore_error = 0, progress_p = 0):
@@ -309,8 +337,10 @@ def strip_extension (f, ext):
 
 def cp_to_dir (pattern, dir):
        "Copy files matching re PATTERN from cwd to DIR"
+       
        # Duh.  Python style portable: cp *.EXT OUTDIR
        # system ('cp *.%s %s' % (ext, outdir), 1)
+
        files = filter (lambda x, p=pattern: re.match (p, x), os.listdir ('.'))
        map (lambda x, d=dir: shutil.copy2 (x, os.path.join (d, x)), files)
 
@@ -319,6 +349,7 @@ def cp_to_dir (pattern, dir):
 #
 # On most platforms, this is equivalent to
 #`normpath(join(os.getcwd()), PATH)'.  *Added in Python version 1.5.2*
+
 if os.path.__dict__.has_key ('abspath'):
        abspath = os.path.abspath
 else:
@@ -358,6 +389,7 @@ def setup_environment ():
                #       * clean TEXINPUTS, MFINPUTS, TFMFONTS,
                #         as these take prevalence over $TEXMF
                #         and thus may break tex run?
+               
                'TEXMF' : "{%s,%s}" % (datadir, texmf) ,
                'GS_FONTPATH' : type1_paths,
                'GS_LIB' : datadir + '/ps',
@@ -431,11 +463,14 @@ def make_ps_images (ps_name, resolution = 90):
                cmd = r'''gs -g%dx%d -sDEVICE=pnggray  -dTextAlphaBits=4 -dGraphicsAlphaBits=4  -q -sOutputFile=%s -r%d -dNOPAUSE %s %s -c quit ''' % \
                      (x, y, output_file, resolution, trans_ps, ps_name)
 
-               rmfile = base + '-page*.png'
+               rms = glob.glob (base + '-page*.png')
+               map (os.unlink, rms)
        else:
                output_file = re.sub (r'\.e?ps', '-page%d.png', ps_name)
                rmfile = base + '.png'
-
+               if os.path.isfile (rmfile):
+                       os.unlink (rmfile)
+               
                cmd = r'''gs -s  -sDEVICE=pnggray  -dTextAlphaBits=4 -dGraphicsAlphaBits=4 -q -sOutputFile=%s -dNOPAUSE -r%d %s -c quit''' % (output_file,
                                                                                                                                      resolution, ps_name)
        
@@ -443,9 +478,6 @@ def make_ps_images (ps_name, resolution = 90):
        signal = 0xf & status
        exit_status = status >> 8
 
-       rms = glob.glob (rmfile)
-       print 'removing ', rms
-       map (os.unlink, rms)
        
        if status:
                os.unlink (png)