From 432ff5225833fb6c385aa95acd0c55c0594708f8 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Wed, 12 Jun 2002 16:27:39 +0000 Subject: [PATCH] * stepmake/stepmake/generic-vars.make: * make/lilypond-vars.make: * GNUmakefile.in (builddir-setup): New setup for builddir run. Fixes LilyPond run from builddir for --srcdir builds. * Documentation/windows/GNUmakefile (OUT_PROFILES): Bugfix for --srcdir build. --- ChangeLog | 10 ++++++ Documentation/windows/GNUmakefile | 2 +- GNUmakefile.in | 52 +++++++++++++++++++---------- VERSION | 2 +- make/lilypond-vars.make | 28 ++++++++++------ stepmake/stepmake/generic-vars.make | 5 ++- 6 files changed, 68 insertions(+), 31 deletions(-) diff --git a/ChangeLog b/ChangeLog index 81e29a305b..a8e222e833 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2002-06-12 Jan Nieuwenhuizen + + * stepmake/stepmake/generic-vars.make: + * make/lilypond-vars.make: + * GNUmakefile.in (builddir-setup): New setup for builddir run. + Fixes LilyPond run from builddir for --srcdir builds. + + * Documentation/windows/GNUmakefile (OUT_PROFILES): Bugfix for + --srcdir build. + 2002-06-12 Han-Wen * scm/grob-description.scm (all-grob-descriptions): add diff --git a/Documentation/windows/GNUmakefile b/Documentation/windows/GNUmakefile index f9d3b46a46..2b3f8424be 100644 --- a/Documentation/windows/GNUmakefile +++ b/Documentation/windows/GNUmakefile @@ -27,7 +27,7 @@ $(outdir)/%.sh: %.sh chmod 755 $@ # Urg -$(outdir)/lilypond-profile.sh: $(outdir)/../$(depth)/buildscripts/out/lilypond-profile +$(outdir)/lilypond-profile.sh: $(outdir)/../$(depth)/buildscripts/$(outconfbase)/lilypond-profile cp $< $@ chmod 755 $@ diff --git a/GNUmakefile.in b/GNUmakefile.in index 59f5316166..695feb7fcf 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -38,10 +38,13 @@ footify: fonts: $(MAKE) -C $(depth)/mf -doc: lily fonts +run-reqs: builddir-setup fonts lily +web-reqs: run-reqs pfa-fonts + +doc: run-reqs $(MAKE) -C Documentation -web-doc: pfa-fonts +web-doc: web-reqs $(MAKE) out=www -C Documentation WWW $(MAKE) footify @@ -66,12 +69,12 @@ endif TOP_HTMLS = index.html short-examples.html long-examples.html -short-examples: pfa-fonts +short-examples: web-reqs $(MAKE) out=www -C input WWW $(PYTHON) $(buildscript-dir)/mutopia-index.py -o short-examples.html input/ -long-examples: pfa-fonts +long-examples: web-reqs $(MAKE) out=www -C mutopia WWW $(PYTHON) $(buildscript-dir)/mutopia-index.py -o long-examples.html mutopia/ @@ -80,7 +83,7 @@ lily: lily/$(outdir)/lilypond lily/$(outdir)/lilypond: $(MAKE) -C lily -local-web: fontpaths fonts lily $(TOP_HTMLS:%.html=%) footify do-top-doc top-web +local-web: web-doc $(TOP_HTMLS:%.html=%) footify do-top-doc top-web top-web: cd $(builddir) && rm -f `find . -name \*.html~ -print` @@ -100,9 +103,9 @@ top-web: #WWW: local-WWW -html-doc: local-web web: local-web -index: local-web +html-doc: web +index: web local-WWW-clean: top-WWW-clean @@ -115,15 +118,30 @@ top-WWW-clean: rm -f $(TOP_HTMLS) lily-[0-9]*.png $(SHELL) $(buildscript-dir)/clean-fonts.sh - - WWW: -fontpaths: - -ln -s $(depth)/mf/out dvips - -mkdir -p fonts - -rm fonts/source - -ln -s ../$(depth)/mf fonts/source - -ln -s ../$(depth)/mf/out fonts/afm - -ln -s ../$(depth)/mf/out fonts/tfm - -ln -s ../$(depth)/mf/out fonts/type1 +default: builddir-setup + +builddir-setup: $(depth)/$(builddir)/share/lilypond/$(TOPLEVEL_VERSION)-force + +$(depth)/$(builddir)/share/lilypond/$(TOPLEVEL_VERSION)-force: + # Preparing LilyPond tree for builddir exec + @cd $(depth)/$(builddir) && rm -rf share + @cd $(depth)/$(builddir) && mkdir -p share/lilypond + @cd $(depth)/$(builddir)/share/lilypond && mkdir -p $(TOPLEVEL_VERSION) + @cd $(depth)/$(builddir)/share/lilypond/$(TOPLEVEL_VERSION) && \ + ln -s ../../../$(srcdir)/ly ly && \ + ln -s ../../../mf/$(outconfbase) dvips && \ + ln -s ../../../mf/$(outconfbase) afm && \ + ln -s ../../../mf/$(outconfbase) tfm && \ + ln -s ../../../$(srcdir)/mf && \ + ln -s ../../../$(srcdir)/ps && \ + ln -s ../../../$(srcdir)/scm && \ + ln -s ../../../$(srcdir)/tex + @cd $(depth)/$(builddir)/share/lilypond/$(TOPLEVEL_VERSION) && \ + mkdir fonts + @cd $(depth)/$(builddir)/share/lilypond/$(TOPLEVEL_VERSION)/fonts && \ + ln -s ../../../../$(srcdir)/mf source && \ + ln -s ../../../../mf/$(outconfbase) afm && \ + ln -s ../../../../mf/$(outconfbase) tfm && \ + ln -s ../../../../mf/$(outconfbase) type1 diff --git a/VERSION b/VERSION index 2ddacd90b6..430b6a8173 100644 --- a/VERSION +++ b/VERSION @@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=5 PATCH_LEVEL=60 -MY_PATCH_LEVEL=mb1 +MY_PATCH_LEVEL=jcn1 # use the above to send patches: MY_PATCH_LEVEL is always empty for a # released version. diff --git a/make/lilypond-vars.make b/make/lilypond-vars.make index 1bac1e0ef0..631b5dbd9a 100644 --- a/make/lilypond-vars.make +++ b/make/lilypond-vars.make @@ -2,8 +2,21 @@ ## settings to run LilyPond -export PATH:=$(topdir)/lily/out:$(topdir)/buildscripts/out:$(PATH) -export TEXMF:={$(topdir),$(shell kpsexpand \$$TEXMF)} +export PATH:=$(abs-builddir)/lily/$(outconfbase):$(abs-builddir)/buildscripts/$(outconfbase):$(PATH) + +# LilyPond is often run from within $(outdir), making a relative +# PREFIX incorrect. +export LILYPONDPREFIX:=$(shell cd $(depth)/$(builddir)/share/lilypond/$(TOPLEVEL_VERSION); pwd) + +export PYTHONPATH:=$(topdir)/python:$(PYTHONPATH) + +## arg, TEXINPUTS, TFMFONTS, MFINPUTS may still override and thus break this +export TEXMF:={$(LILYPONDPREFIX),$(shell kpsexpand \$$TEXMF)} + +export MFINPUTS:= +export TEXINPUTS:= +export TFMFONTS:= + export extra_mem_top=1000000 export extra_mem_bottom=1000000 @@ -16,13 +29,6 @@ export MT_DESTROOT := $(topdir)/mf/out export DVIPSMAKEPK := mktexpk --destdir $(topdir)/mf/out endif -# don't change to "depth". It makes the GUILE barf. -# -# LilyPond is often run from within $(outdir), making a relative -# PREFIX incorrect. -export LILYPONDPREFIX:=$(shell cd $(depth)/ ; pwd) - -export PYTHONPATH:=$(topdir)/python:$(PYTHONPATH) # guile load path? @@ -35,9 +41,9 @@ ifneq ($(the-script-dir),) ABC2LY = $(script-dir)/abc2ly.py CONVERT_LY = $(script-dir)/convert-ly.py -LILYPOND = $(depth)/$(builddir)/lily/$(outconfbase)/lilypond +LILYPOND = $(abs-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 $(depth)/$(builddir)/mf/$(outconfbase)/ -I $(depth)/$(builddir)/mf/out/ +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 $(abs-builddir)/mf/$(outconfbase)/ -I $(abs-builddir)/mf/out/ LY2DVI = $(script-dir)/ly2dvi.py LYS_TO_TELY = $(buildscript-dir)/lys-to-tely.py PS_TO_GIFS = $(buildscript-dir)/ps-to-gifs.sh diff --git a/stepmake/stepmake/generic-vars.make b/stepmake/stepmake/generic-vars.make index 1679e6b90d..25186b1cd3 100644 --- a/stepmake/stepmake/generic-vars.make +++ b/stepmake/stepmake/generic-vars.make @@ -5,7 +5,10 @@ DEPTH = $(depth)/$(package-depth) ifeq ($(topdir),) -topdir := $(shell cd $(depth); pwd) +abs-srcdir := $(shell cd $(depth); pwd) +#deprecated +topdir := $(abs-srcdir) +abs-builddir := $(shell cd $(depth)/$(builddir); pwd) endif pwd := $(shell pwd) -- 2.39.5