################################################################
def exit (i):
- if global_options.verbose:
+ if ly.is_verbose ():
raise Exception (_ ('Exiting (%d)...') % i)
else:
sys.exit (i)
%s
%s
-''' % ( _ ('Copyright (c) %s by') % '2001--2010',
+''' % ( _ ('Copyright (c) %s by') % '2001--2012',
'\n '.join (authors),
_ ("Distributed under terms of the GNU General Public License."),
_ ("It comes with NO WARRANTY.")))
+
def get_option_parser ():
p = ly.get_option_parser (usage=_ ("%s [OPTION]... FILE") % 'lilypond-book',
description=help_summary,
type="float",
default=3.0)
+ p.add_option ('--lily-loglevel',
+ help=_ ("Print lilypond log messages according to LOGLEVEL"),
+ metavar=_ ("LOGLEVEL"),
+ action='store', dest='lily_loglevel',
+ default=os.environ.get ("LILYPOND_LOGLEVEL", None))
+
p.add_option ('--lily-output-dir',
help=_ ("write lily-XXX files to DIR, link into --output dir"),
metavar=_ ("DIR"),
action='append', dest='custom_packages',
default=[])
+ p.add_option ("-l", "--loglevel",
+ help=_ ("Print log messages according to LOGLEVEL "
+ "(NONE, ERROR, WARNING, PROGRESS (default), DEBUG)"),
+ metavar=_ ("LOGLEVEL"),
+ action='callback',
+ callback=ly.handle_loglevel_option,
+ type='string')
+
p.add_option ("-o", '--output', help=_ ("write output to DIR"),
metavar=_ ("DIR"),
action='store', dest='output_dir',
action='store',
dest='process_cmd', default='')
+ p.add_option ('--redirect-lilypond-output',
+ help = _ ("Redirect the lilypond output"),
+ action='store_true',
+ dest='redirect_output', default=False)
+
p.add_option ('-s', '--safe', help=_ ("Compile snippets in safe mode"),
action="store_true",
default=False,
default=False)
p.add_option ('-V', '--verbose', help=_ ("be verbose"),
- action="store_true",
- default=False,
- dest="verbose")
+ action="callback",
+ callback=ly.handle_loglevel_option,
+ callback_args=("DEBUG",))
p.version = "@TOPLEVEL_VERSION@"
p.add_option("--version",
metavar=_ ("PROG"),
action='store', dest='latex_program',
default='latex')
+ group.add_option ('--texinfo-program',
+ help=_ ("run executable PROG instead of texi2pdf"),
+ metavar=_ ("PROG"),
+ action='store', dest='texinfo_program',
+ default='texi2pdf')
group.add_option ('--pdf',
action="store_true",
dest="create_pdf",
return snippets
-def system_in_directory (cmd, directory):
+def system_in_directory (cmd, directory, logfile):
"""Execute a command in a different directory.
Because of win32 compatibility, we can't simply use subprocess.
current = os.getcwd()
os.chdir (directory)
- ly.system(cmd, be_verbose=global_options.verbose,
- progress_p=1)
+ """NB - ignore_error is deliberately set to the same value
+ as redirect_output - this is not a typo."""
+ retval = ly.system(cmd,
+ be_verbose=ly.is_verbose (),
+ redirect_output=global_options.redirect_output,
+ log_file=logfile,
+ progress_p=1,
+ ignore_error=global_options.redirect_output)
+ if retval != 0:
+ print ("Error trapped by lilypond-book")
+ print ("\nPlease see " + logfile + ".log\n")
+ sys.exit(1)
+
os.chdir (current)
+ list (set ([snip.basename() + '.ly' for snip in snippets])))
name = os.path.join (lily_output_dir,
'snippet-names-%d.ly' % checksum)
+ logfile = name.replace('.ly', '')
file (name, 'wb').write (contents)
system_in_directory (' '.join ([cmd, ly.mkarg (name)]),
- lily_output_dir)
-
+ lily_output_dir,
+ logfile)
def snippet_list_checksum (snippets):
return hash (' '.join([l.basename() for l in snippets]))
#(define output-empty-score-list #f)
#(ly:add-file-name-alist '(%s
))\n
-""" % '\n'.join(['("%s.ly" . "%s")\n' % (ly.basename (), name)
+""" % '\n'.join(['("%s.ly" . "%s")\n' % (ly.basename ().replace('\\','/'), name)
for ly in lys]))
def split_output_files(directory):
progress (_ ("Writing snippets..."))
for snippet in outdated:
snippet.write_ly()
- progress ('\n')
if outdated:
progress (_ ("Processing..."))
- progress ('\n')
process_snippets (options.process_cmd, outdated,
options.formatter, options.lily_output_dir)
output_files,
options.output_dir)
- progress ('\n')
-
###
# Format guessing data
new_str = ''.join (lines)
if oldstr == new_str:
progress (_ ("%s is up to date.") % file_name)
- progress ('\n')
# this prevents make from always rerunning lilypond-book:
# output file must be touched in order to be up to date
progress (_ ("Writing `%s'...") % file_name)
file (file_name, 'w').writelines (lines)
- progress ('\n')
def note_input_file (name, inputs=[]):
try:
progress (_ ("Reading %s...") % input_fullname)
source = in_handle.read ()
- progress ('\n')
if not included:
global_options.formatter.init_default_snippet_options (source)
# Let the formatter modify the chunks before further processing
chunks = global_options.formatter.process_chunks (chunks)
- progress ('\n')
if global_options.filter_cmd:
write_if_updated (output_filename,
elif global_options.process_cmd:
do_process_cmd (chunks, input_fullname, global_options)
progress (_ ("Compiling %s...") % output_filename)
- progress ('\n')
write_if_updated (output_filename,
[s.replacement_text ()
for s in chunks])
os.chdir (original_dir)
name = snippet.substring ('filename')
progress (_ ("Processing include: %s") % name)
- progress ('\n')
return do_file (name, included=True)
include_chunks = map (process_include,
except BookSnippet.CompileError:
os.chdir (original_dir)
progress (_ ("Removing `%s'") % output_filename)
- progress ('\n')
raise BookSnippet.CompileError
def do_options ():
def main ():
# FIXME: 85 lines of `main' macramee??
+ if (os.environ.has_key ("LILYPOND_BOOK_LOGLEVEL")):
+ ly.set_loglevel (os.environ["LILYPOND_BOOK_LOGLEVEL"])
files = do_options ()
basename = os.path.splitext (files[0])[0]
global_options.formatter.process_options (global_options)
- if global_options.verbose:
- global_options.process_cmd += " --verbose "
+ if global_options.lily_loglevel:
+ ly.debug_output (_ ("Setting LilyPond's loglevel to %s") % global_options.lily_loglevel, True)
+ global_options.process_cmd += " --loglevel=%s" % global_options.lily_loglevel
+ elif ly.is_verbose ():
+ if os.environ.get ("LILYPOND_LOGLEVEL", None):
+ ly.debug_output (_ ("Setting LilyPond's loglevel to %s (from environment variable LILYPOND_LOGLEVEL)") % os.environ.get ("LILYPOND_LOGLEVEL", None), True)
+ global_options.process_cmd += " --loglevel=%s" % os.environ.get ("LILYPOND_LOGLEVEL", None)
+ else:
+ ly.debug_output (_ ("Setting LilyPond's output to --verbose, implied by lilypond-book's setting"), True)
+ global_options.process_cmd += " --verbose"
if global_options.padding_mm:
global_options.process_cmd += " -deps-box-padding=%f " % global_options.padding_mm
else:
global_options.lily_output_dir = os.path.abspath(global_options.output_dir)
+ relative_output_dir = global_options.output_dir
identify ()
try:
base_file_name = os.path.splitext (os.path.basename (files[0]))[0]
dep_file = os.path.join (global_options.output_dir, base_file_name + '.dep')
- final_output_file = os.path.join (global_options.output_dir,
- base_file_name
- + '.%s' % global_options.format)
+ final_output_file = os.path.join (relative_output_dir,
+ base_file_name + global_options.formatter.default_extension)
os.chdir (original_dir)
file (dep_file, 'w').write ('%s: %s'
projects / lilypond.git / blobdiff