From d70b0b408466d4b6992878b2bf11e8b222961472 Mon Sep 17 00:00:00 2001 From: Graham Percival Date: Sun, 26 Jun 2011 00:29:53 +0100 Subject: [PATCH] Revert "Redirects lilypond output to reduce make doc noise" This reverts commit 3623cfc12bb53499a591ae45ac61931bafc6bf20. The patch as it currently stands appears to lose build information -- at the very least, even if that information is present somewhere, it is too confusing to find important information about a failing build. More work is needed before we add such functionality. --- make/ly-rules.make | 4 ++-- python/lilylib.py | 38 ++++++++++---------------------------- scripts/lilypond-book.py | 16 +++------------- 3 files changed, 15 insertions(+), 43 deletions(-) diff --git a/make/ly-rules.make b/make/ly-rules.make index a876b04f18..0df0643ee3 100644 --- a/make/ly-rules.make +++ b/make/ly-rules.make @@ -22,11 +22,11 @@ $(eval $(firstword $(TEXI_FILES_FROM_TELY)):\ # don't do ``cd $(outdir)'', and assume that $(outdir)/.. is the src dir. # it is not, for --srcdir builds $(outdir)/%.texi: %.tely $(outdir)/version.itexi $(DOCUMENTATION_LOCALE_TARGET) $(INIT_LY_SOURCES) $(SCHEME_SOURCES) - LILYPOND_VERSION=$(TOPLEVEL_VERSION) $(PYTHON) $(LILYPOND_BOOK) $(LILYPOND_BOOK_INCLUDES) --process='$(LILYPOND_BOOK_PROCESS) $(LILYPOND_BOOK_LILYPOND_FLAGS)' --output=$(outdir) --format=$(LILYPOND_BOOK_FORMAT) $(LILYPOND_BOOK_FLAGS) --redirect-lilypond-output $< + LILYPOND_VERSION=$(TOPLEVEL_VERSION) $(PYTHON) $(LILYPOND_BOOK) $(LILYPOND_BOOK_INCLUDES) --process='$(LILYPOND_BOOK_PROCESS) $(LILYPOND_BOOK_LILYPOND_FLAGS)' --output=$(outdir) --format=$(LILYPOND_BOOK_FORMAT) $(LILYPOND_BOOK_FLAGS) $< $(outdir)/%.texi: $(outdir)/%.tely $(outdir)/version.itexi $(DOCUMENTATION_LOCALE_TARGET) $(INIT_LY_SOURCES) $(SCHEME_SOURCES) - LILYPOND_VERSION=$(TOPLEVEL_VERSION) $(PYTHON) $(LILYPOND_BOOK) $(LILYPOND_BOOK_INCLUDES) --process='$(LILYPOND_BOOK_PROCESS) $(LILYPOND_BOOK_INCLUDES) $(LILYPOND_BOOK_LILYPOND_FLAGS)' --output=$(outdir) --format=$(LILYPOND_BOOK_FORMAT) $(LILYPOND_BOOK_FLAGS) --redirect-lilypond-output $< + LILYPOND_VERSION=$(TOPLEVEL_VERSION) $(PYTHON) $(LILYPOND_BOOK) $(LILYPOND_BOOK_INCLUDES) --process='$(LILYPOND_BOOK_PROCESS) $(LILYPOND_BOOK_INCLUDES) $(LILYPOND_BOOK_LILYPOND_FLAGS)' --output=$(outdir) --format=$(LILYPOND_BOOK_FORMAT) $(LILYPOND_BOOK_FLAGS) $< $(outdir)/%.html.omf: %.tely diff --git a/python/lilylib.py b/python/lilylib.py index 1bf5323cae..dac53c16cf 100644 --- a/python/lilylib.py +++ b/python/lilylib.py @@ -23,7 +23,6 @@ import re import shutil import sys import optparse -import time ################################################################ # Users of python modules should include this snippet @@ -119,7 +118,6 @@ def subprocess_system (cmd, ignore_error=False, progress_p=True, be_verbose=False, - redirect_output=False, log_file=None): import subprocess @@ -127,25 +125,16 @@ def subprocess_system (cmd, name = command_name (cmd) error_log_file = '' - if redirect_output: - progress (_ ("Processing %s.ly") % log_file) + if be_verbose: + show_progress = 1 + progress (_ ("Invoking `%s\'") % cmd) else: - if be_verbose: - show_progress = 1 - progress (_ ("Invoking `%s\'") % cmd) - else: - progress ( _("Running %s...") % name) + progress ( _("Running %s...") % name) + stdout_setting = None - stderr_setting = None if not show_progress: - 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') + stdout_setting = subprocess.PIPE proc = subprocess.Popen (cmd, shell=True, @@ -155,18 +144,11 @@ def subprocess_system (cmd, log = '' - if redirect_output: - while proc.poll()==None: - time.sleep(1) - retval = proc.returncode - stdout_setting.close() - stderr_setting.close() + if show_progress: + retval = proc.wait() else: - if show_progress: - retval = proc.wait() - else: - log = proc.communicate () - retval = proc.returncode + log = proc.communicate () + retval = proc.returncode if retval: diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py index a0501cae9e..9617f3666d 100644 --- a/scripts/lilypond-book.py +++ b/scripts/lilypond-book.py @@ -179,11 +179,6 @@ def get_option_parser (): 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, @@ -352,7 +347,7 @@ def find_toplevel_snippets (input_string, formatter): return snippets -def system_in_directory (cmd, directory, logfile): +def system_in_directory (cmd, directory): """Execute a command in a different directory. Because of win32 compatibility, we can't simply use subprocess. @@ -360,10 +355,7 @@ def system_in_directory (cmd, directory, logfile): current = os.getcwd() os.chdir (directory) - ly.system(cmd, - be_verbose=global_options.verbose, - redirect_output=global_options.redirect_output, - log_file=logfile, + ly.system(cmd, be_verbose=global_options.verbose, progress_p=1) os.chdir (current) @@ -382,12 +374,10 @@ def process_snippets (cmd, snippets, + 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, - logfile) + lily_output_dir) def snippet_list_checksum (snippets): -- 2.39.5