From cdeb130278c75bd9053b82d59bbc29218e759179 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sun, 18 Mar 2001 23:27:12 +0100 Subject: [PATCH] patch::: 1.3.139.jcn4 1.3.139.jcn4 ============ * Experimental start of ports to mutopia archive. --- Generated by janneke@gnu.org, From = lilypond-1.3.139.jcn3, To = lilypond-1.3.139.jcn4 usage cd lilypond-source-dir; patch -E -p1 < lilypond-1.3.139.jcn4.diff Patches do not contain automatically generated files or (urg) empty directories, i.e., you should rerun autoconf, configure --- CHANGES | 12 +++- VERSION | 2 +- make/mutopia-targets.make | 67 ++++++++++++++++--- mutopia/BachJS/BWV1042/GNUmakefile | 10 +++ .../BWV1042/concerto-in-e-major/GNUmakefile | 14 ++++ mutopia/BachJS/BWV772/GNUmakefile | 10 +++ .../BWV772/bach-invention-01/GNUmakefile | 13 ++++ mutopia/BachJS/GNUmakefile | 10 +++ mutopia/GNUmakefile | 10 +-- mutopia/mutopia.make | 26 +++++++ 10 files changed, 156 insertions(+), 18 deletions(-) create mode 100644 mutopia/BachJS/BWV1042/GNUmakefile create mode 100644 mutopia/BachJS/BWV1042/concerto-in-e-major/GNUmakefile create mode 100644 mutopia/BachJS/BWV772/GNUmakefile create mode 100644 mutopia/BachJS/BWV772/bach-invention-01/GNUmakefile create mode 100644 mutopia/BachJS/GNUmakefile create mode 100644 mutopia/mutopia.make diff --git a/CHANGES b/CHANGES index 7ea1bbb91c..b408c29cdd 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,14 @@ ---- ../lilypond-1.3.139.jcn2/CHANGES Sun Mar 18 17:33:23 2001 +--- ../lilypond-1.3.139.jcn3/CHANGES Sun Mar 18 19:41:31 2001 +++ b/CHANGES Sun Mar 18 23:27:12 2001 +@@ -1,3 +1,8 @@ +1.3.139.jcn4 +============ + +* Experimental start of ports to mutopia archive. + + 1.3.139.jcn3 + ============ + --- ../lilypond-1.3.139.jcn2/CHANGES Sun Mar 18 17:33:23 2001 ++ b/CHANGES Sun Mar 18 19:41:31 2001 @@ -1,3 +1,12 @@ 1.3.139.jcn3 diff --git a/VERSION b/VERSION index aacd4bc396..63d1ad4a49 100644 --- a/VERSION +++ b/VERSION @@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=3 PATCH_LEVEL=139 -MY_PATCH_LEVEL=jcn3 +MY_PATCH_LEVEL=jcn4 # use the above to send patches: MY_PATCH_LEVEL is always empty for a # released version. diff --git a/make/mutopia-targets.make b/make/mutopia-targets.make index b01250df59..16906c87fe 100644 --- a/make/mutopia-targets.make +++ b/make/mutopia-targets.make @@ -1,5 +1,5 @@ -.PHONY: mutopia png ps scores tar +.PHONY: download mutopia png ps scores tar .PRECIOUS: $(outdir)/%.ps $(outdir)/%-book.ps .PRECIOUS: $(outdir)-letter/%.dvi $(outdir)-letter/%.ps @@ -30,16 +30,6 @@ ps: $(ps_examples) scores: $(score_ps) $(MAKE) ps_examples="$<" ps -mutopia-letter=$(mutopia-examples:%=out-letter/%.ps.gz) - -mutopia: - $(MAKE) examples="$(mutopia-examples)" PAPERSIZE=letter local-WWW $(mutopia-letter) - -local-clean: local-letter-clean - -local-letter-clean: - rm -f $(outdir)-letter/* - # # and -book targets only available through ly.make template makefile; # too scary to install in LilyPonds make yet. @@ -63,6 +53,21 @@ $(outdir)/%-book.ps: $(outdir)/%.ps @echo Making $@ from $< endif + +local-mutopia: + $(MAKE) examples="$(mutopia-examples)" PAPERSIZE=letter local-WWW $(mutopia-letter) + +mutopia: local-mutopia + $(LOOP) + +mutopia-letter=$(mutopia-examples:%=out-letter/%.ps.gz) + +local-clean: local-letter-clean + +local-letter-clean: + rm -f $(outdir)-letter/* + + local-help: @echo -e "\ update $(outdir)/.ps\n\ @@ -74,3 +79,43 @@ local-help: scores update PostScript of all scores\n\ "\ # + + + +# +# mutopia-archive playground +# + + +# -> mutopia-vars.make +MUTOPIA_MIRROR = http://www.mutopiaproject.org/ftp +# ugh: doesn't work +# mutopia-dir = $(pwd:%/mutopia/%=mutopia) +mutopia-dir = $(shell pwd | sed 's@.*mutopia@@') +wget-list = $(mutopia-examples:%=$(mutopia-dir)/%) + +local-remove-ly: + -mv -f $(wildcard *.ly) $(outdir) + +remove-ly: local-remove-ly + $(LOOP) + +local-download: $(mutopia-examples:%=%.ly) + @echo downloading $< + +download: local-download + $(LOOP) + +# -> mutopia-rules.make +ifeq ($(zipped),) +%.ly: + wget $(MUTOPIA_MIRROR)/$(mutopia-dir)/$@ +else +%.zip: + wget $(MUTOPIA_MIRROR)/$(mutopia-dir)/$@ + +%.ly: %-lys.zip + unzip $< +endif + + diff --git a/mutopia/BachJS/BWV1042/GNUmakefile b/mutopia/BachJS/BWV1042/GNUmakefile new file mode 100644 index 0000000000..258be205f3 --- /dev/null +++ b/mutopia/BachJS/BWV1042/GNUmakefile @@ -0,0 +1,10 @@ +# mutopia/Makefile + +depth = ../../.. + +SUBDIRS = concerto-in-e-major + +LOCALSTEPMAKE_TEMPLATES=mutopia + +include $(depth)/mutopia/mutopia.make + diff --git a/mutopia/BachJS/BWV1042/concerto-in-e-major/GNUmakefile b/mutopia/BachJS/BWV1042/concerto-in-e-major/GNUmakefile new file mode 100644 index 0000000000..5b7664d87c --- /dev/null +++ b/mutopia/BachJS/BWV1042/concerto-in-e-major/GNUmakefile @@ -0,0 +1,14 @@ +# mutopia/Makefile + +depth = ../../../.. + +SUBDIRS = + +LOCALSTEPMAKE_TEMPLATES=mutopia + +zipped = true +mutopia-examples = concerto-in-e-major + +include $(depth)/mutopia/mutopia.make + + diff --git a/mutopia/BachJS/BWV772/GNUmakefile b/mutopia/BachJS/BWV772/GNUmakefile new file mode 100644 index 0000000000..3fd6356308 --- /dev/null +++ b/mutopia/BachJS/BWV772/GNUmakefile @@ -0,0 +1,10 @@ +# mutopia/Makefile + +depth = ../../.. + +SUBDIRS = bach-invention-01 + +LOCALSTEPMAKE_TEMPLATES=mutopia + +include $(depth)/mutopia/mutopia.make + diff --git a/mutopia/BachJS/BWV772/bach-invention-01/GNUmakefile b/mutopia/BachJS/BWV772/bach-invention-01/GNUmakefile new file mode 100644 index 0000000000..ea8b30bc23 --- /dev/null +++ b/mutopia/BachJS/BWV772/bach-invention-01/GNUmakefile @@ -0,0 +1,13 @@ +# mutopia/Makefile + +depth = ../../../.. + +SUBDIRS = + +LOCALSTEPMAKE_TEMPLATES=mutopia + +mutopia-examples = bach-invention-01 + +include $(depth)/mutopia/mutopia.make + + diff --git a/mutopia/BachJS/GNUmakefile b/mutopia/BachJS/GNUmakefile new file mode 100644 index 0000000000..626d6b1a9c --- /dev/null +++ b/mutopia/BachJS/GNUmakefile @@ -0,0 +1,10 @@ +# mutopia/Makefile + +depth = ../.. + +SUBDIRS = BWV772 BWV1042 + +LOCALSTEPMAKE_TEMPLATES=mutopia + +include $(depth)/mutopia/mutopia.make + diff --git a/mutopia/GNUmakefile b/mutopia/GNUmakefile index 8d76d57397..7975b82660 100644 --- a/mutopia/GNUmakefile +++ b/mutopia/GNUmakefile @@ -4,12 +4,12 @@ depth = .. SUBDIRS = J.S.Bach Coriolan F.Schubert D.Zipoli Hymns E.Satie -examples= -LOCALSTEPMAKE_TEMPLATES=mutopia - -include $(depth)/make/stepmake.make +# empty mutopia-archive dirs +SUBDIRS += BachJS -EXTRA_DIST_FILES += +LOCALSTEPMAKE_TEMPLATES=mutopia +EXTRA_DIST_FILES = mutopia.make +include $(depth)/mutopia/mutopia.make diff --git a/mutopia/mutopia.make b/mutopia/mutopia.make new file mode 100644 index 0000000000..a074810ac7 --- /dev/null +++ b/mutopia/mutopia.make @@ -0,0 +1,26 @@ +# mutopia/mutopia.make + +# +# Magic: find and include LilyPond's StepMake rules +# +# 0: follow LILYPONDPREFIX +# 1: try source tree +# 2: try installed tree in $HOME +# 3: try system installed tree +# +make-root=$(wildcard $(LILYPONDPREFIX)/make) +make-root?=$(wildcard $(HOME)/usr/src/lilypond/make) +make-root?=$(wildcard /usr/share/lilypond/make) +make-root?=$(wildcard /usr/share/lilypond/make) +#make-root=/make +ifneq ($(make-root),) +### some versions apparently choke on $(message) +### $(message running from $(make-root)) +depth=$(make-root)/.. +LOCALSTEPMAKE_TEMPLATES=ly mutopia +include $(make-root)/stepmake.make +else +$(error can't find LilyPond's stepmake installation) +endif +# + -- 2.39.2