From: John Mandereau Date: Wed, 16 Apr 2008 20:45:18 +0000 (+0200) Subject: Rework @version macro X-Git-Tag: release/2.11.45-1~58^2~3 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=956347c66bd27b36ccd90aa88286bf2df8145258;p=lilypond.git Rework @version macro -D "VAR VALUE" makeinfo flag, which is an unsupported hack, and @value which caused problems on some TeX configurations, are replaced with a direct macro definition in $(outdir)/version.[i]texi. --- diff --git a/Documentation/user/macros.itexi b/Documentation/user/macros.itexi index 2f236b251a..0e4eac5f1c 100644 --- a/Documentation/user/macros.itexi +++ b/Documentation/user/macros.itexi @@ -6,10 +6,7 @@ version that you are working on. See TRANSLATION for details. @end ignore -@c @value{version} -@macro version -2.11.43 -@end macro +@include version.itexi @c ***** Displaying text ***** diff --git a/make/doclang-rules.make b/make/doclang-rules.make index 1f4865d009..bda2797f7a 100644 --- a/make/doclang-rules.make +++ b/make/doclang-rules.make @@ -1,16 +1,21 @@ -$(outdir)/%/index.html: $(outdir)/%.texi +$(outdir)/%/index.html: $(outdir)/%.texi $(outdir)/version.texi mkdir -p $(dir $@) -$(MAKEINFO) -P $(outdir) --output=$(outdir)/$* --css-include=$(top-src-dir)/Documentation/texinfo.css --html $< -$(outdir)/%-big-page.html: $(outdir)/%.texi +$(outdir)/%-big-page.html: $(outdir)/%.texi $(outdir)/version.texi -$(MAKEINFO) -P $(outdir) --output=$@ --css-include=$(top-src-dir)/Documentation/texinfo.css --html --no-split --no-headers $< -$(outdir)/%.pdftexi: $(outdir)/%.texi doc-po +$(outdir)/%.pdftexi: $(outdir)/%.texi doc-po $(outdir)/version.texi $(PYTHON) $(buildscript-dir)/texi-gettext.py $(buildscript-dir) $(top-build-dir)/Documentation/po/$(outdir) $(ISOLANG) $< $(outdir)/%.pdf: $(outdir)/%.pdftexi cd $(outdir); texi2pdf $(TEXI2PDF_FLAGS) $(TEXINFO_PAPERSIZE_OPTION) $(notdir $*).pdftexi +$(outdir)/version.%: $(top-src-dir)/VERSION + echo '@macro version'> $@ + echo $(TOPLEVEL_VERSION)>> $@ + echo '@end macro'>> $@ + $(OUT_TEXI_FILES): $(ITELY_FILES) $(ITEXI_FILES) $(DEEP_HTML_FILES) $(PDF_FILES): $(ITELY_FILES) $(ITEXI_FILES) diff --git a/make/doclang-vars.make b/make/doclang-vars.make index 2577e9d285..6e36693044 100644 --- a/make/doclang-vars.make +++ b/make/doclang-vars.make @@ -7,11 +7,10 @@ DOCUMENTATION_INCLUDES = \ -I $(top-build-dir)/Documentation/user/$(outdir) LILYPOND_BOOK_INCLUDES += $(DOCUMENTATION_INCLUDES) -MAKEINFO_FLAGS += --force --enable-encoding -D 'version $(TOPLEVEL_VERSION)' $(DOCUMENTATION_INCLUDES) +MAKEINFO_FLAGS += --force --enable-encoding $(DOCUMENTATION_INCLUDES) MAKEINFO = LANG= $(MAKEINFO_PROGRAM) $(MAKEINFO_FLAGS) -TEXI2PDF_FLAGS += --batch --command '@set version $(TOPLEVEL_VERSION)' -TEXI2PDF_FLAGS += $(DOCUMENTATION_INCLUDES) +TEXI2PDF_FLAGS += --batch $(DOCUMENTATION_INCLUDES) TELY_FILES = $(call src-wildcard,*.tely) OUT_TEXI_FILES = $(TELY_FILES:%.tely=$(outdir)/%.texi) diff --git a/make/ly-rules.make b/make/ly-rules.make index 6993715ebe..ed3b85eedf 100644 --- a/make/ly-rules.make +++ b/make/ly-rules.make @@ -10,17 +10,16 @@ $(outdir)/%.latex: %.doc # don't do ``cd $(outdir)'', and assume that $(outdir)/.. is the src dir. # it is not, for --srcdir builds -$(outdir)/%.texi: %.tely +$(outdir)/%.texi: %.tely $(outdir)/version.itexi $(PYTHON) $(LILYPOND_BOOK) $(LILYPOND_BOOK_INCLUDES) --process='$(LILYPOND_BOOK_PROCESS) $(LILYPOND_BOOK_INCLUDES) $(LILYPOND_BOOK_LILYPOND_FLAGS)' --output=$(outdir) --format=$(LILYPOND_BOOK_FORMAT) $(LILYPOND_BOOK_FLAGS) $< -$(outdir)/%.texi: $(outdir)/%.tely +$(outdir)/%.texi: $(outdir)/%.tely $(outdir)/version.itexi $(PYTHON) $(LILYPOND_BOOK) $(LILYPOND_BOOK_INCLUDES) --process='$(LILYPOND_BOOK_PROCESS) $(LILYPOND_BOOK_INCLUDES) $(LILYPOND_BOOK_LILYPOND_FLAGS)' --output=$(outdir) --format=$(LILYPOND_BOOK_FORMAT) $(LILYPOND_BOOK_FLAGS) $< # # DON'T REMOVE SOURCE FILES, otherwise the .TEXI ALWAYS OUT OF DATE. # rm -f $< - $(outdir)/%.html.omf: %.tely $(call GENERATE_OMF,html) diff --git a/stepmake/stepmake/texinfo-rules.make b/stepmake/stepmake/texinfo-rules.make index 23213f8d94..4e562b1821 100644 --- a/stepmake/stepmake/texinfo-rules.make +++ b/stepmake/stepmake/texinfo-rules.make @@ -23,13 +23,13 @@ ifneq ($(INFO_IMAGES_DIR),) endif touch $@ -$(outdir)/%.info: $(outdir)/%.texi $(outdir)/$(INFO_IMAGES_DIR).info-images-dir.dep +$(outdir)/%.info: $(outdir)/%.texi $(outdir)/$(INFO_IMAGES_DIR).info-images-dir.dep $(outdir)/version.texi $(MAKEINFO) -I$(outdir) --output=$@ $< -$(outdir)/%-big-page.html: $(outdir)/%.texi +$(outdir)/%-big-page.html: $(outdir)/%.texi $(outdir)/version.texi $(MAKEINFO) -I $(outdir) --output=$@ --css-include=$(top-src-dir)/Documentation/texinfo.css --html --no-split -D bigpage --no-headers $< -$(outdir)/%.html: $(outdir)/%.texi +$(outdir)/%.html: $(outdir)/%.texi $(outdir)/version.texi $(MAKEINFO) -I $(outdir) --output=$@ --css-include=$(top-src-dir)/Documentation/texinfo.css --html --no-split --no-headers $< $(outdir)/%.html.omf: %.texi @@ -41,19 +41,22 @@ $(outdir)/%.pdf.omf: %.texi $(outdir)/%.ps.gz.omf: %.texi $(call GENERATE_OMF,ps.gz) -$(outdir)/%/index.html: $(outdir)/%.texi +$(outdir)/%/index.html: $(outdir)/%.texi $(outdir)/version.texi mkdir -p $(dir $@) $(MAKEINFO) -I $(outdir) --output=$(dir $@) --css-include=$(top-src-dir)/Documentation/texinfo.css --html $< -$(outdir)/%.pdf: $(outdir)/%.texi +$(outdir)/%.pdf: $(outdir)/%.texi $(outdir)/version.texi cd $(outdir); texi2pdf $(TEXI2PDF_FLAGS) --batch $(TEXINFO_PAPERSIZE_OPTION) $( $@ + echo $(TOPLEVEL_VERSION)>> $@ + echo '@end macro'>> $@ diff --git a/stepmake/stepmake/texinfo-vars.make b/stepmake/stepmake/texinfo-vars.make index 4ee7cefa47..d36ff83b81 100644 --- a/stepmake/stepmake/texinfo-vars.make +++ b/stepmake/stepmake/texinfo-vars.make @@ -9,10 +9,9 @@ OUTTXT_FILES += $(addprefix $(outdir)/,$(TEXI_FILES:.texi=.txt)) GENERATE_OMF = $(PYTHON) $(buildscript-dir)/texi2omf.py --format $(1) --location $(webdir)/$(tree-dir)/out-www/$(notdir $(basename $@)) --version $(TOPLEVEL_VERSION) $< > $@ -TEXI2PDF_FLAGS += --command '@set version $(TOPLEVEL_VERSION)' TEXINFO_PAPERSIZE_OPTION= $(if $(findstring $(PAPERSIZE),a4),,-t @afourpaper) -MAKEINFO_FLAGS = --enable-encoding -D 'version $(TOPLEVEL_VERSION)' +MAKEINFO_FLAGS = --enable-encoding MAKEINFO = LANG= $(MAKEINFO_PROGRAM) $(MAKEINFO_FLAGS)