From c403cc4d7f0f1e68b9939d7d30fa58f20cb3e340 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Tue, 27 May 2008 11:28:04 -0300 Subject: [PATCH] Require .signature and .profile files if options are in process_cmd. Run regression test to other lilypond-book database dir. --- make/ly-rules.make | 3 ++- make/lysdoc-targets.make | 2 +- scripts/lilypond-book.py | 11 +++++++++-- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/make/ly-rules.make b/make/ly-rules.make index 6f29adc0d6..bc9e47b963 100644 --- a/make/ly-rules.make +++ b/make/ly-rules.make @@ -1,7 +1,8 @@ .SUFFIXES: .doc .tely .texi .ly # TODO: fix hardcoded out/ ? -LYS_OUTPUT_OPTION= --lily-output-dir $(top-build-dir)/out/lybook-db/ +LYS_OUTPUT_OPTION= --lily-output-dir $(LYS_OUTPUT_DIR) +LYS_OUTPUT_DIR=$(top-build-dir)/out/lybook-db/ LILYPOND_BOOK_FLAGS += $(LYS_OUTPUT_OPTION) $(outdir)/%.latex: %.doc $(PYTHON) $(LILYPOND_BOOK) $(LILYPOND_BOOK_INCLUDES) --process='$(LILYPOND_BOOK_PROCESS) $(LILYPOND_BOOK_LILYPOND_FLAGS)' --output=$(outdir) $(LILYPOND_BOOK_FLAGS) $< diff --git a/make/lysdoc-targets.make b/make/lysdoc-targets.make index b216c11bde..c2d08b5fec 100644 --- a/make/lysdoc-targets.make +++ b/make/lysdoc-targets.make @@ -16,6 +16,6 @@ local-test: echo -e '\n\n\n' ; \ (cd $(top-src-dir) && git diff ) ; \ fi > $(outdir)/tree.gittxt - $(MAKE) LILYPOND_BOOK_LILYPOND_FLAGS="-dbackend=eps --formats=ps $(LILYPOND_JOBS) -dseparate-log-files -dinclude-eps-fonts -dgs-load-lily-fonts --header=texidoc -I $(top-src-dir)/input/manual -ddump-profile -dcheck-internal-types -ddump-signatures -danti-alias-factor=1" LILYPOND_BOOK_VERBOSE= $(outdir)/collated-files.html + $(MAKE) LILYPOND_BOOK_LILYPOND_FLAGS="-dbackend=eps --formats=ps $(LILYPOND_JOBS) -dseparate-log-files -dinclude-eps-fonts -dgs-load-lily-fonts --header=texidoc -I $(top-src-dir)/input/manual -ddump-profile -dcheck-internal-types -ddump-signatures -danti-alias-factor=1" LILYPOND_BOOK_VERBOSE= $(outdir)/collated-files.html LYS_OUTPUT_DIR=$(top-build-dir)/out/lybook-testdb rsync -L -a --exclude 'out-*' --exclude 'out' --exclude mf --exclude source --exclude mf $(top-build-dir)/out/share $(outdir) diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py index 1e9acaf65a..dee3b9133e 100644 --- a/scripts/lilypond-book.py +++ b/scripts/lilypond-book.py @@ -1205,11 +1205,13 @@ class LilypondSnippet (Snippet): if not skip_lily: require_file (base + '-systems.count') + if 'ddump-profile' in global_options.process_cmd: + require_file (base + '.profile') + map (consider_file, [base + '.tex', base + '.eps', base + '.texidoc', base + '.doctitle', - base + '.signature', base + '-systems.texi', base + '-systems.tex', base + '-systems.pdftexi']) @@ -1231,11 +1233,16 @@ class LilypondSnippet (Snippet): system_count = 0 if not skip_lily and not missing: system_count = int(file (full + '-systems.count').read()) + for number in range(1, system_count + 1): systemfile = '%s-%d' % (base, number) require_file (systemfile + '.eps') consider_file (systemfile + '.pdf') - + + if 'ddump-signature' in global_options.process_cmd: + require_file (systemfile + '.signature') + + return (result, missing) def is_outdated (self, output_dir, current_files): -- 2.39.2