X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=make%2Flilypond-vars.make;h=e67a570c92706d79e0913034b599577ef3e656ce;hb=0c374a7a60135d03ee9f0a38132eb684be963473;hp=0b8613180dd30f8f369bcb343eab5bd151cb2cf2;hpb=bb338ab34126b81c8561710706ccfa27bf3650e4;p=lilypond.git

diff --git a/make/lilypond-vars.make b/make/lilypond-vars.make
index 0b8613180d..e67a570c92 100644
--- a/make/lilypond-vars.make
+++ b/make/lilypond-vars.make
@@ -1,45 +1,81 @@
 ##
 ## settings to run LilyPond
+ifeq ($(LILYPOND_EXTERNAL_BINARY),)
 
+# environment settings.
+export PATH:=$(top-build-dir)/lily/$(outconfbase):$(buildscript-dir):$(top-build-dir)/scripts/$(outconfbase):$(PATH):
+export LILYPOND_BINARY=$(top-build-dir)/$(outconfbase)/bin/lilypond
+else
 
-export PATH:=$(builddir)/lily/$(outconfbase):$(builddir)/buildscripts/$(outconfbase):$(PATH)
+## better not take the binaries  from a precompiled bundle, as they
+## rely on env vars for relocation.
+##
 
-# LilyPond is often run from within $(outdir), making a relative
-# PREFIX incorrect.
-export LILYPONDPREFIX:=$(build_lilypond_datadir)
+#export PATH:=$(dir $(LILYPOND_EXTERNAL_BINARY)):$(PATH)
+export LILYPOND_BINARY=$(LILYPOND_EXTERNAL_BINARY)
+endif
 
-export PYTHONPATH:=$(builddir)/python/$(outconfbase):$(PYTHONPATH)
+LANGS=$(shell $(PYTHON) $(top-src-dir)/python/langdefs.py)
 
-## arg, TEXINPUTS, TFMFONTS, MFINPUTS may still override and thus break this
-export TEXMF:={$(LILYPONDPREFIX),$(shell kpsexpand \$$TEXMF)}
+export PYTHONPATH:=$(top-build-dir)/python/$(outconfbase):$(PYTHONPATH)
 
-export MFINPUTS:=
-export TEXINPUTS:=
-export TFMFONTS:=
-export extra_mem_top=1000000
-export extra_mem_bottom=1000000
-export pool_size=500000
+the-script-dir=$(wildcard $(script-dir))
 
+ABC2LY = $(script-dir)/abc2ly.py
+MIDI2LY = $(script-dir)/midi2ly.py
+MUSICXML2LY = $(script-dir)/musicxml2ly.py
+CONVERT_LY = $(script-dir)/convert-ly.py
+LILYPOND_BOOK = $(script-dir)/lilypond-book.py
 
-ifdef DEB_BUILD
-export PKFONTS := $(topdir)/mf/out
-export MT_DESTROOT := $(topdir)/mf/out
-export DVIPSMAKEPK := mktexpk --destdir $(topdir)/mf/out
-endif
+LILYPOND_BOOK_INCLUDES = -I $(src-dir) $(DOCUMENTATION_INCLUDES)
 
+## override from cmd line to speed up. 
+ANTI_ALIAS_FACTOR=2
+LILYPOND_JOBS=$(if $(CPU_COUNT),-djob-count=$(CPU_COUNT),)
+LANG_TEXIDOC_FLAGS:=$(foreach lang,$(LANGS),--header=texidoc$(lang))
+LANG_DOCTITLE_FLAGS:=$(foreach lang,$(LANGS),--header=doctitle$(lang))
 
-# guile load path?
+LILYPOND_BOOK_LILYPOND_FLAGS=-dbackend=eps \
+--formats=ps,png,pdf \
+$(LILYPOND_JOBS) \
+-dinclude-eps-fonts \
+-dgs-load-fonts \
+--header=doctitle \
+$(LANG_DOCTITLE_FLAGS) \
+--header=texidoc \
+$(LANG_TEXIDOC_FLAGS) \
+-dcheck-internal-types \
+-ddump-signatures \
+-danti-alias-factor=$(ANTI_ALIAS_FACTOR)
 
-the-script-dir=$(wildcard $(script-dir))
+ifdef QUIET_BUILD
+LILYPOND_BOOK_WARN = --loglevel=NONE
+else
+LILYPOND_BOOK_WARN = --loglevel=WARN
+endif
 
+LILYPOND_BOOK_INFO_IMAGES_DIR = $(if $(INFO_IMAGES_DIR),--info-images-dir=$(INFO_IMAGES_DIR),)
+LILYPOND_BOOK_FLAGS = $(LILYPOND_BOOK_WARN) $(LILYPOND_BOOK_INFO_IMAGES_DIR)
 
-ABC2LY = $(script-dir)/abc2ly.py
-CONVERT_LY = $(script-dir)/convert-ly.py
-LILYPOND = $(builddir)/lily/$(outconfbase)/lilypond
-LILYPOND_BOOK = $(script-dir)/lilypond-book.py
-LILYPOND_BOOK_INCLUDES = -I $(pwd) -I $(outdir) -I$(input-dir) -I $(input-dir)/tricks/ -I $(input-dir)/regression/ -I $(input-dir)/test/ -I $(input-dir)/tutorial/ -I $(builddir)/mf/$(outconfbase)/  -I $(builddir)/mf/out/
+ifeq ($(out),)
+LILYPOND_BOOK_PROCESS = true
+LILYPOND_BOOK_FLAGS += --skip-lily-check
+else
+LILYPOND_BOOK_PROCESS = $(LILYPOND_BINARY)
+endif
+ifeq ($(out),test)
+LILYPOND_BOOK_FLAGS += --skip-png-check
+endif
+
+TEXINPUTS=$(top-src-dir)/tex/::
+export TEXINPUTS
+TEXFONTMAPS=$(top-build-dir)/tex/$(outdir)::
+export TEXFONTMAPS
+
+export LYDOC_LOCALEDIR:= $(top-build-dir)/Documentation/po/out-www
 
 #texi-html for www only:
 LILYPOND_BOOK_FORMAT=$(if $(subst out-www,,$(notdir $(outdir))),texi,texi-html)
-LY2DVI = $(script-dir)/lilypond.py
-LYS_TO_TELY = $(buildscript-dir)/lys-to-tely.py
+LY2DVI = $(LILYPOND_BINARY)
+LYS_TO_TELY = $(buildscript-dir)/lys-to-tely
+