release: 1.3.148

[lilypond.git] / scripts / update-lily.py

diff --git a/scripts/update-lily.py b/scripts/update-lily.py
index dccf7b68f38b9ebacd6c699ed2976f39087274ce..49b6c8170eb066bd3e51ca801938c5ce8f0a4504 100644 (file)
--- a/scripts/update-lily.py
+++ b/scripts/update-lily.py
@@ -9,8 +9,7 @@
 
 '''
 TODO:
-    * more flexible build paths
-    * cleanup previous tree
+    * more flexible build/ftp/patches/releases paths
     * flexible build command
     * show only?
 '''
@@ -26,6 +25,14 @@ import __main__
 import operator
 import tempfile
 
+try:
+       import gettext
+       gettext.bindtextdomain ('lilypond', '@localedir@')
+       gettext.textdomain('lilypond')
+       _ = gettext.gettext
+except:
+       def _ (s):
+               return s
 
 sys.path.append ('@datadir@/python')
 import gettext
@@ -37,15 +44,34 @@ _ = gettext.gettext
 program_name = 'build-lily'
 package_name = 'lilypond'
 help_summary = _("Fetch and rebuild from latest source package")
-build_root = os.environ ['HOME'] + '/usr/src'
-build_command = './configure; make web'
+build_root = os.path.join (os.environ ['HOME'], 'usr', 'src')
 release_dir = build_root + '/releases'
 patch_dir = build_root + '/patches'
+notify = 0
+
+build_command = '''
+set -x
+cd %b &&
+[ -d %n-%v ] && exit 1 || true;
+mkdir -p %n-%v
+(
+tar xzf %r/%t &&
+rm -f building &&
+ln -s %n-%v building &&
+cd %n-%v &&
+./configure --prefix=$HOME/usr && make all web
+) >> %n-%v/log.txt 2>&1 &&
+rm -f %n &&
+ln -s %n-%v %n
+'''
+
 
 url = 'file:/home/ftp/pub/gnu/LilyPond/development/lilypond-*.tar.gz'
 url = 'ftp://appel.lilypond.org/pub/gnu/LilyPond/development/lilypond-*.tar.gz'
 url = 'ftp://ftp.cs.uu.nl/pub/GNU/LilyPond/development/lilypond-*.tar.gz'
 
+remove_previous_p = 0
+
 
 # lily_py.py -- options and stuff
 # 
@@ -189,7 +215,7 @@ def system (cmd, ignore_error = 0):
 def cleanup_temp ():
        if not keep_temp_dir_p:
                if verbose_p:
-                       progress (_ ('Cleaning up `%s\'') % temp_dir)
+                       progress (_ ("Cleaning %s...") % temp_dir)
                system ('rm -rf %s' % temp_dir)
 
 
@@ -210,8 +236,17 @@ 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                            ' + _ ("%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")),
        ('URL', 'u', 'url', _ ("fetch and build URL [%s]") % url),
@@ -326,10 +361,21 @@ def find_latest (url):
        return join_package (list[-1])
 
 def build (p):
-       os.chdir (build_root)
-       system ('tar xzf %s/%s.tar.gz' % (release_dir, p))
-       os.chdir (p)
-       return system (build_command)
+       tar_ball = p + '.tar.gz'
+       (tar_name, tar_version) = split_package (tar_ball)
+       
+       expand = {
+               '%b' : build_root,
+               '%n' : tar_name,
+               '%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, 1)
 
 (sh, long) = getopt_args (__main__.option_definitions)
 try:
@@ -348,6 +394,12 @@ for opt in options:
                help ()
        elif o == '--buid-root' or o == '-b':
                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':
                url = a
        elif o == '--verbose' or o == '-V':
@@ -363,7 +415,7 @@ if 1:
        latest = find_latest (url)
 
        if os.path.isdir ('%s/%s' % (build_root, latest)):
-               progress (_ ("latest is %s") % latest)
+               progress (_ ("latest is: %s") % latest)
                progress (_ ("relax, %s is up to date" % package_name))
                sys.exit (0)
 
@@ -387,16 +439,21 @@ if 1:
                progress (_ ("fetching %s...") % get)
                copy_url (get, '.')
 
-       build_command = 'echo hi'
-       if not build (latest):
-               if os.path.isdir ('%s/%s' % (build_root, package_name)):
-                       os.chdir ('%s/%s' % (build_root, package_name))
-                       previous = os.getcwd ()
-                       os.chdir (build_root)
-                       system ('rm -f %s' % package_name)
-                       system ('echo rm -rf %s/%s' % (build_root, previous))
-                       
-               os.symlink ('%s/%s' % (build_root, latest),  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...") % latest)
+       os.chdir (build_root)
+       if build (latest):
+               if 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: