From d62868877468728760bddc29ebb8ba174d77ede1 Mon Sep 17 00:00:00 2001 From: Julien Rioux Date: Sun, 22 Jan 2012 10:36:31 -0500 Subject: [PATCH] Build: Generate info and pdf output from -book regtests. Allow to catch any problems in either toolchains: lilypond-book -> makeinfo lilypond-book -> texi2pdf --- input/regression/lilypond-book/GNUmakefile | 7 +++++++ scripts/build/lys-to-tely.py | 13 +++++++------ 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/input/regression/lilypond-book/GNUmakefile b/input/regression/lilypond-book/GNUmakefile index a1b4dd6b62..d5d4175c9a 100644 --- a/input/regression/lilypond-book/GNUmakefile +++ b/input/regression/lilypond-book/GNUmakefile @@ -16,6 +16,13 @@ EXTRA_DIST_FILES += $(call src-wildcard,*.ily) EXTRA_DIST_FILES += $(call src-wildcard,*.tely) EXTRA_DIST_FILES += $(call src-wildcard,*.itely) +OUT_TEXI_FILES += ${TEXI_FILES:%.texi=$(outdir)/%.info} +OUT_TEXI_FILES += ${TEXI_FILES:%.texi=$(outdir)/%.pdf} +OUT_TEXINFO_FILES += ${TEXINFO_FILES:%.texinfo=$(outdir)/%.info} +OUT_TEXINFO_FILES += ${TEXINFO_FILES:%.texinfo=$(outdir)/%.pdf} +OUT_TELY_FILES += ${TELY_FILES:%.tely=$(outdir)/%.info} +OUT_TELY_FILES += ${TELY_FILES:%.tely=$(outdir)/%.pdf} + XML_FILES = $(filter-out include%,$(call src-wildcard,*.xml)) local-test: $(OUT_FILES) diff --git a/scripts/build/lys-to-tely.py b/scripts/build/lys-to-tely.py index a868ea2903..a3bc4b576b 100644 --- a/scripts/build/lys-to-tely.py +++ b/scripts/build/lys-to-tely.py @@ -102,18 +102,19 @@ for opt in options: else: raise Exception ('unknown option: ' + o) -texi_file_re = re.compile ('.*\.i?te(ly|xi)$') -html_file_re = re.compile ('.*\.i?htm(l)?$') -xml_file_re = re.compile ('.*\.i?(xm|mx)l$') -tex_file_re = re.compile ('.*\.i?(la)?tex$') +html_file_re = re.compile ('.*\.i?html?$') +info_file_re = re.compile ('.*\.info$') pdf_file_re = re.compile ('.*\.i?pdf$') +tex_file_re = re.compile ('.*\.i?(la)?tex$') +texi_file_re = re.compile ('.*\.i?te(ly|xi|xinfo)$') +xml_file_re = re.compile ('.*\.i?(xm|mx)l$') def name2line (n): if texi_file_re.match (n): # We have a texi include file, simply include it: s = r"@include %s" % os.path.basename (n) - elif (html_file_re.match (n) or pdf_file_re.match (n) or - tex_file_re.match (n)): + elif (html_file_re.match (n) or info_file_re.match (n) + or pdf_file_re.match (n) or tex_file_re.match (n)): s = r""" @ifhtml @html -- 2.39.2