From 35b22a3ae58b3b8694ce65e374041643ff124b70 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Fri, 30 Oct 1998 17:10:28 +0100 Subject: [PATCH] patch::: 1.1.0.uu2.jcn1: fixjes pl 0.uu2.jcn1 - ly2dvi.py -I fix - too annoying buildscripts, scripts -> bin - Documentation/tex/feta.tex - doco fixes: PATCHES.yo, yodl-1.31.7 --- Generated by janneke@gnu.org using package-diff 0.62, >From = lilypond-1.1.0.uu2, To = lilypond-1.1.0.uu2.jcn1 usage cd lilypond-source-dir; patch -E -p1 < lilypond-1.1.0.uu2.jcn1.diff Patches do not contain automatically generated files or (urg) empty directories, i.e., you should rerun autoconf, configure and possibly make outdirs. --state 1.1.0.uu2 1.1.0.uu2.jcn1 ++state --- Documentation/faq.yo | 2 +- Documentation/topdocs/INSTALL.yo | 8 ++++---- Documentation/topdocs/PATCHES.yo | 2 +- Documentation/topdocs/index.yo | 1 + NEWS | 12 +++++++++++- VERSION | 2 +- {scripts => bin}/GNUmakefile | 0 {buildscripts => bin}/clean-diaper.sh | 0 {buildscripts => bin}/clean-fonts.sh | 0 {scripts => bin}/convert-mudela.py | 0 {buildscripts => bin}/docxx-lily.sh | 0 {buildscripts => bin}/find-typenames.pl | 0 {buildscripts => bin}/gen-sitemap.sh | 0 {buildscripts => bin}/genheader.py | 0 {buildscripts => bin}/html-accents.py | 0 {buildscripts => bin}/lilypond-login.sh | 0 {buildscripts => bin}/lilypond-profile.sh | 0 {buildscripts => bin}/localpackage.py | 0 {buildscripts => bin}/ltmain.sh | 0 {scripts => bin}/ly2dvi-old.sh | 0 {scripts => bin}/ly2dvi.py | 5 +++-- {buildscripts => bin}/mail-address.sh | 0 {buildscripts => bin}/mf-to-table.py | 0 {buildscripts => bin}/mf-to-xpms.sh | 0 {scripts => bin}/mudela-book.py | 0 {buildscripts => bin}/mutopia-index.py | 0 {buildscripts => bin}/profile-conf.sh | 0 {buildscripts => bin}/ps-to-gifs.sh | 0 {buildscripts => bin}/ps-to-pfa.py | 0 {buildscripts => bin}/ps-to-pngs.sh | 0 {buildscripts => bin}/run-lilypond.sh | 0 {buildscripts => bin}/set-lily.sh | 6 +++--- {buildscripts => bin}/show-current.sh | 0 {buildscripts => bin}/template.py | 0 buildscripts/GNUmakefile | 12 ------------ make/generic-vars.make | 5 +++-- make/lilypond-vars.make | 2 +- make/lilypond.spec.in | 4 ++-- make/mudela-rules.make | 2 +- make/mutopia-rules.make | 4 ++-- make/mutopia-targets.make | 2 +- make/toplevel.make.in | 2 +- stepmake/stepmake/metafont-targets.make | 2 +- stepmake/stepmake/metapost-rules.make | 2 +- 44 files changed, 38 insertions(+), 37 deletions(-) rename {scripts => bin}/GNUmakefile (100%) rename {buildscripts => bin}/clean-diaper.sh (100%) mode change 100755 => 100644 rename {buildscripts => bin}/clean-fonts.sh (100%) mode change 100755 => 100644 rename {scripts => bin}/convert-mudela.py (100%) rename {buildscripts => bin}/docxx-lily.sh (100%) rename {buildscripts => bin}/find-typenames.pl (100%) rename {buildscripts => bin}/gen-sitemap.sh (100%) rename {buildscripts => bin}/genheader.py (100%) rename {buildscripts => bin}/html-accents.py (100%) rename {buildscripts => bin}/lilypond-login.sh (100%) rename {buildscripts => bin}/lilypond-profile.sh (100%) rename {buildscripts => bin}/localpackage.py (100%) rename {buildscripts => bin}/ltmain.sh (100%) rename {scripts => bin}/ly2dvi-old.sh (100%) rename {scripts => bin}/ly2dvi.py (99%) rename {buildscripts => bin}/mail-address.sh (100%) rename {buildscripts => bin}/mf-to-table.py (100%) rename {buildscripts => bin}/mf-to-xpms.sh (100%) rename {scripts => bin}/mudela-book.py (100%) rename {buildscripts => bin}/mutopia-index.py (100%) rename {buildscripts => bin}/profile-conf.sh (100%) rename {buildscripts => bin}/ps-to-gifs.sh (100%) mode change 100755 => 100644 rename {buildscripts => bin}/ps-to-pfa.py (100%) rename {buildscripts => bin}/ps-to-pngs.sh (100%) mode change 100755 => 100644 rename {buildscripts => bin}/run-lilypond.sh (100%) rename {buildscripts => bin}/set-lily.sh (87%) mode change 100755 => 100644 rename {buildscripts => bin}/show-current.sh (100%) rename {buildscripts => bin}/template.py (100%) delete mode 100644 buildscripts/GNUmakefile diff --git a/Documentation/faq.yo b/Documentation/faq.yo index 059cc78381..327a83eb5c 100644 --- a/Documentation/faq.yo +++ b/Documentation/faq.yo @@ -381,7 +381,7 @@ wrong symbols and dvi-checksum errors!) We obviously mucked with the fonts in the upgrade. Remove em(all) previous fonts, including the file(.pk) and file(.tfm) fonts in file(/var/lib/texmf). A script automating this has been included, see -file(buildscripts/clean-fonts.sh). +file(bin/clean-fonts.sh). question(The beams and slurs are gone if use the XDvi magnifying glass!?) diff --git a/Documentation/topdocs/INSTALL.yo b/Documentation/topdocs/INSTALL.yo index 75bc165155..9a72516764 100644 --- a/Documentation/topdocs/INSTALL.yo +++ b/Documentation/topdocs/INSTALL.yo @@ -4,13 +4,13 @@ sect(ABSTRACT) You do something which looks remotely like verb( - configure # Check out the buildscripts/set-lily.sh script + configure # Check out the bin/set-lily.sh script make make install ) The detailed instructions follow here. The -file(buildscripts/set-lily.sh) script sets some environment variables +file(bin/set-lily.sh) script sets some environment variables and symlinks, which comes in handly when you have to compile LilyPond very often. It is aimed at people who run (or debug) LilyPond without installing. @@ -60,8 +60,8 @@ export TEXINPUTS="/usr/local/share/lilypond/tex:" The empty path component represents TeX() and MetaFont's default search paths. Scripts with the proper paths for the bourne and C-shell respectively are generated in -file(buildscripts/out/lilypond-profile) and -file(buildscripts/out/lilypond-login) during compilation. +file(bin/out/lilypond-profile) and +file(bin/out/lilypond-login) during compilation. sect(RECOMMENDED) diff --git a/Documentation/topdocs/PATCHES.yo b/Documentation/topdocs/PATCHES.yo index 1b20b7c37a..b08b7ea428 100644 --- a/Documentation/topdocs/PATCHES.yo +++ b/Documentation/topdocs/PATCHES.yo @@ -47,7 +47,7 @@ verb( which rolls the tarball file(../releases/lilypond-0.1.73.tar.gz) and leaves your patch as file(./lilypond-0.1.73.jcn1.diff). footnote('Make diff' generates a patch between two tarballs. For -more info type 'make diff help=='. We assume that there is a tarball +more info type 'make diff help=='.) We assume that there is a tarball file(lilypond-0.1.73.tar.gz) in the directory file(../releases). diff --git a/Documentation/topdocs/index.yo b/Documentation/topdocs/index.yo index 1307c60e3b..fc1675b132 100644 --- a/Documentation/topdocs/index.yo +++ b/Documentation/topdocs/index.yo @@ -39,6 +39,7 @@ nsect(Sites) description( dit(lurl(http://www.cs.uu.nl/people/hanwen/lilypond/))Han-Wen's site. +dit(lurl(http://www.xs4all.nl/~jantien/lilypond/))Jan's site. dit(lurl(http://www.realtime.net/~daboys/lilypond/))Jeff's Windows NT Distribution site. ) diff --git a/NEWS b/NEWS index 147d1a9977..773427906b 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,14 @@ -pl 0.jcn1 +--- ../lilypond-1.1.0.uu2/NEWS Thu Oct 29 00:59:19 1998 +++ b/NEWS Fri Oct 30 17:01:27 1998 +@@ -1,3 +1,8 @@ +pl 0.uu2.jcn1 + - ly2dvi.py -I fix + - too annoying buildscripts, scripts -> bin + - Documentation/tex/feta.tex + - doco fixes: PATCHES.yo, yodl-1.31.7 + + pl 0.uu2 + - undone type_info::before hack. (Ugh. RTFM).pl 0.jcn1 pl 17.jcn7 - added: set*text, timesig, beam - guile-1.3 is fine; my egcs-1.0.2's -O2 is broken diff --git a/VERSION b/VERSION index c427fb2b32..0629b515d5 100644 --- a/VERSION +++ b/VERSION @@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=1 PATCH_LEVEL=0 -MY_PATCH_LEVEL=jcn1 +MY_PATCH_LEVEL=uu2.jcn1 # use the above to send patches: MY_PATCH_LEVEL is always empty for a # released version. diff --git a/scripts/GNUmakefile b/bin/GNUmakefile similarity index 100% rename from scripts/GNUmakefile rename to bin/GNUmakefile diff --git a/buildscripts/clean-diaper.sh b/bin/clean-diaper.sh old mode 100755 new mode 100644 similarity index 100% rename from buildscripts/clean-diaper.sh rename to bin/clean-diaper.sh diff --git a/buildscripts/clean-fonts.sh b/bin/clean-fonts.sh old mode 100755 new mode 100644 similarity index 100% rename from buildscripts/clean-fonts.sh rename to bin/clean-fonts.sh diff --git a/scripts/convert-mudela.py b/bin/convert-mudela.py similarity index 100% rename from scripts/convert-mudela.py rename to bin/convert-mudela.py diff --git a/buildscripts/docxx-lily.sh b/bin/docxx-lily.sh similarity index 100% rename from buildscripts/docxx-lily.sh rename to bin/docxx-lily.sh diff --git a/buildscripts/find-typenames.pl b/bin/find-typenames.pl similarity index 100% rename from buildscripts/find-typenames.pl rename to bin/find-typenames.pl diff --git a/buildscripts/gen-sitemap.sh b/bin/gen-sitemap.sh similarity index 100% rename from buildscripts/gen-sitemap.sh rename to bin/gen-sitemap.sh diff --git a/buildscripts/genheader.py b/bin/genheader.py similarity index 100% rename from buildscripts/genheader.py rename to bin/genheader.py diff --git a/buildscripts/html-accents.py b/bin/html-accents.py similarity index 100% rename from buildscripts/html-accents.py rename to bin/html-accents.py diff --git a/buildscripts/lilypond-login.sh b/bin/lilypond-login.sh similarity index 100% rename from buildscripts/lilypond-login.sh rename to bin/lilypond-login.sh diff --git a/buildscripts/lilypond-profile.sh b/bin/lilypond-profile.sh similarity index 100% rename from buildscripts/lilypond-profile.sh rename to bin/lilypond-profile.sh diff --git a/buildscripts/localpackage.py b/bin/localpackage.py similarity index 100% rename from buildscripts/localpackage.py rename to bin/localpackage.py diff --git a/buildscripts/ltmain.sh b/bin/ltmain.sh similarity index 100% rename from buildscripts/ltmain.sh rename to bin/ltmain.sh diff --git a/scripts/ly2dvi-old.sh b/bin/ly2dvi-old.sh similarity index 100% rename from scripts/ly2dvi-old.sh rename to bin/ly2dvi-old.sh diff --git a/scripts/ly2dvi.py b/bin/ly2dvi.py similarity index 99% rename from scripts/ly2dvi.py rename to bin/ly2dvi.py index 74c5495c08..943aef7bec 100644 --- a/scripts/ly2dvi.py +++ b/bin/ly2dvi.py @@ -14,7 +14,7 @@ Output: DVI file """ name = 'ly2dvi' -version = '0.0.5' +version = '0.0.6' errorlog = '' import sys @@ -876,7 +876,8 @@ class Properties: def getLilyopts(): inc = '' if len(Props.get('include')) > 0: - inc = '-I ' + string.join(Props.get('include'),os.pathsep) + # inc = '-I ' + string.join(Props.get('include'), os.pathsep ()) + inc = '-I ' + string.join(Props.get('include'), " -I ") else: if Props.get('dependencies'): diff --git a/buildscripts/mail-address.sh b/bin/mail-address.sh similarity index 100% rename from buildscripts/mail-address.sh rename to bin/mail-address.sh diff --git a/buildscripts/mf-to-table.py b/bin/mf-to-table.py similarity index 100% rename from buildscripts/mf-to-table.py rename to bin/mf-to-table.py diff --git a/buildscripts/mf-to-xpms.sh b/bin/mf-to-xpms.sh similarity index 100% rename from buildscripts/mf-to-xpms.sh rename to bin/mf-to-xpms.sh diff --git a/scripts/mudela-book.py b/bin/mudela-book.py similarity index 100% rename from scripts/mudela-book.py rename to bin/mudela-book.py diff --git a/buildscripts/mutopia-index.py b/bin/mutopia-index.py similarity index 100% rename from buildscripts/mutopia-index.py rename to bin/mutopia-index.py diff --git a/buildscripts/profile-conf.sh b/bin/profile-conf.sh similarity index 100% rename from buildscripts/profile-conf.sh rename to bin/profile-conf.sh diff --git a/buildscripts/ps-to-gifs.sh b/bin/ps-to-gifs.sh old mode 100755 new mode 100644 similarity index 100% rename from buildscripts/ps-to-gifs.sh rename to bin/ps-to-gifs.sh diff --git a/buildscripts/ps-to-pfa.py b/bin/ps-to-pfa.py similarity index 100% rename from buildscripts/ps-to-pfa.py rename to bin/ps-to-pfa.py diff --git a/buildscripts/ps-to-pngs.sh b/bin/ps-to-pngs.sh old mode 100755 new mode 100644 similarity index 100% rename from buildscripts/ps-to-pngs.sh rename to bin/ps-to-pngs.sh diff --git a/buildscripts/run-lilypond.sh b/bin/run-lilypond.sh similarity index 100% rename from buildscripts/run-lilypond.sh rename to bin/run-lilypond.sh diff --git a/buildscripts/set-lily.sh b/bin/set-lily.sh old mode 100755 new mode 100644 similarity index 87% rename from buildscripts/set-lily.sh rename to bin/set-lily.sh index d44317dc8e..c85a44b8e3 --- a/buildscripts/set-lily.sh +++ b/bin/set-lily.sh @@ -38,9 +38,9 @@ fi ln -sf $LILYPOND_SOURCEDIR/lily/out/lilypond $prefix/bin/lilypond ln -sf $LILYPOND_SOURCEDIR/mi2mu/out/mi2mu $prefix/bin/mi2mu -ln -sf $LILYPOND_SOURCEDIR/scripts/ly2dvi.sh $prefix/bin/ly2dvi -chmod 755 $LILYPOND_SOURCEDIR/buildscripts/ps-to-gifs.sh -ln -sf $LILYPOND_SOURCEDIR/buildscripts/ps-to-gifs.sh $prefix/bin/ps-to-gifs +ln -sf $LILYPOND_SOURCEDIR/bin/ly2dvi.sh $prefix/bin/ly2dvi +chmod 755 $LILYPOND_SOURCEDIR/bin/ps-to-gifs.sh +ln -sf $LILYPOND_SOURCEDIR/bin/ps-to-gifs.sh $prefix/bin/ps-to-gifs if [ -f ../.gdbinit ]; then diff --git a/buildscripts/show-current.sh b/bin/show-current.sh similarity index 100% rename from buildscripts/show-current.sh rename to bin/show-current.sh diff --git a/buildscripts/template.py b/bin/template.py similarity index 100% rename from buildscripts/template.py rename to bin/template.py diff --git a/buildscripts/GNUmakefile b/buildscripts/GNUmakefile deleted file mode 100644 index 3a24a75973..0000000000 --- a/buildscripts/GNUmakefile +++ /dev/null @@ -1,12 +0,0 @@ -# bin/Makefile - -depth = .. -STEPMAKE_TEMPLATES=script - -include $(depth)/make/stepmake.make - - - - - - diff --git a/make/generic-vars.make b/make/generic-vars.make index 8c90d01de8..fcde1cfd52 100644 --- a/make/generic-vars.make +++ b/make/generic-vars.make @@ -8,8 +8,9 @@ # you do make dist # -buildscripts = $(depth)/buildscripts - +# urg, ambiguous and thus error prone; hardcode all $(*scripts) to bin? +buildscripts = $(depth)/bin +scripts = $(depth)/bin flower-dir = $(depth)/flower lib-dir = $(depth)/lib diff --git a/make/lilypond-vars.make b/make/lilypond-vars.make index f912908583..a5f9487ed2 100644 --- a/make/lilypond-vars.make +++ b/make/lilypond-vars.make @@ -1,5 +1,5 @@ -export PATH:=$(topdir)/lily/out:$(topdir)/buildscripts/out:$(PATH) +export PATH:=$(topdir)/lily/out:$(topdir)/$(buildscripts)/out:$(PATH) export MFINPUTS:=$(topdir)/mf/$(PATHSEP)$(MFINPUTS)$(PATHSEP)$(PATHSEP) export TEXINPUTS:=$(topdir)/tex/$(PATHSEP)$(TEXINPUTS)$(PATHSEP)$(PATHSEP) export LILYINCLUDE:=$(topdir)/init$(PATHSEP)$(topdir)/mf/out$(PATHSEP)$(LILYINCLUDE) diff --git a/make/lilypond.spec.in b/make/lilypond.spec.in index 244a80801f..ed8060fcfa 100644 --- a/make/lilypond.spec.in +++ b/make/lilypond.spec.in @@ -31,8 +31,8 @@ strip lily/out/lilypond mi2mu/out/mi2mu make prefix="$RPM_BUILD_ROOT/usr" install mkdir -p $RPM_BUILD_ROOT/etc/profile.d -cp buildscripts/out/lilypond-profile $RPM_BUILD_ROOT/etc/profile.d/lilypond.sh -cp buildscripts/out/lilypond-login $RPM_BUILD_ROOT/etc/profile.d/lilypond.csh +cp bin/out/lilypond-profile $RPM_BUILD_ROOT/etc/profile.d/lilypond.sh +cp bin/out/lilypond-login $RPM_BUILD_ROOT/etc/profile.d/lilypond.csh %files diff --git a/make/mudela-rules.make b/make/mudela-rules.make index 5a7d8ef670..f2e39d714f 100644 --- a/make/mudela-rules.make +++ b/make/mudela-rules.make @@ -7,5 +7,5 @@ $(outdir)/%.dvi: $(outdir)/%.mudtex mv $(notdir $@) $(outdir) $(outdir)/%.mudtex: %.doc - $(PYTHON) $(depth)/scripts/mudela-book.py --outdir=$(outdir)/ --outname=$(notdir $@) $< + $(PYTHON) $(depth)/$(scripts)/mudela-book.py --outdir=$(outdir)/ --outname=$(notdir $@) $< diff --git a/make/mutopia-rules.make b/make/mutopia-rules.make index 74072fb462..22d9e63c67 100644 --- a/make/mutopia-rules.make +++ b/make/mutopia-rules.make @@ -23,9 +23,9 @@ $(outdir)/%.fly.txt: %.fly .PRECIOUS: $(outdir)/%.dvi $(outdir)/%.dvi: %.ly - $(PYTHON) $(depth)/scripts/ly2dvi.py -o $(outdir) $< + $(PYTHON) $(depth)/$(scripts)/ly2dvi.py -o $(outdir) $< -mv $(basename $<).midi $(outdir) $(outdir)/%.dvi: %.fly - $(PYTHON) $(depth)/scripts/ly2dvi.py -o $(outdir) $< + $(PYTHON) $(depth)/$(scripts)/ly2dvi.py -o $(outdir) $< -mv $(basename $<).midi $(outdir) diff --git a/make/mutopia-targets.make b/make/mutopia-targets.make index 11b4a35299..be5aa37fde 100644 --- a/make/mutopia-targets.make +++ b/make/mutopia-targets.make @@ -12,4 +12,4 @@ convert-mudela: local-convert-mudela $(LOOP) local-convert-mudela: - $(PYTHON) $(depth)/scripts/convert-mudela.py -e *ly + $(PYTHON) $(depth)/$(scripts)/convert-mudela.py -e *ly diff --git a/make/toplevel.make.in b/make/toplevel.make.in index 628a2a9f78..e60960ffcb 100644 --- a/make/toplevel.make.in +++ b/make/toplevel.make.in @@ -8,7 +8,7 @@ depth = . # descent order into subdirectories: # -SUBDIRS = scripts buildscripts flower lib lily mf mi2mu po debian \ +SUBDIRS = bin flower lib lily mf mi2mu po debian \ Documentation init input tex make mutopia test intl stepmake\ ps # diff --git a/stepmake/stepmake/metafont-targets.make b/stepmake/stepmake/metafont-targets.make index 5f142738b9..bb2cad423c 100644 --- a/stepmake/stepmake/metafont-targets.make +++ b/stepmake/stepmake/metafont-targets.make @@ -7,4 +7,4 @@ dvi: $(DVI_FILES) pks: $(addprefix $(outdir)/, $(XPM_FONTS:%=%.$(XPM_RESOLUTION)pk)) xpms: $(addprefix $(outdir)/, $(XPM_FONTS:%=%.afm)) pks - $(SHELL) $(depth)/buildscripts/mf-to-xpms.sh $(XPM_FONTS) + $(SHELL) $(depth)/$(buildscripts)/mf-to-xpms.sh $(XPM_FONTS) diff --git a/stepmake/stepmake/metapost-rules.make b/stepmake/stepmake/metapost-rules.make index a33b8cdd52..f72cb62963 100644 --- a/stepmake/stepmake/metapost-rules.make +++ b/stepmake/stepmake/metapost-rules.make @@ -6,7 +6,7 @@ $(outdir)/%.pfa: %.mf # to the metapost mfplain guru, really does 200dpi, iso 600dpi (minimun) -$(METAPOST) "&mfplain \mode=lowres; \mag=100.0; batchmode; input $<" # -$(METAPOST) "&mfmp \mode=ljfour; \mag=100.0; batchmode; input $<" - $(PYTHON) $(depth)/buildscripts/ps-to-pfa.py $< + $(PYTHON) $(depth)/$(buildscripts)/ps-to-pfa.py $< rm -f $(basename $(@F)).[0-9]* rm -f $(basename $<).log $(basename $<).tfm -- 2.39.2