makefiles: Don't sort file list in lys-to-tely, but sort lsr list on creation

Also, Fix musicxml regression test to no longer duplicate the .texi files.
For this, I first need to sort the list of *.{xml,mxl,texi,tely,itexi,itely}
files and only after that rewrite all *.{mxl,xml} files to their out-www/*.ly
counterparts...

diff --git a/buildscripts/lys-to-tely.py b/buildscripts/lys-to-tely.py
index 96539a27fcaa353471274b0339325ef0d7e2b894..c9d698f92cea0764b2e608a7bda5c4b75b9f35a6 100755 (executable)
--- a/buildscripts/lys-to-tely.py
+++ b/buildscripts/lys-to-tely.py
@@ -111,7 +111,6 @@ if files:
     name = os.path.basename (name)
     template = template % vars ()
 
-    files.sort ()
     s = "\n".join (map (name2line, files))
     s = template.replace (include_snippets, s, 1)
     f = "%s/%s" % (dir, name)

diff --git a/buildscripts/makelsr.py b/buildscripts/makelsr.py
index 86323d260d5f9ad89269c407cccfaf155217831b..cb0619f6deae2e726b0b0e28d90062fbbc4123e3 100755 (executable)
--- a/buildscripts/makelsr.py
+++ b/buildscripts/makelsr.py
@@ -155,7 +155,7 @@ for (name, (srcdir, tags)) in snippets.items ():
        copy_ly (srcdir, name, tags)
 
 for (tag, file_set) in tag_lists.items ():
-       dump_file_list (os.path.join (DEST, tag + '.snippet-list'), file_set)
+       dump_file_list (os.path.join (DEST, tag + '.snippet-list'), sorted(file_set))
 
 if unconverted:
        sys.stderr.write ('These files could not be converted successfully by convert-ly:\n')

diff --git a/input/regression/musicxml/GNUmakefile b/input/regression/musicxml/GNUmakefile
index 24ccf2bc320369ebde72a6c0c34c805f26742583..4890e0b6b3385f0d9b0ee931ab870f8e03a38b63 100644 (file)
--- a/input/regression/musicxml/GNUmakefile
+++ b/input/regression/musicxml/GNUmakefile
@@ -6,13 +6,11 @@ LOCALSTEPMAKE_TEMPLATES=lilypond ly lysdoc musicxml
 TITLE=Lilypond musicxml2ly Regression Tests
 
 
-OUT_ITEXI_FILES = ${ITEXI_FILES:%.itexi=$(outdir)/%.itexi}
-
-COLLATED_FILES = $(sort $(OUT_LY_FILES) $(OUT_ITEXI_FILES) )
+# Urgh, how can I do two replacements at once without messing up the order of the list?
+TMP = $(sort $(MUSICXML_FILES) $(MUSICMXL_FILES) $(TEXINFO_SOURCES) )
+TMP1 = ${TMP:%.xml=$(outdir)/%.ly}
+COLLATED_FILES = ${TMP1:%.mxl=$(outdir)/%.ly}
 
 
 include $(depth)/make/stepmake.make
 TITLE=Lilypond musicxml2ly Regression Tests
-
-$(outdir)/%.itexi: %.itexi
-       ln -f $< $@