From bb8825ac8c114c2e7585f159f4803d952577b2ec Mon Sep 17 00:00:00 2001 From: John Mandereau Date: Tue, 26 Aug 2008 22:11:57 +0200 Subject: [PATCH] Add support for QUIET_BUILD make variable Also - document it in install.itely - fix formatting nitpicks in install.itely Note: redirecting all of mf2pt1.pl stdout to /dev/null is exaggerated, but it's the only easy way to junk mpost/mf excessive output when it's called by mf2pt1. --- Documentation/user/install.itely | 20 ++++++++++++-------- make/lilypond-vars.make | 5 +++++ stepmake/stepmake/metafont-rules.make | 4 ++-- stepmake/stepmake/metafont-vars.make | 6 ++++++ stepmake/stepmake/texinfo-vars.make | 2 ++ 5 files changed, 27 insertions(+), 10 deletions(-) diff --git a/Documentation/user/install.itely b/Documentation/user/install.itely index e181bf0f55..78079e595b 100644 --- a/Documentation/user/install.itely +++ b/Documentation/user/install.itely @@ -14,13 +14,6 @@ @chapter Install @end ifclear -@c I don't know what this comment does. Remove? -gp -@ignore -@h tml - -@e nd html -@end ignore - There are two sets of releases for LilyPond: stable releases, and unstable development releases. Stable versions have an even-numbered @q{minor} version number (i.e. 2.8, 2.10, 2.12, etc). Development @@ -261,6 +254,14 @@ mkdir lily-build && cd lily-build @end example + +@unnumberedsubsubsec Useful @command{make} variables + +If a less verbose build output if desired, the variable +@code{QUIET_BUILD} may be set to @code{1} on @command{make} command +line, or in @file{local.make} at top of the build tree. + + @node Building documentation @subsection Building documentation @@ -326,6 +327,9 @@ documentation maintenance are available from @file{Documentation/}; for more information, see @file{Documentation/user/README.txt} and @file{Documentation/TRANSLATION}. +The makefile variable @code{QUIET_BUILD} may be set to @code{1} for a +less verbose build output, just like for building the programs. + @knownissues @code{-j} command-line option of @command{make} is unsupported for @@ -333,7 +337,7 @@ building the documentation. As the most time consuming task is running LilyPond to build images of music, the makefile variable @code{CPU_COUNT} may be set in @file{local.make} or on the command line to the number of @code{.ly} files that LilyPond should process -simultaneously, e.g. on a bi-processor or Dual core machine +simultaneously, e.g. on a bi-processor or dual core machine @example make CPU_COUNT=2 web diff --git a/make/lilypond-vars.make b/make/lilypond-vars.make index 2736eb5069..10b82d8d9f 100644 --- a/make/lilypond-vars.make +++ b/make/lilypond-vars.make @@ -50,7 +50,12 @@ $(LANG_TEXIDOC_FLAGS) \ -ddump-signatures \ -danti-alias-factor=$(ANTI_ALIAS_FACTOR) +ifdef QUIET_BUILD +LILYPOND_BOOK_VERBOSE = +else LILYPOND_BOOK_VERBOSE = --verbose +endif + LILYPOND_BOOK_INFO_IMAGES_DIR = $(if $(INFO_IMAGES_DIR),--info-images-dir=$(INFO_IMAGES_DIR),) LILYPOND_BOOK_FLAGS = $(LILYPOND_BOOK_VERBOSE) $(LILYPOND_BOOK_INFO_IMAGES_DIR) diff --git a/stepmake/stepmake/metafont-rules.make b/stepmake/stepmake/metafont-rules.make index 64bdecf677..592a47b351 100644 --- a/stepmake/stepmake/metafont-rules.make +++ b/stepmake/stepmake/metafont-rules.make @@ -8,7 +8,7 @@ $(outdir)/%.dvi: %.mf rm $(basename $<).*gf $(outdir)/%.tfm $(outdir)/%.log: %.mf - MFINPUTS=$(src-dir) $(METAFONT) "\mode:=$(MFMODE); nonstopmode; input $<;" + MFINPUTS=$(src-dir) $(METAFONT) "\mode:=$(MFMODE); nonstopmode; input $<;" $(METAFONT_QUIET) # Let's keep this log output, it saves another mf run. mv $(basename $(@F)).log $(basename $(@F)).tfm $(outdir) rm -f $(basename $(@F)).*gf $(basename $(@F)).*pk @@ -19,7 +19,7 @@ $(outdir)/%.pfb: %.mf $(outdir)/mf2pt1.mem TMP=`mktemp -d $(outdir)/pfbtemp.XXXXXXXXX` \ && ( cd $$TMP \ && ln -s ../mf2pt1.mem . \ - && MFINPUTS=$(top-src-dir)/mf:..:: $(PERL) $(top-src-dir)/buildscripts/mf2pt1.pl $(MF2PT1_OPTIONS) $< ) \ + && MFINPUTS=$(top-src-dir)/mf:..:: $(PERL) $(top-src-dir)/buildscripts/mf2pt1.pl $(MF2PT1_OPTIONS) $< $(METAFONT_QUIET)) \ && mv $$TMP/*pfb $(outdir); \ rm -rf $$TMP diff --git a/stepmake/stepmake/metafont-vars.make b/stepmake/stepmake/metafont-vars.make index 55cad14e41..f4d5332a92 100644 --- a/stepmake/stepmake/metafont-vars.make +++ b/stepmake/stepmake/metafont-vars.make @@ -11,3 +11,9 @@ MF2PT1_OPTIONS=--rounding=0.0001 \ --family=$(notdir $(<:%.mf=%)) \ --fullname=$(notdir $(<:%.mf=%)) \ --name=$(notdir $(<:%.mf=%)) + +ifdef QUIET_BUILD +METAFONT_QUIET = >/dev/null +else +METAFONT_QUIET = +endif diff --git a/stepmake/stepmake/texinfo-vars.make b/stepmake/stepmake/texinfo-vars.make index d53bd8f7dd..a3d706f1f7 100644 --- a/stepmake/stepmake/texinfo-vars.make +++ b/stepmake/stepmake/texinfo-vars.make @@ -14,7 +14,9 @@ TEXINFO_PAPERSIZE_OPTION= $(if $(findstring $(PAPERSIZE),a4),,-t @afourpaper) MAKEINFO_FLAGS = --enable-encoding MAKEINFO = LANG= $(MAKEINFO_PROGRAM) $(MAKEINFO_FLAGS) +ifdef QUIET_BUILD TEXI2PDF_FLAGS += -q +endif # info stuff INFO_INSTALL_FILES = $(wildcard $(addsuffix *, $(INFO_FILES))) -- 2.39.2