From: fred Date: Sun, 24 Mar 2002 20:13:48 +0000 (+0000) Subject: lilypond-1.0.4 X-Git-Tag: release/1.5.59~2981 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=0161700478020dd81eb5b1eda129ea1c7172fcd7;p=lilypond.git lilypond-1.0.4 --- diff --git a/Documentation/topdocs/README.yo b/Documentation/topdocs/README.yo index 564d9ff917..972df8af78 100644 --- a/Documentation/topdocs/README.yo +++ b/Documentation/topdocs/README.yo @@ -17,6 +17,12 @@ if you have downloaded a version, then this is version is *not* meant for producing nice output (but to keep your patchsets up to date). It might not even compile. +The same goes for a version with a 4th version number, eg + + 1.2.3.mypatch2 + +It will be safer if you download 1.2.3 or wait for 1.2.4. + sect(REQUIREMENTS) diff --git a/configure.in b/configure.in index c77794dc88..ca80308b7d 100644 --- a/configure.in +++ b/configure.in @@ -3,7 +3,7 @@ dnl Process this file with autoconf to produce a configure script. # Bootstrap the init proces. List a file identifies your package. AC_INIT(make/lilypond.lsm.in) -AC_CONFIG_HEADER($CONFIGFILE.hh:config.hh.in) +AC_CONFIG_HEADER($CONFIGFILE.h:config.hh.in) # Bootstrap StepMake configure AC_STEPMAKE_INIT diff --git a/make/lilypond-rules.make b/make/lilypond-rules.make new file mode 100644 index 0000000000..ea30561d83 --- /dev/null +++ b/make/lilypond-rules.make @@ -0,0 +1 @@ +#empty diff --git a/make/lilypond-targets.make b/make/lilypond-targets.make new file mode 100644 index 0000000000..ea30561d83 --- /dev/null +++ b/make/lilypond-targets.make @@ -0,0 +1 @@ +#empty diff --git a/make/lilypond-vars.make b/make/lilypond-vars.make new file mode 100644 index 0000000000..1452731b2d --- /dev/null +++ b/make/lilypond-vars.make @@ -0,0 +1,6 @@ + +export PATH:=$(topdir)/lily/out:$(topdir)/buildscripts/out:$(PATH) +export MFINPUTS:=$(topdir)/mf/:.:$(MFINPUTS):: +export TEXINPUTS:=$(topdir)/tex/:.:$(TEXINPUTS):: +export LILYINCLUDE=$(topdir)/init:$(topdir)/mf/out + diff --git a/make/mutopia-rules.make b/make/mutopia-rules.make new file mode 100644 index 0000000000..0b16e7e68a --- /dev/null +++ b/make/mutopia-rules.make @@ -0,0 +1,26 @@ + + +$(outdir)/%.gif: $(outdir)/%.ps + sh $(buildscripts)/ps-to-gifs.sh $< + -mv $(name-stem)-page*.gif $(outdir)/ + touch $@ + +$(outdir)/%.ly.txt: %.ly + ln -f $< $@ + +$(outdir)/%.fly.txt: %.fly + ln -f $< $@ + + + +# don't junk intermediate .dvi files. They're easier to view than +# .ps or .gif +.PRECIOUS: $(outdir)/%.dvi + +$(outdir)/%.dvi: %.ly + sh $(depth)/scripts/ly2dvi.sh -S $(topdir) -o $(outdir) $< + -mv $(basename $<).midi $(outdir) + +$(outdir)/%.dvi: %.fly + sh $(depth)/scripts/ly2dvi.sh -S $(topdir) -o $(outdir) $< + -mv $(basename $<).midi $(outdir) diff --git a/make/mutopia-targets.make b/make/mutopia-targets.make new file mode 100644 index 0000000000..4aa51ff017 --- /dev/null +++ b/make/mutopia-targets.make @@ -0,0 +1,9 @@ + + +all: $(OUT_FILES) + + +local-WWW: $(ly_examples) $(fly_examples) $(ps_examples) $(gif_examples) + (cd $(outdir); $(PYTHON) ../$(buildscripts)/mutopia-index.py --package=$(topdir) --prefix=../ --suffix=/$(outdir) $(html_subdirs) $(all_examples)) + $(PYTHON) $(step-bindir)/add-html-footer.py --package=$(topdir) --index=$(depth)/$(outdir)/index.html $(outdir)/index.html + echo $^ > $(depth)/wwwlist diff --git a/make/mutopia.make b/make/mutopia.make new file mode 100644 index 0000000000..1c541ee636 --- /dev/null +++ b/make/mutopia.make @@ -0,0 +1,3 @@ +# make/Mutopia.make + + diff --git a/scripts/ly2dvi.sh b/scripts/ly2dvi.sh index 6213a48128..bd60c01f77 100644 --- a/scripts/ly2dvi.sh +++ b/scripts/ly2dvi.sh @@ -5,12 +5,12 @@ # Written by Jan Arne Fagertun # Sat Nov 22 22:26:43 CET 1997 # -# $Id: ly2dvi.sh,v 1.2 1998/08/14 11:16:34 fred Exp $ +# $Id: ly2dvi.sh,v 1.3 1998/08/21 22:05:30 fred Exp $ # # Original LaTeX file made by Mats Bengtsson, 17/8 1997 # -VERSION="0.12.jcn1" +VERSION="0.12" NAME=ly2dvi.sh IDENTIFICATION="$NAME $VERSION" NOW=`date` @@ -21,11 +21,9 @@ echo "$IDENTIFICATION" 1>&2 # NEWS -# 0.12.jcn1 -# - mudelaDefs really fixed (sorry, PC) - # 0.12 # - -S/--sourcedir switch +# # #0.11.jcn3 @@ -614,10 +612,11 @@ shift `expr $OPTIND - 1` if [ "$SOURCEDIR" != "" ]; then # apparently MakeTeXTFM can't handle relative dirs SOURCEDIR=`cd $SOURCEDIR; pwd` - export LILYINCLUDE="$SOURCEDIR/init:$SOURCEDIR/mf/out:$LILYINCLUDE" - export TEXINPUTS="$SOURCEDIR/tex:$TEXINPUTS:" - export MFINPUTS="$SOURCEDIR/mf:$MFINPUTS:" - export LILYPOND_EXECUTABLE="$SOURCEDIR/lily/out/lilypond" + LILYINCLUDE="$SOURCEDIR/init:$SOURCEDIR/mf/out:$LILYINCLUDE" + TEXINPUTS="$SOURCEDIR/tex:$TEXINPUTS:" + MFINPUTS="$SOURCEDIR/mf:$MFINPUTS:" + LILYPOND_EXECUTABLE="$SOURCEDIR/lily/out/lilypond" + export MFINPUTS LILYPOND_EXECUTABLE TEXINPUTS SOURCEDIR fi # @@ -637,28 +636,20 @@ regexp_quote(){ # mudelaDefs(){ # Include \def\mudela-definitions -# The aim here is to pick up the definition for the -# current file, then any other file. # -mudelatmp=$TMP/mudelaDefs$$ -# Use `cat' to prevent filenames being prepended -# -cat "$File" $OF | fgrep "$MU_DEF" > $mudelatmp for L in $MU_DEF do - # This converts \def\mudelatitle{fred} - # to \mudelatitle{fred} or to - # \def\mudelatitle{fred} - # and stops after the first one found. - sed -n '/\\def\\'"$L"'{\([^}]*\)}.*$/{ - s//'"`regexp_quote \"$1\"`"'\\'"$L"'{\1}%/p - q - }' $mudelatmp >> $LatF + for F in "$File" "$OF" + do + LL=`sed -n 's/\\\\def\\\\'"$L"'{\([^}]*\)}.*$/\1/p' "$F"` + [ "$LL" ] && { + Echo "$1\\"$L'{'"$LL"'}%' >> $LatF + break + } + done done -rm -f $mudelatmp } # -# startFile(){ # # LaTeX file name diff --git a/scripts/ly2dvi32.py b/scripts/ly2dvi32.py index 088d94b722..bd8c549ae3 100644 --- a/scripts/ly2dvi32.py +++ b/scripts/ly2dvi32.py @@ -1,7 +1,7 @@ #!@PYTHON@ name = 'ly2dvi' -version = '0.0.1' +version = '0.0.2' import sys import os @@ -166,8 +166,12 @@ class TeXOutput: \\end{document} """) this.__fd.close() - stat = os.system('latex \'\\nonstopmode \\input %s\'' % - (this.__outfile)) + if ( os.name == 'posix' ): + stat = os.system('latex \'\\nonstopmode \\input %s\'' % + (this.__outfile)) + else: # Windows shells don't eat the single quotes + stat = os.system('latex \\nonstopmode \\input %s' % + (this.__outfile)) if stat: sys.exit('ExitBadLatex') if os.path.isfile(outfile): @@ -190,10 +194,10 @@ class Properties: def get_texfile_path (this, var): path ='' - cmd =('kpsewhich tex %s' % var) + cmd =('kpsewhich tex %s 2>&1' % var) pipe = os.popen (cmd, 'r') path = pipe.readline ()[:-1] # chop off \n - if not path: + if pipe.close(): path = os.path.join(this.get('root'), 'texmf', 'tex', 'lilypond', var) fd = open(path, 'r') @@ -251,6 +255,7 @@ class Properties: p=os.path.split(p[0]) this.__set('root',p[0],'init') + t='' if os.environ.has_key ('TEXINPUTS'): t = os.pathsep + os.environ['TEXINPUTS'] os.environ['TEXINPUTS'] = os.path.join(this.get('root'), 'texmf', @@ -681,7 +686,7 @@ def main(): infile.open(file) infile.setVars() # first pass set variables infile.close() - Props.printProps() +# Props.printProps() if firstfile: outfile.start(file) else: diff --git a/stepmake/stepmake/c++-files.make b/stepmake/stepmake/c++-files.make new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/stepmake/stepmake/c++-files.make @@ -0,0 +1 @@ + diff --git a/stepmake/stepmake/c-targets.make b/stepmake/stepmake/c-targets.make new file mode 100644 index 0000000000..6bdc6921c0 --- /dev/null +++ b/stepmake/stepmake/c-targets.make @@ -0,0 +1,7 @@ +#empty + +$(configheader): $(depth)/config.h + cp $< $@ + +$(configheader): $(depth)/config.h + cp $< $@ diff --git a/stepmake/stepmake/documentation-vars.make b/stepmake/stepmake/documentation-vars.make new file mode 100644 index 0000000000..465ab3d5b5 --- /dev/null +++ b/stepmake/stepmake/documentation-vars.make @@ -0,0 +1,25 @@ +# Documentation files +AT_FILES = $(BLURBS) # +at-dir = $(doc-dir)/ +at-ext = .in + + +# +YO_FILES := $(wildcard *.yo) +POD_FILES := $(wildcard *.pod) +TEXINFO_FILES := $(wildcard *.texinfo) +OUTYO_FILES = $(addprefix $(outdir)/,$(YO_FILES)) +OUTPOD_FILES = $(addprefix $(outdir)/,$(POD_FILES)) +OUTTEXINFO_FILES = $(addprefix $(outdir)/,$(TEXINFO_FILES)) + +# +ALL_DOC_FILES = $(POD_FILES) $(TEXINFO_FILES) $(YO_FILES) +OUTTXT_FILES = $(OUTYO_FILES:.yo=.txt) $(OUTIN_FILES:.yo=.txt) +OUTHTML_FILES = $(OUTYO_FILES:.yo=.html) $(OUTIN_FILES:.yo=.html) # $(OUTREADME_HTML_FILES) +# OUTTEXINFO_FILES= $(addprefix $(outdir)/, $(addsuffix .texinfo,$(basename $(YO_FILES) .yo))) +# OUTTEXINFO_FILES = $(outdir)/topinfo.texinfo $(outdir)/mutopia.texinfo +OUTREADME_TXT_FILES=$(addprefix $(outdir)/,$(addsuffix .txt, $(README_TOP_FILES))) +OUTREADME_HTML_FILES=$(addprefix $(outdir)/,$(addsuffix .html, $(README_TOP_FILES))) + + +ALL_SOURCES += $(ALL_DOC_FILES) diff --git a/stepmake/stepmake/executable-rules.make b/stepmake/stepmake/executable-rules.make new file mode 100644 index 0000000000..1bb8bf6d7f --- /dev/null +++ b/stepmake/stepmake/executable-rules.make @@ -0,0 +1 @@ +# empty diff --git a/stepmake/stepmake/executable-targets.make b/stepmake/stepmake/executable-targets.make new file mode 100644 index 0000000000..3b175b5ad7 --- /dev/null +++ b/stepmake/stepmake/executable-targets.make @@ -0,0 +1,34 @@ +# Executable.make + +# dependency list of executable: +# + +default: $(EXECUTABLE) + +$(EXECUTABLE): $(configheader) $(O_FILES) $(outdir)/version.hh $(MODULE_LIBES) + $(foreach a, $(MODULE_LIBS), $(MAKE) -C $a && ) true + $(LD_COMMAND) $(O_FILES) $(LOADLIBES) + +exe: $(EXECUTABLE) + + + +localinstall: installexe + +localuninstall: uninstallexe + +installexe: all + -$(INSTALL) -d $(bindir) + $(foreach a, $(EXECUTABLES), \ + $(INSTALL) -m 755 $(outdir)/$(a) $(bindir)/$(a)$(DOTEXE) && \ + strip $(bindir)/$(a)$(DOTEXE) && ) true + $(foreach a, $(SEXECUTABLES), \ + $(INSTALL) -m 755 $(outdir)/$(a) $(bindir) &&) true + +uninstallexe: + $(foreach a, $(EXECUTABLES), rm -f $(bindir)/$(a)$(DOTEXE) &&) true + $(foreach a, $(SEXECUTABLES), rm -f $(bindir)/$(a) &&) true + + +%/$(outdir)/library.a: + $(MAKE) -C $(dir $@)/.. default diff --git a/stepmake/stepmake/executable-vars.make b/stepmake/stepmake/executable-vars.make new file mode 100644 index 0000000000..1bb8bf6d7f --- /dev/null +++ b/stepmake/stepmake/executable-vars.make @@ -0,0 +1 @@ +# empty diff --git a/stepmake/stepmake/library-rules.make b/stepmake/stepmake/library-rules.make new file mode 100644 index 0000000000..1bb8bf6d7f --- /dev/null +++ b/stepmake/stepmake/library-rules.make @@ -0,0 +1 @@ +# empty diff --git a/stepmake/stepmake/makedir-rules.make b/stepmake/stepmake/makedir-rules.make new file mode 100644 index 0000000000..ea30561d83 --- /dev/null +++ b/stepmake/stepmake/makedir-rules.make @@ -0,0 +1 @@ +#empty diff --git a/stepmake/stepmake/makedir-targets.make b/stepmake/stepmake/makedir-targets.make new file mode 100644 index 0000000000..341229447c --- /dev/null +++ b/stepmake/stepmake/makedir-targets.make @@ -0,0 +1,6 @@ + + +spec: $(OUTSPEC_FILES) + +$(OUTSPEC_FILES): $(depth)/VERSION +$(OUTLSM_FILES): $(depth)/VERSION diff --git a/stepmake/stepmake/metafont-rules.make b/stepmake/stepmake/metafont-rules.make new file mode 100644 index 0000000000..304512da5e --- /dev/null +++ b/stepmake/stepmake/metafont-rules.make @@ -0,0 +1,12 @@ + +$(outdir)/%.dvi: %.mf + mf $< + gftodvi $(basename $<) + mv $(basename $<).dvi $(outdir) + rm $(basename $<).*gf + +$(outdir)/%.log: %.mf + mf $< + mv $(@F) $@ + rm $(basename $< ).*gf + diff --git a/stepmake/stepmake/metafont-targets.make b/stepmake/stepmake/metafont-targets.make new file mode 100644 index 0000000000..ea30561d83 --- /dev/null +++ b/stepmake/stepmake/metafont-targets.make @@ -0,0 +1 @@ +#empty diff --git a/stepmake/stepmake/metafont-vars.make b/stepmake/stepmake/metafont-vars.make new file mode 100644 index 0000000000..67600b84bf --- /dev/null +++ b/stepmake/stepmake/metafont-vars.make @@ -0,0 +1,5 @@ + +MF_FILES = $(wildcard *.mf) +FONT_FILES = $(wildcard *[0-9].mf) +EXTRA_DIST_FILES += $(MF_FILES) + diff --git a/stepmake/stepmake/script-rules.make b/stepmake/stepmake/script-rules.make new file mode 100644 index 0000000000..1dca17b995 --- /dev/null +++ b/stepmake/stepmake/script-rules.make @@ -0,0 +1,19 @@ +# Scripts.make + + + + +$(outdir)/%: %.pl + cat $< | $(sed-atvariables) > $@ + chmod 755 $@ + +#FIXME. Check for bash? +$(outdir)/%: %.sh + cat $< | $(sed-atvariables) > $@ + chmod 755 $@ + + +$(outdir)/%: %.py + cat $< | $(sed-atvariables) > $@ + chmod 755 $@ + diff --git a/stepmake/stepmake/script-targets.make b/stepmake/stepmake/script-targets.make new file mode 100644 index 0000000000..1ba75cdf04 --- /dev/null +++ b/stepmake/stepmake/script-targets.make @@ -0,0 +1,2 @@ + +all: $(PERL_SCRIPTS) $(PYTHON_SCRIPTS) $(SH_SCRIPTS) diff --git a/stepmake/stepmake/script-vars.make b/stepmake/stepmake/script-vars.make new file mode 100644 index 0000000000..ef705ba066 --- /dev/null +++ b/stepmake/stepmake/script-vars.make @@ -0,0 +1,10 @@ + + +PERL_SCRIPTS_IN := $(wildcard *.pl) +PERL_SCRIPTS = $(addprefix $(outdir)/, $(PERL_SCRIPTS_IN:.pl=)) +SH_SCRIPTS_IN := $(wildcard *.sh) +SH_SCRIPTS = $(addprefix $(outdir)/, $(SH_SCRIPTS_IN:.sh=)) +PYTHON_SCRIPTS_IN := $(wildcard *.py) +PYTHON_SCRIPTS = $(addprefix $(outdir)/, $(PYTHON_SCRIPTS_IN:.py=)) +ALL_SCRIPTS_IN = $(SH_SCRIPTS_IN) $(PERL_SCRIPTS_IN) $(PYTHON_SCRIPTS_IN) +EXTRA_DIST_FILES += $(ALL_SCRIPTS_IN) diff --git a/stepmake/stepmake/toplevel-rules.make b/stepmake/stepmake/toplevel-rules.make new file mode 100644 index 0000000000..60a25993d6 --- /dev/null +++ b/stepmake/stepmake/toplevel-rules.make @@ -0,0 +1,5 @@ +# -*-Makefile-*- +# title Toplevel_rules.make + +# empty + diff --git a/stepmake/stepmake/toplevel-vars.make b/stepmake/stepmake/toplevel-vars.make new file mode 100644 index 0000000000..9c642cfa25 --- /dev/null +++ b/stepmake/stepmake/toplevel-vars.make @@ -0,0 +1,9 @@ +# -*-Makefile-*- +# title Toplevel_vars.make + +# override Generic_vars.make: +# do not dist ./Makefile (is copied from make/Toplevel.make) +# +DIST_FILES := $(EXTRA_DIST_FILES) +# + diff --git a/stepmake/stepmake/yolily-debian-rules.make b/stepmake/stepmake/yolily-debian-rules.make new file mode 100644 index 0000000000..74cd7be4a6 --- /dev/null +++ b/stepmake/stepmake/yolily-debian-rules.make @@ -0,0 +1,3 @@ +# Yolily_Debian_rules.make + +#empty diff --git a/stepmake/stepmake/yolily-debian-targets.make b/stepmake/stepmake/yolily-debian-targets.make new file mode 100644 index 0000000000..9c19eb29db --- /dev/null +++ b/stepmake/stepmake/yolily-debian-targets.make @@ -0,0 +1,16 @@ +# Yolily_Debian_targets.make + +default: $(OUTCONF_FILES) + + +$(outdir)/%: % + rm -f $@ + ln $< $@ + +$(outdir)/control: $(addprefix $(outdir)/, $(BLURBS)) + +$(outdir)/%: $(doc-dir)/%.in + rm -f $@ + cat $< | sed 's%^% %' > $@ + +localdist: default diff --git a/stepmake/stepmake/yolily-debian-vars.make b/stepmake/stepmake/yolily-debian-vars.make new file mode 100644 index 0000000000..924bf91645 --- /dev/null +++ b/stepmake/stepmake/yolily-debian-vars.make @@ -0,0 +1,4 @@ +# Yolily_Debian_vars.make + +#empty + diff --git a/stepmake/stepmake/yolily-topdoc-rules.make b/stepmake/stepmake/yolily-topdoc-rules.make new file mode 100644 index 0000000000..5f02ccae0c --- /dev/null +++ b/stepmake/stepmake/yolily-topdoc-rules.make @@ -0,0 +1,4 @@ +# Yolily_topdoc_rules.make + +# empty + diff --git a/stepmake/stepmake/yolily-topdoc-targets.make b/stepmake/stepmake/yolily-topdoc-targets.make new file mode 100644 index 0000000000..447b7e4316 --- /dev/null +++ b/stepmake/stepmake/yolily-topdoc-targets.make @@ -0,0 +1,18 @@ +# Yolily_topdoc_targets.make + +default: do-doc + +# urg +$(outdir)/%.html: %.yo + $(YODL2HTML) -doutdir=$(outdir) --live-data=3 -o $@.in $< + $(sed-version) < $@.in > $@ + rm -f $@.in + $(PYTHON) $(step-bindir)/add-html-footer.py --package=$(topdir) --index=index.html --news=$(depth)/NEWS $@ + +local-WWW: + -cp $(outdir)/*gif $(outdir)/index.html $(depth) # don't fail if not making website + + +copy-to-top: + $(foreach i, $(TO_TOP_FILES), \ + cp $(i) $(depth)/ && ) true diff --git a/stepmake/stepmake/yolily-topdoc-vars.make b/stepmake/stepmake/yolily-topdoc-vars.make new file mode 100644 index 0000000000..5ace65177d --- /dev/null +++ b/stepmake/stepmake/yolily-topdoc-vars.make @@ -0,0 +1,6 @@ +# Yolily_topdoc_vars.make + +# INFO_FILES = $(outdir)/$(package).info + +TO_TOP_FILES=$(addprefix $(outdir)/, $(README_TOP_FILES)) + diff --git a/stepmake/stepmake/yolily-toplevel-rules.make b/stepmake/stepmake/yolily-toplevel-rules.make new file mode 100644 index 0000000000..b21868ec72 --- /dev/null +++ b/stepmake/stepmake/yolily-toplevel-rules.make @@ -0,0 +1,4 @@ +# -*-Makefile-*- +# title Yolily_Toplevel_rules.make + +# empty diff --git a/stepmake/stepmake/yolily-toplevel-targets.make b/stepmake/stepmake/yolily-toplevel-targets.make new file mode 100644 index 0000000000..b451793c52 --- /dev/null +++ b/stepmake/stepmake/yolily-toplevel-targets.make @@ -0,0 +1,27 @@ +# -*-Makefile-*- +# title Yolily_Toplevel_targets.make + +local-dist: do-top-doc + +$(package-icon): + $(MAKE) -C Documentation/pictures icon + +do-top-doc: + -$(MAKE) -C Documentation/topdocs/ README_TOP_FILES="$(README_TXT_FILES)" copy-to-top + +$(README_TXT_FILES): do-top-doc + + +htmldoc: + $(MAKE) CONFIGSUFFIX='www' local-WWW + $(MAKE) CONFIGSUFFIX='www' -C Documentation WWW + rm -f `find . -name \*.html~ -print` + find `find Documentation -type d -name 'out-www'` -not -name '*dvi' -not -name '*ly' -not -name '*tex' -not -name '*.ps' -not -name 'out-www' > wwwlist + -ln -f $(depth)/$(distname).diff.gz out-www + tar cfz $(outdir)/htmldoc.tar.gz `cat wwwlist` `ls *.gif out-www/$(distname).diff.gz $(ERRORLOG)` index.html + + +# if you fix this, please fix yodl too! +check-top-web: + $(MAKE) -C Documentation/topdocs WWW + diff --git a/stepmake/stepmake/yolily-toplevel-vars.make b/stepmake/stepmake/yolily-toplevel-vars.make new file mode 100644 index 0000000000..063229a4c4 --- /dev/null +++ b/stepmake/stepmake/yolily-toplevel-vars.make @@ -0,0 +1,5 @@ +# -*-Makefile-*- +# title Yolily_Toplevel_vars.make + +#empty +