#
+#
+# TODO: should allow to set a central pk cache directory from the command line.
+# TODO: should allow to switch off pk cache.
+#
+
+
# Note: gettext work best if we use ' for docstrings and "
-# for gettextable strings
+# for gettextable strings.
+# --> DO NOT USE """ for docstrings.
'''
TODO:
* multiple \score blocks?
- * windows-sans-cygwin compatibility? rm -rf, cp file... dir
-
'''
import re
import getopt
import sys
+import shutil
import __main__
import operator
import tempfile
+import traceback
+# if set, LILYPONDPREFIX must take prevalence
+# if datadir is not set, we're doing a build and LILYPONDPREFIX
datadir = '@datadir@'
-sys.path.append (datadir + '/python')
+if os.environ.has_key ('LILYPONDPREFIX') \
+ or '@datadir@' == '@' + 'datadir' + '@':
+ datadir = os.environ['LILYPONDPREFIX']
+else:
+ datadir = '@datadir@'
+
+sys.path.append (os.path.join (datadir, 'python'))
+sys.path.append (os.path.join (datadir, 'python/out'))
+
+program_name = 'ly2dvi'
+program_version = '@TOPLEVEL_VERSION@'
+original_dir = os.getcwd ()
+temp_dir = os.path.join (original_dir, '%s.dir' % program_name)
+errorport = sys.stderr
+keep_temp_dir_p = 0
+verbose_p = 0
+
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
+
+help_summary = _ ("Generate .dvi with LaTeX for LilyPond")
+
+option_definitions = [
+ ('', 'd', 'dependencies', _ ("write Makefile dependencies for every input file")),
+ ('', 'h', 'help', _ ("this help")),
+ (_ ("DIR"), 'I', 'include', _ ("add DIR to LilyPond's search path")),
+ ('', 'k', 'keep', _ ("keep all output, and name the directory %s.dir") % program_name),
+ ('', '', 'no-lily', _ ("don't run LilyPond")),
+ ('', 'm', 'no-paper', _ ("produce MIDI output only")),
+ (_ ("FILE"), 'o', 'output', _ ("write ouput to FILE")),
+ (_ ("FILE"), 'f', 'find-pfa', _ ("find pfa fonts used in FILE")),
+ # why capital P?
+ ('', 'P', 'postscript', _ ("generate PostScript output")),
+ (_ ("KEY=VAL"), 's', 'set', _ ("change global setting KEY to VAL")),
+ ('', 'V', 'verbose', _ ("verbose")),
+ ('', 'v', 'version', _ ("print version number")),
+ ('', 'w', 'warranty', _ ("show warranty and copyright")),
+ ]
+
+from lilylib import *
-layout_fields = ['title', 'subtitle', 'subsubtitle', 'footer', 'head',
- 'composer', 'arranger', 'instrument', 'opus', 'piece', 'metre',
- 'meter', 'poet']
+layout_fields = ['dedication', 'title', 'subtitle', 'subsubtitle',
+ 'footer', 'head', 'composer', 'arranger', 'instrument',
+ 'opus', 'piece', 'metre', 'meter', 'poet', 'texttranslator']
-# init to empty; values here take precedence over values in the file
+# init to empty; values here take precedence over values in the file
+
+## TODO: change name.
extra_init = {
'language' : [],
'latexheaders' : [],
'latexpackages' : ['geometry'],
+ 'latexoptions' : [],
'papersize' : [],
'pagenumber' : [1],
'textheight' : [],
}
extra_fields = extra_init.keys ()
-
fields = layout_fields + extra_fields
-program_name = 'ly2dvi'
-help_summary = _ ("Generate .dvi with LaTeX for LilyPond")
include_path = ['.']
lily_p = 1
paper_p = 1
+cache_pks_p = 1
+
+PK_PATTERN='feta.*\.[0-9]+pk'
-output = 0
+output_name = ''
targets = {
'DVI' : 0,
'LATEX' : 0,
track_dependencies_p = 0
dependency_files = []
-# be verbose?
-verbose_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
#
# Try to cater for bad installations of LilyPond, that have
# feta16.{afm,mf,tex,tfm}, and only set env upon failure.
#
environment = {
- 'MFINPUTS' : datadir + '/mf:',
- 'TEXINPUTS': datadir + '/tex:' + datadir + '/ps:.:',
- 'TFMFONTS' : datadir + '/tfm:',
+ 'MFINPUTS' : datadir + '/mf' + ':',
+ 'TEXINPUTS': datadir + '/tex:' + datadir + '/ps:' + '.:'
+ + os.getcwd() + ':',
+ 'TFMFONTS' : datadir + '/tfm' + ':',
'GS_FONTPATH' : datadir + '/afm:' + datadir + '/pfa',
'GS_LIB' : datadir + '/ps',
}
+
def setup_environment ():
for key in environment.keys ():
val = environment[key]
if os.environ.has_key (key):
- val = val + os.pathsep + os.environ[key]
+ val = os.environ[key] + os.pathsep + val
os.environ[key] = val
-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')
-
-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
- os.chdir (temp_dir)
-
-
-def system (cmd, ignore_error = 0):
- if verbose_p:
- progress (_ ("Invoking `%s\'") % cmd)
- st = os.system (cmd) >> 8
- if st:
- name = re.match ('[ \t]*([^ \t]*)', cmd).group (1)
- msg = name + ': ' + _ ("command exited with value %d") % st
- if ignore_error:
- warning (msg + ' ' + _ ("(ignored)") + ' ')
- else:
- error (msg)
-
- return st
-
-
-def cleanup_temp ():
- if not keep_temp_dir_p:
- if verbose_p:
- progress (_ ("Cleaning %s...") % temp_dir)
- system ('rm -rf %s' % temp_dir)
-
-
+#what a name.
def set_setting (dict, key, val):
try:
val = string.atof (val)
warning (_ ("no such setting: %s") % `key`)
dict[key] = [val]
-def strip_extension (f, ext):
- (p, e) = os.path.splitext (f)
- if e == ext:
- e = ''
- return p + e
-
-# END Library
-option_definitions = [
- ('', 'd', 'dependencies', _ ("write Makefile dependencies for every input file")),
- ('', 'h', 'help', _ ("this help")),
- (_ ("DIR"), 'I', 'include', _ ("add DIR to LilyPond's search path")),
- ('', 'k', 'keep', _ ("keep all output, and name the directory %s.dir") % program_name),
- ('', '', 'no-lily', _ ("don't run LilyPond")),
- ('', 'm', 'no-paper', _ ("produce MIDI output only")),
- (_ ("FILE"), 'o', 'output', _ ("write ouput to FILE")),
- # why capital P?
- ('', 'P', 'postscript', _ ("generate PostScript output")),
- (_ ("KEY=VAL"), 's', 'set', _ ("change global setting KEY to VAL")),
- ('', 'V', 'verbose', _ ("verbose")),
- ('', 'v', 'version', _ ("print version number")),
- ('', 'w', 'warranty', _ ("show warranty and copyright")),
- ]
+def print_environment ():
+ for (k,v) in os.environ.items ():
+ sys.stderr.write ("%s=\"%s\"\n" % (k,v))
def run_lilypond (files, outbase, dep_prefix):
- opts = '--output=%s.tex' % outbase
- opts = opts + ' ' + string.join (map (lambda x : '-I ' + x, include_path))
+ opts = ''
+# opts = opts + '--output=%s.tex' % outbase
+ opts = opts + ' ' + string.join (map (lambda x : '-I ' + x,
+ include_path))
if paper_p:
- opts = opts + ' ' + string.join (map (lambda x : '-H ' + x, fields))
+ opts = opts + ' ' + string.join (map (lambda x : '-H ' + x,
+ fields))
else:
opts = opts + ' --no-paper'
if track_dependencies_p:
opts = opts + " --dependencies"
if dep_prefix:
- opts = ' --dep_prefix=%s' % dep_prefix
+ opts = opts + ' --dep-prefix=%s' % dep_prefix
fs = string.join (files)
+ if not verbose_p:
+ # cmd = cmd + ' 1> /dev/null 2> /dev/null'
+ progress ( _("Running %s...") % 'LilyPond')
+ else:
+ opts = opts + ' --verbose'
+
+ # for better debugging!
+ print_environment ()
+ print opts, fs
system ('lilypond %s %s ' % (opts, fs))
def analyse_lilypond_output (filename, extra):
set_setting (extra, x, m.group (1))
def find_tex_files_for_base (base, extra):
+
+ """
+ Find the \header fields dumped from BASE.
+ """
+
headerfiles = {}
for f in layout_fields:
if os.path.exists (base + '.' + f):
def find_tex_files (files, extra):
+ """
+ Find all .tex files whose prefixes start with some name in FILES.
+
+ """
+
tfiles = []
for f in files:
x = x + 1
if not x:
- warning (_ ("no lilypond output found for %s") % `files`)
+ fstr = string.join (files, ', ')
+ warning (_ ("no lilypond output found for %s") % fstr)
return tfiles
def one_latex_definition (defn, first):
else:
s = s + '\\def\\mustmakelilypondpiecetitle{}\n'
- s = s + '\\input %s' % defn[0]
+ s = s + '\\input %s\n' % defn[0] # The final \n seems important here. It ensures that the footers and taglines end up on the right page.
return s
}
def global_latex_definition (tfiles, extra):
- '''construct preamble from EXTRA,
- dump lily output files after that, and return result.
- '''
+
+ '''construct preamble from EXTRA, dump Latex stuff for each
+lily output file in TFILES after that, and return the Latex file constructed. '''
s = ""
s = s + '% generation tag\n'
- paper = ''
+ options = ''
if extra['papersize']:
try:
- paper = '[%s]' % ly_paper_to_latexpaper[extra['papersize'][0]]
- except:
+ options = '%s' % ly_paper_to_latexpaper[extra['papersize'][0]]
+ except KeyError:
warning (_ ("invalid value: %s") % `extra['papersize'][0]`)
pass
-
- s = s + '\\documentclass%s{article}\n' % paper
+
+ if extra['latexoptions']:
+ options = options + ',' + extra['latexoptions'][-1]
+
+ s = s + '\\documentclass[%s]{article}\n' % options
if extra['language']:
s = s + r'\usepackage[%s]{babel}\n' % extra['language'][-1]
orientation = extra['orientation'][0]
# set sane geometry width (a4-width) for linewidth = -1.
- if not extra['linewidth'] or extra['linewidth'][0] < 0:
- linewidth = 597
+ maxlw = max (extra['linewidth'] + [-1])
+ if maxlw < 0:
+ # who the hell is 597 ?
+ linewidth = '597'
else:
- linewidth = extra['linewidth'][0]
- s = s + '\geometry{width=%spt%s,headheight=2mm,headsep=0pt,footskip=2mm,%s}\n' % (linewidth, textheight, orientation)
+ linewidth = maxlw
+ s = s + '\geometry{width=%spt%s,headheight=2mm,footskip=2mm,%s}\n' % (linewidth, textheight, orientation)
+
+ if extra['latexoptions']:
+ s = s + '\geometry{twosideshift=4mm}\n'
s = s + r'''
\usepackage[latin1]{inputenc}
\input{titledefs}
-\makeatletter
-\renewcommand{\@oddfoot}{\parbox{\textwidth}{\mbox{}\thefooter}}%
'''
if extra['pagenumber'] and extra['pagenumber'][-1] and extra['pagenumber'][-1] != 'no':
- s = s + r'''
-\renewcommand{\@oddhead}{\parbox{\textwidth}%
- {\mbox{}\small\theheader\hfill\textbf{\thepage}}}
-'''
+ s = s + '\setcounter{page}{%s}\n' % (extra['pagenumber'][-1])
+ s = s + '\\pagestyle{plain}\n'
else:
s = s + '\\pagestyle{empty}\n'
- s = s + '\\makeatother\n'
s = s + '\\begin{document}\n'
-
+ s = s + '\\thispagestyle{firstpage}\n'
first = 1
for t in tfiles:
s = s + one_latex_definition (t, first)
first = 0
- s = s + r'''
-\makeatletter
-\renewcommand{\@oddfoot}{\parbox{\textwidth}{\mbox{}\makelilypondtagline}}%
-\makeatother
-'''
+
+ s = s + '\\thispagestyle{lastpage}\n'
s = s + '\\end{document}'
return s
def run_latex (files, outbase, extra):
- wfs = find_tex_files ([outbase] + files[1:], extra)
+
+ """Construct latex file, for FILES and EXTRA, dump it into
+OUTBASE.latex. Run LaTeX on it.
+
+RETURN VALUE
+
+None
+ """
+ latex_fn = outbase + '.latex'
+
+ wfs = find_tex_files (files, extra)
s = global_latex_definition (wfs, extra)
- f = open (outbase + '.latex', 'w')
+ f = open (latex_fn, 'w')
f.write (s)
f.close ()
- cmd = 'latex \\\\nonstopmode \\\\input %s' % outbase + '.latex'
+ cmd = 'latex \\\\nonstopmode \\\\input %s' % latex_fn
+
if not verbose_p:
progress ( _("Running %s...") % 'LaTeX')
cmd = cmd + ' 1> /dev/null 2> /dev/null'
def run_dvips (outbase, extra):
+
+ """Run dvips using the correct options taken from EXTRA,
+leaving a PS file in OUTBASE.ps
+
+RETURN VALUE
+
+None.
+"""
opts = ''
if extra['papersize']:
- opts = opts + ' -t %s' % extra['papersize'][0]
+ opts = opts + ' -t%s' % extra['papersize'][0]
if extra['orientation'] and extra['orientation'][0] == 'landscape':
- opts = opts + ' -t landscape'
+ opts = opts + ' -tlandscape'
- cmd = 'dvips %s -o %s %s' % (opts, outbase + '.ps', outbase + '.dvi')
+ cmd = 'dvips %s -o%s %s' % (opts, outbase + '.ps', outbase + '.dvi')
if not verbose_p:
progress ( _("Running %s...") % 'dvips')
- cmd = cmd + ' 2> /dev/null'
+ cmd = cmd + ' 1> /dev/null 2> /dev/null'
system (cmd)
df.write ('\n')
df.close ();
-(sh, long) = getopt_args (__main__.option_definitions)
+def find_file_in_path (path, name):
+ for d in string.split (path, os.pathsep):
+ if name in os.listdir (d):
+ return os.path.join (d, name)
+
+# Added as functionality to ly2dvi, because ly2dvi may well need to do this
+# in future too.
+PS = '%!PS-Adobe'
+def find_pfa_fonts (name):
+ s = open (name).read ()
+ if s[:len (PS)] != PS:
+ # no ps header?
+ errorport.write (_( "error: ") + _ ("not a PostScript file: `%s\'" % name))
+ errorport.write ('\n')
+ sys.exit (1)
+ here = 0
+ m = re.match ('.*?/(feta[-a-z0-9]+) +findfont', s[here:], re.DOTALL)
+ pfa = []
+ while m:
+ here = m.end (1)
+ pfa.append (m.group (1))
+ m = re.match ('.*?/(feta[-a-z0-9]+) +findfont', s[here:], re.DOTALL)
+ return pfa
+
+
+(sh, long) = getopt_args (option_definitions)
try:
(options, files) = getopt.getopt(sys.argv[1:], sh, long)
-except:
+except getopt.error, s:
+ errorport.write ('\n')
+ errorport.write (_ ("error: ") + _ ("getopt says: `%s\'" % s))
+ errorport.write ('\n')
+ errorport.write ('\n')
help ()
sys.exit (2)
elif o == '--help' or o == '-h':
help ()
sys.exit (0)
+ elif o == '--find-pfa' or o == '-f':
+ fonts = map (lambda x: x + '.pfa', find_pfa_fonts (a))
+ files = map (lambda x:
+ find_file_in_path (os.environ['GS_FONTPATH'], x),
+ fonts)
+ print string.join (files, ' ')
+ sys.exit (0)
elif o == '--include' or o == '-I':
include_path.append (a)
elif o == '--postscript' or o == '-P':
targets['MIDI'] = 0
paper_p = 0
elif o == '--output' or o == '-o':
- output = a
+ output_name = a
elif o == '--set' or o == '-s':
ss = string.split (a, '=')
set_setting (extra_init, ss[0], ss[1])
identify ()
sys.exit (0)
elif o == '--warranty' or o == '-w':
- try:
- system ('lilypond -w')
- except:
+ status = system ('lilypond -w', ignore_error = 1)
+ if status:
warranty ()
+
sys.exit (0)
+
+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)
+
+# Python < 1.5.2 compatibility
+#
# On most platforms, this is equivalent to
#`normpath(join(os.getcwd()), PATH)'. *Added in Python version 1.5.2*
-def compat_abspath (path):
- return os.path.normpath (os.path.join (os.getcwd (), path))
+if os.path.__dict__.has_key ('abspath'):
+ abspath = os.path.abspath
+else:
+ def abspath (path):
+ return os.path.normpath (os.path.join (os.getcwd (), path))
+
+if os.__dict__.has_key ('makedirs'):
+ makedirs = os.makedirs
+else:
+ def makedirs (dir, mode=0777):
+ system ('mkdir -p %s' % dir)
-include_path = map (compat_abspath, include_path)
+def mkdir_p (dir, mode=0777):
+ if not os.path.isdir (dir):
+ makedirs (dir, mode)
+
+include_path = map (abspath, include_path)
+
+original_output = output_name
-original_output = output
if files and files[0] != '-':
+ # Ugh, maybe make a setup () function
files = map (lambda x: strip_extension (x, '.ly'), files)
- if not output:
- output = os.path.basename (files[0])
+ (outdir, outbase) = ('','')
+ if not output_name:
+ outbase = os.path.basename (files[0])
+ outdir = abspath('.')
+ elif output_name[-1] == os.sep:
+ outdir = abspath (output_name)
+ outbase = os.path.basename (files[0])
+ else:
+ (outdir, outbase) = os.path.split (abspath (output_name))
- files = map (compat_abspath, files)
+ for i in ('.dvi', '.latex', '.ly', '.ps', '.tex'):
+ output_name = strip_extension (output_name, i)
- if os.path.dirname (output) != '.':
- dep_prefix = os.path.dirname (output)
+ files = map (abspath, files)
+
+ if os.path.dirname (output_name) != '.':
+ dep_prefix = os.path.dirname (output_name)
else:
dep_prefix = 0
- reldir = os.path.dirname (output)
- (outdir, outbase) = os.path.split (compat_abspath (output))
-
+ reldir = os.path.dirname (output_name)
+ if outdir != '.' and (track_dependencies_p or targets.keys ()):
+ mkdir_p (outdir, 0777)
+
setup_environment ()
- setup_temp ()
-
- extra = extra_init
+ tmpdir = setup_temp ()
+ if cache_pks_p :
+ os.chdir (outdir)
+ cp_to_dir (PK_PATTERN, tmpdir)
+
+ # to be sure, add tmpdir *in front* of inclusion path.
+ #os.environ['TEXINPUTS'] = tmpdir + ':' + os.environ['TEXINPUTS']
+ os.chdir (tmpdir)
if lily_p:
try:
run_lilypond (files, outbase, dep_prefix)
except:
- # TODO: friendly message about LilyPond setup/failing?
- #
- # TODO: lilypond should fail with different
- # error codes for:
- # - guile setup/startup failure
- # - font setup failure
- # - init.ly setup failure
- # - parse error in .ly
- # - unexpected: assert/core dump
+ # TODO: friendly message about LilyPond setup/failing?
+ #
+ # TODO: lilypond should fail with different
+ # error codes for:
+ # - guile setup/startup failure
+ # - font setup failure
+ # - init.ly setup failure
+ # - parse error in .ly
+ # - unexpected: assert/core dump
targets = {}
+ traceback.print_exc ()
if targets.has_key ('DVI') or targets.has_key ('PS'):
try:
- run_latex (files, outbase, extra)
+ run_latex (files, outbase, extra_init)
# unless: add --tex, or --latex?
del targets['TEX']
del targets['LATEX']
del targets['DVI']
if targets.has_key ('PS'):
del targets['PS']
+ traceback.print_exc ()
- # TODO: does dvips ever fail?
if targets.has_key ('PS'):
- run_dvips (outbase, extra)
-
- if outdir != '.' and (track_dependencies_p or targets.keys ()):
- system ('mkdir -p %s' % outdir)
+ try:
+ run_dvips (outbase, extra_init)
+ except:
+ if targets.has_key ('PS'):
+ del targets['PS']
+ traceback.print_exc ()
# add DEP to targets?
if track_dependencies_p:
depfile = os.path.join (outdir, outbase + '.dep')
- generate_dependency_file (depfile, dest)
+ generate_dependency_file (depfile, depfile)
if os.path.isfile (depfile):
- progress (_ ("dependencies output to %s...") % depfile)
+ progress (_ ("dependencies output to `%s'...") % depfile)
+ # Hmm, if this were a function, we could call it the except: clauses
for i in targets.keys ():
ext = string.lower (i)
- if re.match ('.*[.]%s' % ext, string.join (os.listdir ('.'))):
- system ('cp *.%s %s' % (ext, outdir))
+ cp_to_dir ('.*\.%s$' % ext, outdir)
outname = outbase + '.' + string.lower (i)
abs = os.path.join (outdir, outname)
if reldir != '.':
outname = os.path.join (reldir, outname)
if os.path.isfile (abs):
- progress (_ ("%s output to %s...") % (i, outname))
+ progress (_ ("%s output to `%s'...") % (i, outname))
elif verbose_p:
warning (_ ("can't find file: `%s'") % outname)
-
+
+ if cache_pks_p:
+ cp_to_dir (PK_PATTERN, outdir)
+
os.chdir (original_dir)
cleanup_temp ()
else:
- # FIXME
+ # FIXME: read from stdin when files[0] = '-'
help ()
- sys.stderr.write ('\n')
- try:
- error (_ ("no FILEs specified, can't invoke as filter"))
- except:
- pass
+ errorport.write (program_name + ":" + _ ("error: ") + _ ("no files specified on command line.") + '\n')
sys.exit (2)
projects / lilypond.git / blobdiff