lilypond-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Various updates to reduce make doc output (issue 5727055)


From: PhilEHolmes
Subject: Various updates to reduce make doc output (issue 5727055)
Date: Sun, 04 Mar 2012 16:21:21 +0000

Reviewers: dak, Graham Percival, Julien Rioux,

Message:
Now down to less than 500 lines with these changes.  Please review.

Description:
GNUmakefile: pushes lilypond output to a logfile.  Using $(*F) for the
filename since the target name includes the directory.
GNUmakefile.in: heeltap from previous patch
lilypond-book-rules.make: removes output from pdflatex and prevents it
requesting input if it fails.
lysdoc-rules.make: Gets rid of echoed progress message
abc2ly.py; lys-to-tely.py; midi2ly.py: Gets rid of progress message.

Please review this at http://codereview.appspot.com/5727055/

Affected files:
  M Documentation/GNUmakefile
  M GNUmakefile.in
  M make/lilypond-book-rules.make
  M make/lysdoc-rules.make
  M scripts/abc2ly.py
  M scripts/build/lys-to-tely.py
  M scripts/midi2ly.py


Index: Documentation/GNUmakefile
diff --git a/Documentation/GNUmakefile b/Documentation/GNUmakefile
index 5f04dc880cf1297f4f37d1297e2ff161344313a5..2092516cb7d9586f470cf959f96100d3380fa208 100644
--- a/Documentation/GNUmakefile
+++ b/Documentation/GNUmakefile
@@ -280,8 +280,7 @@ $(outdir)/ly-grammar.txt: $(top-src-dir)/lily/parser.yy
 # compilation during install, which is a bad thing (tm).

 $(outdir)/internals.texi: $(LILYPOND_BINARY)
- cd $(outdir) && $(LILYPOND_BINARY) --verbose $(top-src-dir)/ly/generate-documentation
-
+ cd $(outdir) && $(buildscript-dir)/run-and-check "$(LILYPOND_BINARY) --verbose $(top-src-dir)/ly/generate-documentation" "$(*F).log"

 ###############################################
 #  Documentation and translations maintenance #
Index: GNUmakefile.in
diff --git a/GNUmakefile.in b/GNUmakefile.in
index 2d22f9f378202c703591eb6d7c0c50a3b89d290e..0ad3c6e30b409ecd6647e2ff91392399cf196d39 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -120,10 +120,6 @@ WEB_TARGETS = offline

 WEB_ROOT_FILES = $(WEB_TARGETS:%=$(outdir)/%-root/index.html)

-WEB_EXAMPLE_FILES = $(wildcard input/$(outdir)/*.ly) \
-                    $(wildcard input/*/$(outdir)/*.ly) \
-                    $(wildcard input/*/*/$(outdir)/*.ly)
-
 WEB_TRACKED_FILES = $(filter-out $(outdir)/index.html, \
$(shell bash -O nullglob -c "echo $(outdir)/*.{midi,html,pdf,png,jpg,jpeg,txt,ly,ily,signature,css,zip,js,idx,php}")) \ $(shell bash -O nullglob -c "echo input/$(outdir)/*.{midi,html,pdf,png,jpg,jpeg,txt,ly,ily,signature,css,zip,js,idx,php}") \
Index: make/lilypond-book-rules.make
diff --git a/make/lilypond-book-rules.make b/make/lilypond-book-rules.make
index b0cf7663b158b43c687b6749c9b0988c1bd9c223..946e5a4759c61887101adf4bb8b7a6815b4b0611 100644
--- a/make/lilypond-book-rules.make
+++ b/make/lilypond-book-rules.make
@@ -26,7 +26,7 @@ $(outdir)/%.tex:  %.latex
 # Add the tex => pdf rule only if we have pdflatex
 ifeq (,$(findstring pdflatex,$(MISSING_OPTIONAL)))
 $(outdir)/%.pdf:  $(outdir)/%.tex
-       cd $(outdir) && $(PDFLATEX) $(notdir $<)
+ cd $(outdir) && $(buildscript-dir)/run-and-check "$(PDFLATEX) -halt-on-error $(notdir $<)" "$*.pdflatex.log"
 endif

 ############## Texinfo ######################
Index: make/lysdoc-rules.make
diff --git a/make/lysdoc-rules.make b/make/lysdoc-rules.make
index 001148aec2bd8ef09f83f8dd507e27fb976b66bb..11248f503083bec6336ad8a1a6b2b69416a0c598 100644
--- a/make/lysdoc-rules.make
+++ b/make/lysdoc-rules.make
@@ -3,7 +3,6 @@
 # Split it up into 10 300-element chunks, and one chunk containing the rest
 # if we have more than 3000 elements.
 $(outdir)/collated-files.list: $(COLLATED_FILES)
-       echo "(Re-)Generating $@"
        @echo $(wordlist    1, 299,$^)>$@
        @echo $(wordlist  300, 599,$^)>>$@
        @echo $(wordlist  600, 899,$^)>>$@
Index: scripts/abc2ly.py
diff --git a/scripts/abc2ly.py b/scripts/abc2ly.py
index 3a0aeaedabe7776a610acbc087b358a80bab3e90..3d508d2a58ad50f6a21f722ef253f05640dde969 100644
--- a/scripts/abc2ly.py
+++ b/scripts/abc2ly.py
@@ -1415,7 +1415,6 @@ for f in files:

     if not global_options.output:
global_options.output = os.path.basename (os.path.splitext (f)[0]) + ".ly" - sys.stderr.write ('lilypond output to: `%s\'...' % global_options.output)
     outf = open (global_options.output, 'w')

 # don't substitute @address@hidden We want this to reflect
Index: scripts/build/lys-to-tely.py
diff --git a/scripts/build/lys-to-tely.py b/scripts/build/lys-to-tely.py
index a3bc4b576bdc8e08f4bc9ff0f9e2dbbe42147c53..7a8684f1949b9cf50849ea65dcc2436d030319f7 100644
--- a/scripts/build/lys-to-tely.py
+++ b/scripts/build/lys-to-tely.py
@@ -163,11 +163,9 @@ if files:
     s = "\n".join (map (name2line, files))
     s = template.replace (include_snippets, s, 1)
     f = "%s/%s" % (dir, name)
-    sys.stderr.write ("%s: writing %s..." % (program_name, f))
     h = open (f, "w")
     h.write (s)
     h.close ()
-    sys.stderr.write ('\n')
 else:
     # not Unix philosophy, but hey, at least we notice when
     # we don't distribute any .ly files.
Index: scripts/midi2ly.py
diff --git a/scripts/midi2ly.py b/scripts/midi2ly.py
index 3a434193b083130344aa0c2f321600b0e79a000b..d208bada9f8c8f8b80bed520438da8f15b6e4487 100644
--- a/scripts/midi2ly.py
+++ b/scripts/midi2ly.py
@@ -1027,8 +1027,6 @@ def convert_midi (in_file, out_file):
 }
 '''

-    progress (_ ("%s output to `%s'...") % ('LY', out_file))
-
     if out_file == '-':
         handle = sys.stdout
     else:





reply via email to

[Prev in Thread] Current Thread [Next in Thread]