From f365eb4494e2ccc1a1cdf8ee2d2dfa84cddc87d7 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Tue, 11 Jun 2002 15:05:02 +0000 Subject: [PATCH] * buildscripts/mutopia-index.py (headertext_nopics): Add missing variable. * GNUmakefile.in: Forward port: Add toplevel target install-html-doc. Bugfixes for --srcdir html-doc build. * make/lilypond-vars.make (LILYPOND_BOOK_INCLUDES): Forward port: Bugfix: Include $(builddir)/mf/out (was $(srcdir)/mf/out. --- ChangeLog | 15 +++++++++++++ Documentation/windows/GNUmakefile | 2 +- Documentation/windows/compiling.texi | 6 ++++++ GNUmakefile.in | 29 +++++++++++++++----------- buildscripts/mutopia-index.py | 3 +++ input/test/american-chords.ly | 3 +-- make/lilypond-vars.make | 2 +- mf/GNUmakefile | 9 ++++---- stepmake/stepmake/metafont-rules.make | 2 +- stepmake/stepmake/topdocs-targets.make | 5 +++-- 10 files changed, 53 insertions(+), 23 deletions(-) diff --git a/ChangeLog b/ChangeLog index ae79a81e7d..44561f31d0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,18 @@ +2002-06-11 Jan Nieuwenhuizen + + * buildscripts/mutopia-index.py (headertext_nopics): Add missing + variable. + + * Documentation/windows/lilypond.hint: Renamed (previously setup.hint). + + * Documentation/windows/lilypond-doc.hint: New file. + + * GNUmakefile.in: Forward port: Add toplevel target install-html-doc. + Bugfixes for --srcdir html-doc build. + + * make/lilypond-vars.make (LILYPOND_BOOK_INCLUDES): Forward port: + Bugfix: Include $(builddir)/mf/out (was $(srcdir)/mf/out. + 2002-06-10 Han-Wen * ly/script-init.ly (pralldown): add some scripts. diff --git a/Documentation/windows/GNUmakefile b/Documentation/windows/GNUmakefile index 0416dff9a9..f9d3b46a46 100644 --- a/Documentation/windows/GNUmakefile +++ b/Documentation/windows/GNUmakefile @@ -1,7 +1,7 @@ depth=../.. -EXTRA_DIST_FILES = LilyPond.ico $(wildcard *.sh *.patch) setup.hint +EXTRA_DIST_FILES = LilyPond.ico $(wildcard *.sh *.patch *.hint) STEPMAKE_TEMPLATES=documentation texinfo install install-out diff --git a/Documentation/windows/compiling.texi b/Documentation/windows/compiling.texi index 39db06541c..7eeb9f2696 100644 --- a/Documentation/windows/compiling.texi +++ b/Documentation/windows/compiling.texi @@ -74,6 +74,12 @@ introduction of the bzip2 feature. Here's how I did it: cp -pv setup.exe $CYGWIN/dist/cygwin-1.3.6/new-setup.exe strip $CYGWIN/dist/cygwin-1.3.6/new-setup.exe @end example + +@ignore +new setup: + + +@end ignore @end quotation @item @var{--prefix=/usr/lilypond-x.y.x} The standard binary installation installs LilyPond into its own prefix. diff --git a/GNUmakefile.in b/GNUmakefile.in index 1313689a2c..59f5316166 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -35,23 +35,30 @@ footify: $(footify) --index=./ `$(FIND) . -maxdepth 1 -name '*.html' -print` $(footify-all-command) - fonts: $(MAKE) -C $(depth)/mf doc: lily fonts $(MAKE) -C Documentation -web-doc: pfa-fonts +web-doc: pfa-fonts $(MAKE) out=www -C Documentation WWW $(MAKE) footify +pfa-fonts: + $(MAKE) MAKE_PFA_FILES=1 -C mf + +docdir = $(prefix)/share/doc/lilypond-$(TOPLEVEL_VERSION) +install-html-doc: html-doc + $(INSTALL) -d $(docdir)/html + tar -C $(docdir)/html -zxf $(outdir)/web.tar.gz + # KPATHSEA=0: Hack for compiling without kpathsea -- not recommended my_tfm_path = $(TFM_PATH) /tmp /tmp /tmp /tmp /tmp /tmp local-install: - mkdir -p $(datadir) + $(INSTALL) -d $(datadir) ifeq ($(KPATHSEA),0) $(foreach i, 1 2 3 4 5, rm -f $(datadir)/tfm.$(i); $(LN_S) $(word $(i), $(my_tfm_path)) $(datadir)/tfm.$(i) ; ) endif @@ -59,8 +66,6 @@ endif TOP_HTMLS = index.html short-examples.html long-examples.html -index: web-doc - short-examples: pfa-fonts $(MAKE) out=www -C input WWW $(PYTHON) $(buildscript-dir)/mutopia-index.py -o short-examples.html input/ @@ -70,9 +75,6 @@ long-examples: pfa-fonts $(MAKE) out=www -C mutopia WWW $(PYTHON) $(buildscript-dir)/mutopia-index.py -o long-examples.html mutopia/ -pfa-fonts: - $(MAKE) MAKE_PFA_FILES=1 -C mf - lily: lily/$(outdir)/lilypond lily/$(outdir)/lilypond: @@ -81,8 +83,8 @@ lily/$(outdir)/lilypond: local-web: fontpaths fonts lily $(TOP_HTMLS:%.html=%) footify do-top-doc top-web top-web: - rm -f `find . -name \*.html~ -print` - find `find Documentation input mutopia *.png index.html -type d -name 'out-www'` \ + cd $(builddir) && rm -f `find . -name \*.html~ -print` + cd $(builddir) && find `find Documentation input mutopia -type d -name 'out-www'` \ -not -name '*.dvi' -not -name '*ly' -not -name '*.tex' \ -not -name '*.ps' -not -name '*.eps' -not -name '*pk' \ -not -name '*.aux' -not -name '*.cp' -not -name '*.fn' \ @@ -90,14 +92,17 @@ top-web: -not -name '*.pg' -not -name '*.tmp' -not -name '*.toc' \ -not -name '*.fns' -not -name '*.cps' -not -name '*.nexi' \ -not -name '*.texi' -not -name '*.texidoc' -not -name '*.tp' \ + -not -name '*.pdfps' -not -name '*.eps.bbox' \ -not -name '*.log' -not -name 'out-www' -not -name '*.dep' \ > $(outdir)/weblist - ls *.png *.html >> $(outdir)/weblist - cat $(outdir)/weblist | GZIP=-9v tar -czf $(outdir)/web.tar.gz -T - + cd $(builddir) && ls *.png *.html >> $(outdir)/weblist + cat $(outdir)/weblist | (cd $(builddir); GZIP=-9v tar -czf $(outdir)/web.tar.gz -T -) #WWW: local-WWW +html-doc: local-web web: local-web +index: local-web local-WWW-clean: top-WWW-clean diff --git a/buildscripts/mutopia-index.py b/buildscripts/mutopia-index.py index 2e5d3b5e35..0faeb5ea06 100644 --- a/buildscripts/mutopia-index.py +++ b/buildscripts/mutopia-index.py @@ -65,6 +65,9 @@ browser. the postscript files. """ +headertext_nopics= r""" +

Nothing to be seen here, move along. +""" # # FIXME breaks on multiple strings. diff --git a/input/test/american-chords.ly b/input/test/american-chords.ly index 10bc55226e..eb3f03ec49 100644 --- a/input/test/american-chords.ly +++ b/input/test/american-chords.ly @@ -9,8 +9,7 @@ #(set! chord::names-alist-american (append '( - any changes here, see scm/chord-name.scm - + ;; any changes here, see scm/chord-name.scm ) chord::names-alist-american)) diff --git a/make/lilypond-vars.make b/make/lilypond-vars.make index d4af803425..42c97215f7 100644 --- a/make/lilypond-vars.make +++ b/make/lilypond-vars.make @@ -37,7 +37,7 @@ ABC2LY = $(script-dir)/abc2ly.py CONVERT_LY = $(script-dir)/convert-ly.py LILYPOND = $(depth)/$(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 $(topdir)/mf/out -I $(topdir)/mf/$(outdir)/ +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/out -I $(depth)/$(builddir)/mf/$(outdir)/ 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/mf/GNUmakefile b/mf/GNUmakefile index b4dccfed47..f8cbfc0f6a 100644 --- a/mf/GNUmakefile +++ b/mf/GNUmakefile @@ -68,10 +68,6 @@ INSTALLATION_OUT_FILES5=$(outdir)/lilypond.map endif -export MFINPUTS:=.:$(MFINPUTS) - -default: $(ALL_GEN_FILES) - $(outdir)/lilypond.map: echo $(FONT_FILES:.mf=) | tr ' ' '\n' | \ sed 's/\(.*\)/\1 \1 <\1.pfa/' > $@ @@ -79,6 +75,11 @@ $(outdir)/lilypond.map: $(outdir)/fonts.scale: echo $(FONT_FILES:.mf=.pfa) | $(PYTHON) $(topdir)/buildscripts/make-font-dir.py > $@ + +export MFINPUTS:=.:$(MFINPUTS) + +default: $(ALL_GEN_FILES) + ## ## todo: this also depends on .tfm, FIXME. $(outdir)/%.afm $(outdir)/%.enc $(outdir)/%.tex $(outdir)/%.dep: $(outdir)/%.log diff --git a/stepmake/stepmake/metafont-rules.make b/stepmake/stepmake/metafont-rules.make index ffc021aab9..888dda8a44 100644 --- a/stepmake/stepmake/metafont-rules.make +++ b/stepmake/stepmake/metafont-rules.make @@ -33,7 +33,7 @@ $(outdir)/%.pfa: %.mf mv $(basename $(@F)).pfa $(outdir) $(outdir)/%.pfb: %.mf - pktrace -I $(outdir)/ --pfb --simplify --keep-trying $(basename $(@F)) + pktrace -I $(outdir)/ --pfb --simplify --keep-trying $(basename $(@F)) mv $(basename $(@F)).pfb $(outdir) #%.afm: diff --git a/stepmake/stepmake/topdocs-targets.make b/stepmake/stepmake/topdocs-targets.make index fd64b837c6..ebb99358d0 100644 --- a/stepmake/stepmake/topdocs-targets.make +++ b/stepmake/stepmake/topdocs-targets.make @@ -3,8 +3,9 @@ default: local-doc copy-to-top: $(TO_TOP_FILES) $(foreach i, $(TO_TOP_FILES), \ - cp $(i) $(depth)/ && ) true - -cp $(outdir)/*png $(outdir)/index.html $(depth) # don't fail if not making website + cp $(i) $(depth)/$(builddir) && ) true + -cp $(outroot)/out-www/*png $(outroot)/out-www/index.html $(depth)/$(builddir) + -cp $(outdir)/*png $(outdir)/index.html $(depth)/$(builddir) # don't fail when not making website local-WWW: $(HTML_FILES) copy-to-top # we want footers even if website builds (or is built) partly -- 2.39.2