Re: Fix make error in regression tests coming from midi2ly (issue 5777053)

[Carl . D . Sorensen]

Reviewers: dak,

Message:
On 2012/03/10 19:20:31, dak wrote:


(I am surprised that your shell had a version of echo not
understanding -n).



I am, too.  My bash shell has echo that understands -n, so I expected it
to work.

I'll see what I can figure out to make it work.

Thanks,

Carl




Description:
Fix make error in regression tests coming from midi2ly

I have been unable to complete make test-baseline because of errors in
the
files coming from midi2ly.py.  I tracked the error to
make/midi-rules.make.

The change in this patch allows me to successfully complete make
test-baseline on
my computer, running OSX 10.5.8, with GNU Make 3.81.

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

Affected files:
  M make/midi-rules.make


Index: make/midi-rules.make
diff --git a/make/midi-rules.make b/make/midi-rules.make
index  
7b3f149d9643832dc72e02e23d6a27b286ddbc13..2a23d2cc14a5c0a79341ac2f5c1dd8dbe8ade696  
100644

--- a/make/midi-rules.make
+++ b/make/midi-rules.make
@@ -9,7 +9,7 @@ $(outdir)/%.midi: %.ly $(LILYPOND_BINARY)
cp $< $(outdir)

 $(outdir)/%-midi.ly: $(outdir)/%.midi $(MIDI2LY)
-	(echo '\header {'; for f in $(HEADER_FIELDS); do echo -n $$f'="'; cat  
$(outdir)/$*.$$f; echo '"'; done; echo '}') > $(outdir)/$*.header
+	(echo '\header {'; for f in $(HEADER_FIELDS); do echo $$f'="'; cat  
$(outdir)/$*.$$f; echo '"'; done; echo '}') > $(outdir)/$*.header
 	$(PYTHON) $(MIDI2LY) $(shell cat $(outdir)/$*.options)  
--include-header=$(outdir)/$*.header -o $(outdir) $<


 $(outdir)/%.diff: %.ly $(outdir)/%-midi.ly



___
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel

Fix make error in regression tests coming from midi2ly (issue 5777053)

[dak]

http://codereview.appspot.com/5777053/diff/1/make/midi-rules.make
File make/midi-rules.make (right):

http://codereview.appspot.com/5777053/diff/1/make/midi-rules.make#newcode12
make/midi-rules.make:12: (echo '\header {'; for f in $(HEADER_FIELDS);
do echo $$f'="'; cat $(outdir)/$*.$$f; echo '"'; done; echo '}') >
$(outdir)/$*.header
This won't do since it starts generated header strings with a newline
that does not belong there (I am surprised that your shell had a version
of echo not understanding -n).

You can try
... echo $$f'="'"`cat $(outdir)/$*.$$f`"'"'; done ...

That is a bit of quoting overkill.  It will probably do to write
... echo $$f="\"`cat $(outdir)/$*.$$f`\""; done

http://codereview.appspot.com/5777053/

___
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel