import shutil
import sys
import optparse
+import time
################################################################
# Users of python modules should include this snippet
_ = t.ugettext
except:
def _ (s):
- return s
+ return s
underscore = _
# Urg, Python 2.4 does not define stderr/stdout encoding
# Maybe guess encoding from LANG/LC_ALL/LC_CTYPE?
+reload (sys)
+sys.setdefaultencoding ('utf-8')
+import codecs
+sys.stdout = codecs.getwriter ('utf8') (sys.stdout)
+sys.stderr = codecs.getwriter ('utf8') (sys.stderr)
+
def encoded_write(f, s):
- f.write (s.encode (f.encoding or 'utf_8'))
+ f.write (s.encode (f.encoding or 'utf-8', 'replace'))
# ugh, Python 2.5 optparse requires Unicode strings in some argument
# functions, and refuse them in some other places
def display_encode (s):
- return s.encode (sys.stderr.encoding or 'utf_8')
+ return s.encode (sys.stderr.encoding or 'utf-8', 'replace')
# Lilylib globals.
program_version = '@TOPLEVEL_VERSION@'
ignore_error=False,
progress_p=True,
be_verbose=False,
+ redirect_output=False,
log_file=None):
import subprocess
name = command_name (cmd)
error_log_file = ''
- if be_verbose:
- show_progress = 1
- progress (_ ("Invoking `%s\'") % cmd)
+ if redirect_output:
+ progress (_ ("Processing %s.ly") % log_file)
else:
- progress ( _("Running %s...") % name)
-
+ if be_verbose:
+ show_progress = 1
+ progress (_ ("Invoking `%s\'") % cmd)
+ else:
+ progress ( _("Running %s...") % name)
stdout_setting = None
+ stderr_setting = None
if not show_progress:
- stdout_setting = subprocess.PIPE
+ stdout_setting = subprocess.PIPE
+
+ if redirect_output:
+ stdout_filename = ' '.join([log_file, '.log'])
+ stderr_filename = ' '.join([log_file, '.err.log'])
+ stdout_setting = open(stdout_filename, 'w')
+ stderr_setting = open(stderr_filename, 'w')
proc = subprocess.Popen (cmd,
- shell=True,
- universal_newlines=True,
- stdout=stdout_setting,
- stderr=stdout_setting)
+ shell=True,
+ universal_newlines=True,
+ stdout=stdout_setting,
+ stderr=stderr_setting)
log = ''
- if show_progress:
- retval = proc.wait()
+ if redirect_output:
+ while proc.poll()==None:
+ time.sleep(1)
+ retval = proc.returncode
+ stdout_setting.close()
+ stderr_setting.close()
else:
- log = proc.communicate ()
- retval = proc.returncode
-
+ if show_progress:
+ retval = proc.wait()
+ else:
+ log = proc.communicate ()
+ retval = proc.returncode
if retval:
- print >>sys.stderr, 'command failed:', cmd
- if retval < 0:
- print >>sys.stderr, "Child was terminated by signal", -retval
- elif retval > 0:
- print >>sys.stderr, "Child returned", retval
-
- if ignore_error:
- print >>sys.stderr, "Error ignored"
- else:
- if not show_progress:
- print log[0]
- print log[1]
- sys.exit (1)
+ print >>sys.stderr, 'command failed:', cmd
+ if retval < 0:
+ print >>sys.stderr, "Child was terminated by signal", -retval
+ elif retval > 0:
+ print >>sys.stderr, "Child returned", retval
+
+ if ignore_error:
+ print >>sys.stderr, "Error ignored"
+ else:
+ if not show_progress:
+ print log[0]
+ print log[1]
+ sys.exit (1)
return abs (retval)
name = command_name (cmd)
if be_verbose:
- show_progress = 1
- progress (_ ("Invoking `%s\'") % cmd)
+ show_progress = 1
+ progress (_ ("Invoking `%s\'") % cmd)
else:
- progress ( _("Running %s...") % name)
+ progress ( _("Running %s...") % name)
retval = os.system (cmd)
if retval:
- print >>sys.stderr, 'command failed:', cmd
- if retval < 0:
- print >>sys.stderr, "Child was terminated by signal", -retval
- elif retval > 0:
- print >>sys.stderr, "Child returned", retval
+ print >>sys.stderr, 'command failed:', cmd
+ if retval < 0:
+ print >>sys.stderr, "Child was terminated by signal", -retval
+ elif retval > 0:
+ print >>sys.stderr, "Child returned", retval
- if ignore_error:
- print >>sys.stderr, "Error ignored"
- else:
- sys.exit (1)
+ if ignore_error:
+ print >>sys.stderr, "Error ignored"
+ else:
+ sys.exit (1)
return abs (retval)
def strip_extension (f, ext):
(p, e) = os.path.splitext (f)
if e == ext:
- e = ''
+ e = ''
return p + e
p = os.environ['PATH']
exe_paths = p.split (':')
for e in exe_paths:
- full = os.path.join (e, name)
- if os.path.exists (full):
- return full
+ full = os.path.join (e, name)
+ if os.path.exists (full):
+ return full
return None
def print_environment ():
for (k,v) in os.environ.items ():
- sys.stderr.write ("%s=\"%s\"\n" % (k, v))
+ sys.stderr.write ("%s=\"%s\"\n" % (k, v))
class NonDentedHeadingFormatter (optparse.IndentedHelpFormatter):
def format_heading(self, heading):
- if heading:
- return heading[0].upper() + heading[1:] + ':\n'
- return ''
+ if heading:
+ return heading[0].upper() + heading[1:] + ':\n'
+ return ''
def format_option_strings(self, option):
- sep = ' '
- if option._short_opts and option._long_opts:
- sep = ','
+ sep = ' '
+ if option._short_opts and option._long_opts:
+ sep = ','
- metavar = ''
- if option.takes_value():
- metavar = '=%s' % option.metavar or option.dest.upper()
+ metavar = ''
+ if option.takes_value():
+ metavar = '=%s' % option.metavar or option.dest.upper()
- return "%3s%s %s%s" % (" ".join (option._short_opts),
- sep,
- " ".join (option._long_opts),
- metavar)
+ return "%3s%s %s%s" % (" ".join (option._short_opts),
+ sep,
+ " ".join (option._long_opts),
+ metavar)
# Only use one level of indentation (even for groups and nested groups),
# since we don't indent the headeings, either
return _("Usage: %s") % usage + '\n'
def format_description(self, description):
- return description
+ return description
def get_option_parser (*args, **kwargs):
p = optparse.OptionParser (*args, **kwargs)
projects / lilypond.git / blobdiff