From: John Mandereau Date: Wed, 16 Apr 2008 21:50:40 +0000 (+0200) Subject: Rework @version macro X-Git-Tag: release/2.11.58-1~32^2~145 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=50249928fd13af3479e4fa5884419e2e18ddea61;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 8e6feffeb3..2997520901 100644 --- a/make/doclang-rules.make +++ b/make/doclang-rules.make @@ -1,18 +1,23 @@ -$(outdir)/%/index.html: $(outdir)/%.texi $(OUT_PNG_IMAGES) +$(outdir)/%/index.html: $(outdir)/%.texi $(OUT_PNG_IMAGES) $(outdir)/version.texi mkdir -p $(dir $@) $(TEXI2HTML) --I=$(outdir) $(TEXI2HTML_FLAGS) --output=$(dir $@) --prefix=index --split=section $(TEXI2HTML_INIT) $< cp $(top-src-dir)/Documentation/lilypond.css $(dir $@) -$(outdir)/%-big-page.html: $(outdir)/%.texi $(OUT_PNG_IMAGES) +$(outdir)/%-big-page.html: $(outdir)/%.texi $(OUT_PNG_IMAGES) $(outdir)/version.texi $(TEXI2HTML) --I=$(outdir) $(TEXI2HTML_FLAGS) --output=$@ $(TEXI2HTML_INIT) $< cp $(top-src-dir)/Documentation/lilypond.css $(dir $@) $(outdir)/%.pdftexi: $(outdir)/%.texi doc-po $(PYTHON) $(buildscript-dir)/texi-gettext.py $(buildscript-dir) $(top-build-dir)/Documentation/po/$(outdir) $(ISOLANG) $< -$(outdir)/%.pdf: $(outdir)/%.pdftexi +$(outdir)/%.pdf: $(outdir)/%.pdftexi $(outdir)/version.texi 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'>> $@ + $(outdir)/%.png: $(top-build-dir)/Documentation/user/$(outdir)/%.png ln -f $< $@ diff --git a/make/doclang-vars.make b/make/doclang-vars.make index 230e511721..0d4da0e81b 100644 --- a/make/doclang-vars.make +++ b/make/doclang-vars.make @@ -10,16 +10,15 @@ 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) TEXI2HTML_INIT= --init-file=$(top-src-dir)/lilypond-texi2html.init TEXI2HTML_LANG=--lang=$(ISOLANG) -TEXI2HTML_FLAGS += $(TEXI2HTML_LANG) +TEXI2HTML_FLAGS += $(TEXI2HTML_LANG) $(DOCUMENTATION_INCLUDES) TEXI2HTML = LANG= $(TEXI2HTML_PROGRAM) -TEXI2PDF_FLAGS += --batch --tidy --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..caad2146d8 100644 --- a/make/ly-rules.make +++ b/make/ly-rules.make @@ -10,11 +10,11 @@ $(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. diff --git a/stepmake/stepmake/texinfo-rules.make b/stepmake/stepmake/texinfo-rules.make index b02bb9cbc0..f676dc69f2 100644 --- a/stepmake/stepmake/texinfo-rules.make +++ b/stepmake/stepmake/texinfo-rules.make @@ -8,7 +8,7 @@ # symlinks, see replace_symlinks_urls in # buildscripts/add_html_footer.py. -ifneq ($(INFO_IMAGES_DIR),'') +ifneq ($(INFO_IMAGES_DIR),) # make dereferences symlinks, and $(INFO_IMAGES_DIR) is a symlink # to $(outdir), so we can't use directly $(INFO_IMAGES_DIR) as a @@ -30,29 +30,20 @@ $(outdir)/.info-images-dir.dep: endif -# Settings for texi2html: -ifneq ($(ISOLANG),) -TEXI2HTML_LANG = --lang=$ISOLANG -endif -TEXI2HTML_FLAGS += --css-ref=lilypond.css $(DOCUMENTATION_INCLUDES) -TEXI2HTML = $(TEXI2HTML_PROGRAM) $(TEXI2HTML_FLAGS) $(TEXI2HTML_LANG) - - - -$(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)/%/index.html: $(outdir)/%.texi +$(outdir)/%/index.html: $(outdir)/%.texi $(outdir)/version.texi mkdir -p $(dir $@) $(TEXI2HTML) --I=$(outdir) --output=$(dir $@) --prefix=index --split=section $(TEXI2HTML_INIT) $< cp $(top-src-dir)/Documentation/lilypond.css $(dir $@) -$(outdir)/%-big-page.html: $(outdir)/%.texi +$(outdir)/%-big-page.html: $(outdir)/%.texi $(outdir)/version.texi $(TEXI2HTML) --I=$(outdir) -D bigpage --output=$@ $(TEXI2HTML_INIT) $< cp $(top-src-dir)/Documentation/lilypond.css $(dir $@) -$(outdir)/%.html: $(outdir)/%.texi +$(outdir)/%.html: $(outdir)/%.texi $(outdir)/version.texi $(TEXI2HTML) --I=$(outdir) --output=$@ $(TEXI2HTML_INIT) $< cp $(top-src-dir)/Documentation/lilypond.css $(dir $@) @@ -65,15 +56,18 @@ $(outdir)/%.pdf.omf: %.texi $(outdir)/%.ps.gz.omf: %.texi $(call GENERATE_OMF,ps.gz) -$(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 a510ee05b0..3b6a0e5ed3 100644 --- a/stepmake/stepmake/texinfo-vars.make +++ b/stepmake/stepmake/texinfo-vars.make @@ -1,4 +1,3 @@ - TEXI_FILES = $(call src-wildcard,*.texi) ALL_SOURCES += $(TEXI_FILES) @@ -9,15 +8,17 @@ 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) -TEXI2HTML_FLAGS = +ifneq ($(ISOLANG),) +TEXI2HTML_LANG = --lang=$(ISOLANG) +endif +TEXI2HTML_FLAGS += --css-ref=lilypond.css $(DOCUMENTATION_INCLUDES) TEXI2HTML_INIT = --init-file=$(top-src-dir)/lilypond-texi2html.init -TEXI2HTML = LANG= $(TEXI2HTML_PROGRAM) $(TEXI2HTML_FLAGS) +TEXI2HTML = $(TEXI2HTML_PROGRAM) $(TEXI2HTML_FLAGS) $(TEXI2HTML_LANG) # info stuff INFO_INSTALL_FILES = $(wildcard $(addsuffix *, $(INFO_FILES)))