patch::: 1.3.144.jcn4

1.3.144.jcn4
============

* Build fixes for icon, this fixes 'rpm' target.  Tried to reinclude
in rpm using (.png and) .xpm, but latest LinuxPPC release's rpm
(3.0.6) Icon: tag handling is broken.

* Fixes for update-lily script.

---
Generated by janneke@gnu.org,
From = lilypond-1.3.144.jcn3, To = lilypond-1.3.144.jcn4

usage

    cd lilypond-source-dir; patch -E -p1 < lilypond-1.3.144.jcn4.diff

Patches do not contain automatically generated files
or (urg) empty directories,
i.e., you should rerun autoconf, configure

diff --git a/CHANGES b/CHANGES
index e5a2957d3ad58141f0295b32ff97c9757dade86f..ea7da3060108cb5085c9d656f5497a33778ef1d3 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,18 @@
---- ../lilypond-1.3.144/CHANGES        Wed Mar 28 01:27:11 2001
+--- ../lilypond-1.3.144.jcn3/CHANGES   Thu Mar 29 15:57:17 2001
+++ b/CHANGES   Fri Mar 30 12:30:41 2001
+@@ -1,3 +1,12 @@
+1.3.144.jcn4
+============
+
+* Build fixes for icon, this fixes 'rpm' target.  Tried to reinclude
+in rpm using (.png and) .xpm, but latest LinuxPPC release's rpm
+(3.0.6) Icon: tag handling is broken.
+
+* Fixes for update-lily script.
+
+ 1.3.144.jcn3
+ ============
+ --- ../lilypond-1.3.144/CHANGES       Wed Mar 28 01:27:11 2001
 ++ b/CHANGES   Thu Mar 29 21:17:09 2001
 @@ -1,3 +1,8 @@
 1.3.144.mb1

diff --git a/Documentation/pictures/GNUmakefile b/Documentation/pictures/GNUmakefile
index 488c762d9be8f7dec00cd36514f87e60a26bcef2..45e722b781faecb981f41b5efb64fabe3f3b90d6 100644 (file)
--- a/Documentation/pictures/GNUmakefile
+++ b/Documentation/pictures/GNUmakefile
@@ -6,14 +6,27 @@ OUTGIF_FILES = $(addprefix $(outdir)/,$(XPM_FILES:.xpm=.gif))
 OUTPNG_FILES = $(addprefix $(outdir)/,$(XPM_FILES:.xpm=.png))
 
 EXTRA_DIST_FILES= $(XPM_FILES)
+OUT_DIST_FILES = $(package-icon)
 
 include $(depth)/make/stepmake.make
 
-gifs: $(OUTGIF_FILES)
+default: $(package-icon)
+local-dist: $(package-icon)
+
+xgifs: $(OUTGIF_FILES)
 pngs: $(OUTPNG_FILES)
 
 # local-WWW: $(OUTGIF_FILES)
 local-WWW: $(OUTPNG_FILES)
 
-icon: $(outdir)/lelie_icon.gif
+xicon: $(outdir)/lelie-icon.gif
        cp $< $(depth)/$(outdir)/$(package)-icon.gif
+
+icon: $(package-icon)
+
+#$(package-icon): $(outdir)/lelie-icon.png 
+#      cp $< $@
+
+$(package-icon): lelie-icon.xpm
+       cp $< $@
+

diff --git a/Documentation/topdocs/index.tely b/Documentation/topdocs/index.tely
index 269f4b3f60ccdecebaa5cb81870039121084b412..3a0d9429d1c15c43ac16584d2fc25b6839d5481a 100644 (file)
--- a/Documentation/topdocs/index.tely
+++ b/Documentation/topdocs/index.tely
@@ -16,6 +16,7 @@
 
 @unnumberedsec What is LilyPond?
 
+@c also use keywords: music notation software
 LilyPond is a music typesetter.  It produces beautiful sheet music
 using a high level description file as input. It excels at typesetting
 classical music, but you can also print pop-songs.  With LilyPond we

diff --git a/VERSION b/VERSION
index 8f3de0af6e2002ae8edfa1cad014c732dcc06178..af9b8977c699c233aa5cd33648842fb8d6c94173 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=3
 PATCH_LEVEL=144
-MY_PATCH_LEVEL=mb1
+MY_PATCH_LEVEL=jcn4
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.

diff --git a/make/lilypond.spec.in b/make/lilypond.spec.in
index b2822c61e6b148038a5d6c41caaf421030ecf0f9..f98142ef72300fa1287292a26ed26cc181020a3a 100644 (file)
--- a/make/lilypond.spec.in
+++ b/make/lilypond.spec.in
@@ -6,12 +6,15 @@ Release: 1
 License: GPL
 Group: Applications/Publishing
 Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-@TOPLEVEL_VERSION@.tar.gz
+# music notation software for.. ?
 Summary: A program for printing sheet music.
 URL: http://www.cs.uu.nl/~hanwen/lilypond
-# Icon: @package@-icon.gif
+# rpm: 4.0: broken for -ta builds: rpm doesn't look in tarball for xpm
+# Icon: @package@-icon.xpm
 BuildRoot: /tmp/lilypond-install
 Prereq: tetex
 
+# use keywords: music notation software
 %description
 LilyPond is a music typesetter.  It produces beautiful
 sheet music using a high level description file as input.  LilyPond is

diff --git a/scripts/update-lily.py b/scripts/update-lily.py
index 647a9babe4980fd5d437add59b2699f19549647c..b683bab2ffb51ff01811757e112e413d6046a7cd 100644 (file)
--- a/scripts/update-lily.py
+++ b/scripts/update-lily.py
@@ -44,23 +44,25 @@ _ = gettext.gettext
 program_name = 'build-lily'
 package_name = 'lilypond'
 help_summary = _("Fetch and rebuild from latest source package")
-obuild_command = '(./configure --prefix=$HOME/usr && make all web) >> log.txt 2>&1'
+build_root = os.path.join (os.environ ['HOME'], 'usr', 'src')
+release_dir = build_root + '/releases'
+patch_dir = build_root + '/patches'
+notify = 0
+
 build_command = '''
-cd $HOME/usr/src &&
-[ -d %n-%v ] && exit 1;
+cd %b &&
+[ -d %n-%v ] && exit 1 || true;
 (
-tar xzf %t &&
+tar xzf %r/%t &&
 rm -f building &&
 ln -s %n-%v building &&
 cd %n-%v &&
 ./configure --prefix=$HOME/usr && make all web
-) >> log.txt 2>&1 &&
+) >> %n-%v/log.txt 2>&1 &&
 rm -f %n &&
 ln -s %n%-%v %n
 '''
 
-release_dir = build_root + '/releases'
-patch_dir = build_root + '/patches'
 
 url = 'file:/home/ftp/pub/gnu/LilyPond/development/lilypond-*.tar.gz'
 url = 'ftp://appel.lilypond.org/pub/gnu/LilyPond/development/lilypond-*.tar.gz'
@@ -233,12 +235,15 @@ def set_setting (dict, key, val):
 option_definitions = [
        ('DIR', 'b', 'build-root', _ ("unpack and build in DIR [%s]") % build_root),
        ('COMMAND', 'c', 'command', _ ("execute COMMAND, subtitute:") \
-        + '\n                            ' + _ ("%%n: package name") \
-        + '\n                            ' + _ ("%%v: package version") \
-        + '\n                            ' + _ ("%%t: tarball") \
+        + '\n                            ' + _ ("%b: build root") \
+        + '\n                            ' + _ ("%n: package name") \
+        + '\n                            ' + _ ("%r: release directory") \
+        + '\n                            ' + _ ("%t: tarball") \
+        + '\n                            ' + _ ("%v: package version") \
         ),
        ('', 'h', 'help', _ ("this help")),
         ('', 'k', 'keep', _ ("keep all output, and name the directory %s") % temp_dir),
+        ('EMAIL', 'n', 'notify', _ ("upon failure notify EMAIL[,EMAIL]"),
        ('', 'r', 'remove-previous', _ ("remove previous build")),
        ('', 'V', 'verbose', _ ("verbose")),
        ('', 'v', 'version', _ ("print version number")),
@@ -358,15 +363,17 @@ def build (p):
        (tar_name, tar_version) = split_package (tar_ball)
        
        expand = {
+               '%b' : build_root,
                '%n' : tar_name,
-               '%t' : tar_ball,
+               '%r' : release_dir,
                '%v' : version_tuple_to_str (tar_version),
+               '%t' : tar_ball,
                }
 
        c = build_command
        for i in expand.keys ():
                c = re.sub (i, expand[i], c)
-       return system (c)
+       return system (c, 1)
 
 (sh, long) = getopt_args (__main__.option_definitions)
 try:
@@ -387,6 +394,8 @@ for opt in options:
                build_root = a
        elif o == '--command' or o == '-c':
                build_command = a
+       elif o == '--notify' or o == '-n':
+               notify = a
        elif o == '--remove-previous' or o == '-r':
                remove_previous_p = 1
        elif o == '--url' or o == '-u':
@@ -428,16 +437,20 @@ if 1:
                progress (_ ("fetching %s...") % get)
                copy_url (get, '.')
 
-       if os.path.isdir (os.path.join (build_command, package_name)):
-               os.chdir (os.path.join (build_command, package_name))
+       if os.path.isdir (os.path.join (build_root, package_name)):
+               os.chdir (os.path.join (build_root, package_name))
                previous = os.getcwd ()
        else:
                previous = 0
 
-       progress (_ ("building %s...") % get)
+       progress (_ ("building %s...") % latest)
        os.chdir (build_root)
-       if not build (latest) and previous and remove_previous_p:
+       if build (latest) previous and remove_previous_p:
                system ('rm -rf %s' % os.path.join (build_root, previous))
+       else:
+               if notify:
+                       system ('(date; uname -a) | mail -s "%s failed" %s' % (program_name, notify)
+               sys.exit (1)
                
        os.chdir (original_dir)
        if release_dir != temp_dir:

diff --git a/stepmake/stepmake/generic-vars.make b/stepmake/stepmake/generic-vars.make
index 37f75620bfd42a8ee71aef0c0a3860460e4a5c74..9fd7e36d3ec5a6c433e48a7f2cb21b6d140eb382 100644 (file)
--- a/stepmake/stepmake/generic-vars.make
+++ b/stepmake/stepmake/generic-vars.make
@@ -57,6 +57,9 @@ rpm-sources = $(release-dir)
 rpm-build = $(group-dir)/RedHat/BUILD
 #
 
+# package-icon=$(outdir)/$(package)-icon.gif
+package-icon=$(outdir)/$(package)-icon.xpm
+
 
 # need to be defined in local Makefiles:
 #

diff --git a/stepmake/stepmake/package.make b/stepmake/stepmake/package.make
index f0fa0c0330283d5e90ba221c5bfc40f0fc4d780b..9f62f66f81a37995decab7f5225641421a02f354 100644 (file)
--- a/stepmake/stepmake/package.make
+++ b/stepmake/stepmake/package.make
@@ -1,7 +1,5 @@
 # stepmake/Package.make
 
-package-icon=$(outdir)/$(package)-icon.gif
-
 deb:
        $(MAKE) -C $(depth)/debian
 
@@ -26,6 +24,7 @@ diff:
 release: 
        $(PYTHON) $(step-bindir)/release.py --outdir=$(topdir)/$(outdir) --package=$(topdir)
 
-rpm: $(depth)/$(package-icon) dist
+# rpm: $(depth)/$(package-icon) dist
+rpm: dist
        su -c 'rpm -tb $(depth)/$(outdir)/$(distname).tar.gz'