Re: make test-redo
On Oct 14, 2019, at 18:27, Carl Sorensen wrote: > > What is the defect you are seeing? The last time I tried it, it worked as > described in the CG. I wiped my build directory and ran these commands with master @ fa6c70e39a. ../lilypond-src/autogen.sh make -j3 CPU_COUNT=3 make -j3 CPU_COUNT=3 test-baseline make -j3 CPU_COUNT=3 check It found some mismatches: $ cat out/test-results/changed.txt input/regression/out-test/test-output-distance input/regression/out-test/rest-dot-position input/regression/out-test/merge-rests-engraver Then I ran these commands: make -j3 CPU_COUNT=3 # for good measure make -j3 CPU_COUNT=3 test-redo This is the output of test-redo: removing input/regression/out-test/test-output-distance-1.eps input/regression/out-test/test-output-distance-1.signature input/regression/out-test/test-output-distance-systems.count input/regression/out-test/test-output-distance-systems.tex input/regression/out-test/test-output-distance-systems.texi input/regression/out-test/test-output-distance.eps input/regression/out-test/test-output-distance.log input/regression/out-test/test-output-distance.ly input/regression/out-test/test-output-distance.profile input/regression/out-test/test-output-distance.texidoc input/regression/out-test/test-output-distance.txt removing input/regression/out-test/rest-dot-position-1.eps input/regression/out-test/rest-dot-position-1.signature input/regression/out-test/rest-dot-position-2.eps input/regression/out-test/rest-dot-position-2.signature input/regression/out-test/rest-dot-position-3.eps input/regression/out-test/rest-dot-position-3.signature input/regression/out-test/rest-dot-position-4.eps input/regression/out-test/rest-dot-position-4.signature input/regression/out-test/rest-dot-position-systems.count input/regression/out-test/rest-dot-position-systems.tex input/regression/out-test/rest-dot-position-systems.texi input/regression/out-test/rest-dot-position.eps input/regression/out-test/rest-dot-position.log input/regression/out-test/rest-dot-position.ly input/regression/out-test/rest-dot-position.profile input/regression/out-test/rest-dot-position.texidoc input/regression/out-test/rest-dot-position.txt removing input/regression/out-test/merge-rests-engraver-1.eps input/regression/out-test/merge-rests-engraver-1.signature input/regression/out-test/merge-rests-engraver-2.eps input/regression/out-test/merge-rests-engraver-2.signature input/regression/out-test/merge-rests-engraver-3.eps input/regression/out-test/merge-rests-engraver-3.signature input/regression/out-test/merge-rests-engraver-systems.count input/regression/out-test/merge-rests-engraver-systems.tex input/regression/out-test/merge-rests-engraver-systems.texi input/regression/out-test/merge-rests-engraver.eps input/regression/out-test/merge-rests-engraver.log input/regression/out-test/merge-rests-engraver.ly input/regression/out-test/merge-rests-engraver.profile input/regression/out-test/merge-rests-engraver.texidoc input/regression/out-test/merge-rests-engraver.txt For tracking crashes: use grep sourcefilename `grep -L systems.texi out/lybook-testdb/*/*log|sed s/log/ly/g` Warning: No such file: merge-rests-engraver-systems.texi (search path: .:./out-test:/home/user/lilypond-src/input/regression) Warning: No such file: rest-dot-position-systems.texi (search path: .:./out-test:/home/user/lilypond-src/input/regression) Warning: No such file: test-output-distance-systems.texi (search path: .:./out-test:/home/user/lilypond-src/input/regression) Please check the logfile /home/user/lilypond-build/input/regression/collated-files.texilog.log for errors /home/user/lilypond-src/stepmake/stepmake/texinfo-rules.make:55: recipe for target 'out-test/collated-files.html' failed make[3]: *** [out-test/collated-files.html] Error 2 /home/user/lilypond-src/./make/lysdoc-targets.make:12: recipe for target 'local-test' failed make[2]: *** [local-test] Error 2 /home/user/lilypond-src/GNUmakefile.in:319: recipe for target 'test' failed make[1]: *** [test] Error 2 /home/user/lilypond-src/GNUmakefile.in:357: recipe for target 'test-redo' failed make: *** [test-redo] Error 2 $ cat /home/user/lilypond-build/input/regression/collated-files.texilog.log *** Can't find merge-rests-engraver.texidoc, skipping (l. 25250) Max error number exceeded — Dan ___ lilypond-devel mailing list lilypond-devel@gnu.org https://lists.gnu.org/mailman/listinfo/lilypond-devel
python: replace <> with != (issue 561060043 by matt.peve...@gmail.com)
Reviewers: , Description: python: replace <> with != Replaces all usages of the deprecated <> operator with the != operator, where the former was also removed in Python3. Both operators are available in Python2.4. Please review this at https://codereview.appspot.com/561060043/ Affected files (+31, -31 lines): M python/convertrules.py M python/musicexp.py M python/musicxml.py M scripts/abc2ly.py M scripts/auxiliar/musicxml_generate_intervals.py M scripts/build/bib2texi.py M scripts/build/install.py M scripts/etf2ly.py M scripts/musicxml2ly.py Index: python/convertrules.py diff --git a/python/convertrules.py b/python/convertrules.py index 356c6882311e68ba8555f70f58861afedc76de34..345e2a3ee61f3d425b3e831947171af1ada15ad1 100644 --- a/python/convertrules.py +++ b/python/convertrules.py @@ -1017,7 +1017,7 @@ def sub_chord (m): for d in durs: if dur_str == '': dur_str = d -if dur_str <> d: +if dur_str != d: return '<%s>' % m.group (1) pslur_strs = [''] @@ -1025,7 +1025,7 @@ def sub_chord (m): slur_strs = [''] last_str = '' -while last_str <> str: +while last_str != str: last_str = str def sub_tremolos (m, slur_strs = slur_strs): Index: python/musicexp.py diff --git a/python/musicexp.py b/python/musicexp.py index c29b11b1543befc0aa6ea9fc843a336f519f0ca3..6064ffa5eea3838329340382bd47984505e8c0c0 100644 --- a/python/musicexp.py +++ b/python/musicexp.py @@ -173,8 +173,8 @@ class Duration: dur_str = '%d' % (1 << self.duration_log) dur_str += '.' * self.dots -if factor <> Rational(1, 1): -if factor.denominator() <> 1: +if factor != Rational(1, 1): +if factor.denominator() != 1: dur_str += '*%d/%d' % (factor.numerator(), factor.denominator()) else: dur_str += '*%d' % factor.numerator() @@ -1077,7 +1077,7 @@ class BarLine (Music): 'heavy': "|", 'light-light': "| |", 'light-heavy': "|.", 'heavy-light': ".|", 'heavy-heavy': ".|.", 'tick': "'", 'short': "'", 'none': "" }.get (self.type, None) -if bar_symbol <> None: +if bar_symbol != None: printer.dump ('\\bar "%s"' % bar_symbol) else: printer.dump ("|") @@ -1432,9 +1432,9 @@ class FretEvent (MarkupEvent): self.elements = [] def ly_expression (self): val = "" -if self.strings <> 6: +if self.strings != 6: val += "w:%s;" % self.strings -if self.frets <> 4: +if self.frets != 4: val += "h:%s;" % self.frets if self.barre and len (self.barre) >= 3: val += "c:%s-%s-%s;" % (self.barre[0], self.barre[1], self.barre[2]+get_transpose("integer")) Index: python/musicxml.py diff --git a/python/musicxml.py b/python/musicxml.py index 6b70e02cc580434436bedd82ac502a16bea94c98..ebf170831ac32bb91ab545e2c45bc77488d8afbf 100644 --- a/python/musicxml.py +++ b/python/musicxml.py @@ -104,7 +104,7 @@ class Xml_node: def get_unique_typed_child(self, klass): cn = self.get_typed_children(klass) -if len(cn) <> 1: +if len(cn) != 1: ly.error(self.__dict__) raise 'Child is not unique for',(klass, 'found', cn) @@ -1309,12 +1309,12 @@ class Part(Music_xml_node): if attributes_object and previous_measure and previous_measure.partial == 0: length = attributes_object.get_measure_length() new_now = measure_start_moment + length -if now <> new_now: +if now != new_now: problem = 'incomplete' if now > new_now: problem = 'overfull' ## only for verbose operation. -if problem <> 'incomplete' and previous_measure: +if problem != 'incomplete' and previous_measure: previous_measure.message('%s measure? Expected: %s, Difference: %s' %(problem, now, new_now - now)) now = new_now measure_start_moment = now @@ -1435,7 +1435,7 @@ class Part(Music_xml_node): if attributes_object and m.is_implicit(): length = attributes_object.get_measure_length() measure_end = measure_start_moment + length -if measure_end <> now: +if measure_end != now: m.partial = now previous_measure = m Index: scripts/abc2ly.py diff --git a/scripts/abc2ly.py b/scripts/abc2ly.py index 508cc93657ac53691a562e8221c06b4aace0b3f3..bb441d2b9514049373291ef3ba6e085d0ed2c558 100644 --- a/scripts/abc2ly.py +++ b/scripts/abc2ly.py @@ -894,7 +894,7 @@ def parse_duration (str,
Re: make test-redo
On 10/14/19, 3:41 PM, "lilypond-devel on behalf of Dan Eble" wrote: "make test-redo" seems to be defective, so I’m thinking of removing it and simplifying the Contributor’s Guide. The last discussion I can find of it in the lilypond-devel archive is from 7 years ago, but I thought it would be good to ask if anyone here has used it successfully recently, just in case I’m doing something wrong. What is the defect you are seeing? The last time I tried it, it worked as described in the CG. Thanks, Carl ___ lilypond-devel mailing list lilypond-devel@gnu.org https://lists.gnu.org/mailman/listinfo/lilypond-devel
make test-redo
"make test-redo" seems to be defective, so I’m thinking of removing it and simplifying the Contributor’s Guide. The last discussion I can find of it in the lilypond-devel archive is from 7 years ago, but I thought it would be good to ask if anyone here has used it successfully recently, just in case I’m doing something wrong. Thanks, — Dan ___ lilypond-devel mailing list lilypond-devel@gnu.org https://lists.gnu.org/mailman/listinfo/lilypond-devel
Re: lilypond does not work with Mac OS 10.15 (Catalina)
> On 12 Oct 2019, at 07:21, Eric Benson wrote: > > gcc8 doesn’t build in MacPorts on Catalina, at least it didn’t build for me > on Thursday. There was a MacPorts release on Friday, but I haven’t tried it > yet. Maybe the problem has been fixed. I never got lilypond to build with > gcc8 because I couldn’t build gcc8. I just modified the Portfile so it used > gcc9 instead. As far as I know, there’s no reason to think that lilypond > would have a dependency on any particular version of gcc, or even on gcc at > all. In case you are curios about making a binary distribution, I did that [1]. Werner suggested to put the stuff in /opt/lilypond/ instead of /usr/local/. 1. https://lists.gnu.org/archive/html/lilypond-devel/2019-03/msg00065.html ___ lilypond-devel mailing list lilypond-devel@gnu.org https://lists.gnu.org/mailman/listinfo/lilypond-devel
Re: make clean after mf changes
Dan, On Mon, 14 Oct 2019 09:24:39 -0400, Dan Eble wrote: > The Contributor’s Guide says, > > > Also, if you modify any font definitions in the mf/ directory then you must > > run make clean and make before running make test-redo. This will recompile > > everything, whether modified or not, and takes a lot longer. > > I assume the superficial explanation for requiring “make clean" here is that > the makefile dependencies are (or were) incomplete. If you have deeper > knowledge, I’d appreciate being told anything that would shorten my > investigation into it. “That’s old and shouldn’t be required anymore” or > “Fixing it is hopeless!” would also be helpful. There are a number of mentions of why this is needed in the archives - I just have trouble finding them - however here is one thread https://lists.gnu.org/archive/html/lilypond-devel/2011-04/msg00054.html I hope that means more to you than me and is helpful. James ___ lilypond-devel mailing list lilypond-devel@gnu.org https://lists.gnu.org/mailman/listinfo/lilypond-devel
make clean after mf changes
The Contributor’s Guide says, > Also, if you modify any font definitions in the mf/ directory then you must > run make clean and make before running make test-redo. This will recompile > everything, whether modified or not, and takes a lot longer. I assume the superficial explanation for requiring “make clean" here is that the makefile dependencies are (or were) incomplete. If you have deeper knowledge, I’d appreciate being told anything that would shorten my investigation into it. “That’s old and shouldn’t be required anymore” or “Fixing it is hopeless!” would also be helpful. Thanks in advance, — Dan ___ lilypond-devel mailing list lilypond-devel@gnu.org https://lists.gnu.org/mailman/listinfo/lilypond-devel