[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
More reductions in make doc (issue 5694079)
From: |
PhilEHolmes |
Subject: |
More reductions in make doc (issue 5694079) |
Date: |
Sat, 25 Feb 2012 16:58:59 +0000 |
Reviewers: Graham Percival, Julien Rioux,
Message:
Further update for review
Description:
More reductions in make doc
Pushes the output from making midi .ly files and ly-examples to logfiles
- slightly more controversial - uses the run-and-check shell script to
do this. However, I think we need something of this sort on these
direct invocations of lilypond, and can't see a better way of doing it,
given we already use that script elsewhere. It does fail "properly" on
bad input, pointing the user to the correct logfile.
Please review this at http://codereview.appspot.com/5694079/
Affected files:
M Documentation/ly-examples/GNUmakefile
M make/midi-rules.make
Index: Documentation/ly-examples/GNUmakefile
diff --git a/Documentation/ly-examples/GNUmakefile
b/Documentation/ly-examples/GNUmakefile
index
a3ee42280b15fad5e45fbb3d65ae391c2c71513b..b4e4d2c0be13cbeceddfac602103a0fb93e0341a
100644
--- a/Documentation/ly-examples/GNUmakefile
+++ b/Documentation/ly-examples/GNUmakefile
@@ -14,7 +14,7 @@ all: $(OUT_PNG_FILES) $(OUT_SMALL_PNG_FILES)
endif
$(outdir)/%.png: %.ly
- $(LILYPOND_PREVIEW) -o $(outdir) $<
+ $(buildscript-dir)/run-and-check "$(LILYPOND_PREVIEW) -o $(outdir)
$<" "$*.preview.log"
mv $(outdir)/$*.preview.png $@
$(outdir)/%-small.png: $(outdir)/%.png
Index: make/midi-rules.make
diff --git a/make/midi-rules.make b/make/midi-rules.make
index
a5cee58b96a226dd70e3eb9b13bdfae9895bac4e..7b3f149d9643832dc72e02e23d6a27b286ddbc13
100644
--- a/make/midi-rules.make
+++ b/make/midi-rules.make
@@ -5,7 +5,7 @@ $(outdir)/%.ly: %.midi
$(outdir)/%.midi: %.ly $(LILYPOND_BINARY)
touch $(foreach f, $(HEADER_FIELDS), $(outdir)/$*.$f)
- $(LILYPOND_BINARY) $(HEADER_FIELDS:%=-H %) -o $(outdir) $<
+ $(buildscript-dir)/run-and-check "$(LILYPOND_BINARY)
$(HEADER_FIELDS:%=-H %) -o $(outdir) $<" "$*.log"
cp $< $(outdir)
$(outdir)/%-midi.ly: $(outdir)/%.midi $(MIDI2LY)
- More reductions in make doc (issue 5694079),
PhilEHolmes <=