X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scripts%2Fupdate-lily.py;h=3ff0442234b070a61a32223c18b5e67e6e8068ec;hb=736bfdaea194aade5d20d9f749f009c96d41b953;hp=b758cccb28628e441b0051245fb9fc176e1fb8e2;hpb=e84722c88277938476af9545e666a3728d9fa284;p=lilypond.git

diff --git a/scripts/update-lily.py b/scripts/update-lily.py
index b758cccb28..3ff0442234 100644
--- a/scripts/update-lily.py
+++ b/scripts/update-lily.py
@@ -5,64 +5,113 @@
 # source file of the GNU LilyPond music typesetter
 #
 # download and rebuild latest lilypond or from specified url
-# 
+#
+
 
 '''
 TODO:
-    * more flexible build paths
-    * cleanup previous tree
-    * flexible build command
-    * show only?
+
+    * use urllib iso ftplib
+
+    * more flexible build/ftp/patches/releases paths
+
+    
+    show only: --command='echo "latest is: %n-%v"'
 '''
 
-import os
+import ftplib
 import fnmatch
+import getopt
+import re
+import operator
+import os
+import tempfile
 import stat
 import string
-import re
-import getopt
 import sys
 import __main__
-import operator
-import tempfile
 
+package_name = 'lilypond'
+program_name = 'build-lily'
+program_version = '@TOPLEVEL_VERSION@'
 
-sys.path.append ('@datadir@/python')
-import gettext
-gettext.bindtextdomain ('lilypond', '@localedir@')
-gettext.textdomain('lilypond')
-_ = gettext.gettext
+original_dir = os.getcwd ()
+temp_dir = os.path.join (original_dir,  '%s.dir' % program_name)
+errorport = sys.stderr
+keep_temp_dir_p = 0
+verbose_p = 0
+remove_previous_p = 0
 
+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'
 
-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'
 
-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'
 
 
-# lily_py.py -- options and stuff
+try:
+	import gettext
+	gettext.bindtextdomain ('lilypond', '@localedir@')
+	gettext.textdomain ('lilypond')
+	_ = gettext.gettext
+except:
+	def _ (s):
+		return s
+
+# Attempt to fix problems with limited stack size set by Python!
+# Sets unlimited stack size. Note that the resource module only
+# is available on UNIX.
+try:
+       import resource
+       resource.setrlimit (resource.RLIMIT_STACK, (-1, -1))
+except:
+       pass
+
+
+help_summary = _ ("Fetch and rebuild from latest source package")
+
+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),
+	('', 'w', 'warranty', _ ("show warranty and copyright")),
+	]
+
+
+################################################################
+# lilylib.py -- options and stuff
 # 
 # source file of the GNU LilyPond music typesetter
 
-# BEGIN Library for these?
-# cut-n-paste from ly2dvi
-
-program_version = '@TOPLEVEL_VERSION@'
-if program_version == '@' + 'TOPLEVEL_VERSION' + '@':
-	program_version = '1.3.142'
+import os
 
+try:
+	import gettext
+	gettext.bindtextdomain ('lilypond', localedir)
+	gettext.textdomain ('lilypond')
+	_ = gettext.gettext
+except:
+	def _ (s):
+		return s
 
-original_dir = os.getcwd ()
-temp_dir = '%s.dir' % program_name
-keep_temp_dir_p = 0
-verbose_p = 0
+if program_version == '@' + 'TOPLEVEL_VERSION' + '@':
+	program_version = '1.5.17'
 
 def identify ():
 	sys.stdout.write ('%s (GNU LilyPond) %s\n' % (program_name, program_version))
@@ -81,16 +130,25 @@ NO WARRANTY.'''))
 	sys.stdout.write ('\n')
 
 def progress (s):
-	sys.stderr.write (s + '\n')
+	errorport.write (s + '\n')
 
 def warning (s):
-	sys.stderr.write (_ ("warning: ") + s)
-	sys.stderr.write ('\n')
-	
+	progress (_ ("warning: ") + s)
 		
 def error (s):
-	sys.stderr.write (_ ("error: ") + s)
-	sys.stderr.write ('\n')
+
+
+	'''Report the error S.  Exit by raising an exception. Please
+	do not abuse by trying to catch this error. If you do not want
+	a stack trace, write to the output directly.
+
+	RETURN VALUE
+
+	None
+	
+	'''
+	
+	progress (_ ("error: ") + s)
 	raise _ ("Exiting ... ")
 
 def getopt_args (opts):
@@ -149,20 +207,22 @@ def options_help_str (opts):
 	return str
 
 def help ():
-	sys.stdout.write (_ ("Usage: %s [OPTION]... FILE") % program_name)
-	sys.stdout.write ('\n\n')
-	sys.stdout.write (help_summary)
-	sys.stdout.write ('\n\n')
-	sys.stdout.write (_ ("Options:"))
-	sys.stdout.write ('\n')
-	sys.stdout.write (options_help_str (option_definitions))
-	sys.stdout.write ('\n\n')
-	sys.stdout.write (_ ("Report bugs to %s") % 'bug-gnu-music@gnu.org')
-	sys.stdout.write ('\n')
-	sys.exit (0)
-
-
+	ls = [(_ ("Usage: %s [OPTION]... FILE") % program_name),
+		('\n\n'),
+		(help_summary),
+		('\n\n'),
+		(_ ("Options:")),
+		('\n'),
+		(options_help_str (option_definitions)),
+		('\n\n'),
+		(_ ("Report bugs to %s") % 'bug-lilypond@gnu.org'),
+		('\n')]
+	map (sys.stdout.write, ls)
+	
 def setup_temp ():
+	"""
+	Create a temporary directory, and return its name. 
+	"""
 	global temp_dir
 	if not keep_temp_dir_p:
 		temp_dir = tempfile.mktemp (program_name)
@@ -170,16 +230,26 @@ def setup_temp ():
 		os.mkdir (temp_dir, 0777)
 	except OSError:
 		pass
-		
-	
+
+	return temp_dir
+
+
 def system (cmd, ignore_error = 0):
+	"""Run CMD. If IGNORE_ERROR is set, don't complain when CMD returns non zero.
+
+	RETURN VALUE
+
+	Exit status of CMD
+	"""
+	
 	if verbose_p:
 		progress (_ ("Invoking `%s\'") % cmd)
 	st = os.system (cmd)
 	if st:
-		msg =  ( _ ("error: ") + _ ("command exited with value %d") % st)
+		name = re.match ('[ \t]*([^ \t]*)', cmd).group (1)
+		msg = name + ': ' + _ ("command exited with value %d") % st
 		if ignore_error:
-			sys.stderr.write (msg + ' ' + _ ("(ignored)") + ' ')
+			warning (msg + ' ' + _ ("(ignored)") + ' ')
 		else:
 			error (msg)
 
@@ -189,34 +259,36 @@ def system (cmd, ignore_error = 0):
 def cleanup_temp ():
 	if not keep_temp_dir_p:
 		if verbose_p:
-			progress (_ ('Cleaning up `%s\'') % temp_dir)
-		system ('rm -rf %s' % temp_dir)
-
-
-def set_setting (dict, key, val):
-	try:
-		val = string.atof (val)
-	except ValueError:
-		#warning (_ ("invalid value: %s") % `val`)
-		pass
-
-	try:
-		dict[key].append (val)
-	except KeyError:
-		warning (_ ("no such setting: %s") % `key`)
-		dict[key] = [val]
+			progress (_ ("Cleaning %s...") % temp_dir)
+		shutil.rmtree (temp_dir)
+
+
+def strip_extension (f, ext):
+	(p, e) = os.path.splitext (f)
+	if e == ext:
+		e = ''
+	return p + e
+
+
+
+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
+'''
 
-# END Library
-
-option_definitions = [
-	('DIR', 'b', 'build-root', _ ("unpack and build in DIR [%s]") % build_root),
-	('', 'h', 'help', _ ("this help")),
-        ('', 'k', 'keep', _ ("keep all output, and name the directory %s") % temp_dir),
-	('', 'V', 'verbose', _ ("verbose")),
-	('', 'v', 'version', _ ("print version number")),
-	('URL', 'u', 'url', _ ("fetch and build URL [%s]") % url),
-	('', 'w', 'warranty', _ ("show warranty and copyright")),
-	]
 
 def list_file (user, passwd, host, dir, file):
 	match = []
@@ -227,29 +299,22 @@ def list_file (user, passwd, host, dir, file):
 
 list_ = list_file
 
-#
-# ugh: use ftp module.
-#
 def list_ftp (user, passwd, host, dir, file):
 	if user == 'None':
 		user = 'anonymous'
 	if passwd == 'None':
 		passwd = program_name
 
-	command = '''
-open -u%s,%s -p21 %s
-set passive-mode off
-cd "%s"
-ls -1 "%s"
-''' % (user, passwd, host, dir, file)
-	temp = tempfile.mktemp (program_name)
-	f = open (temp, 'w')
-	f.write (command)
-	f.close ()
-	p = os.popen ('lftp -f %s' % temp, 'r')
-	s = p.read ()
-	status = p.close ()
-	return string.split (s[:-1], '\n')
+	ftp = ftplib.FTP (host)
+	ftp.login (user, passwd)
+	ftp.set_pasv (1)
+	ftp.cwd (dir)
+	list = ftp.nlst (file)
+	try:
+		ftp.quit ()
+	except:
+		ftp.close ()
+	return list
 	
 def split_url (url):
 	m = re.match ('([^:/]*)(:)?(/*([^:]*):)?(/*([^@]*)@)?(//([^/]*))?(.*)/(.*)',
@@ -299,20 +364,29 @@ def copy_ftp (user, passwd, host, dir, file):
 	if passwd == 'None':
 		passwd = program_name
 
-	command = '''
-open -u%s,%s -p21 %s
-set passive-mode off
-cd "%s"
-get "%s"
-''' % (user, passwd, host, dir, file)
-	temp = tempfile.mktemp (program_name)
-	f = open (temp, 'w')
-	f.write (command)
-	f.close ()
-	p = os.popen ('lftp -f %s' % temp, 'r')
-	s = p.read ()
-	status = p.close ()
+	ftp = ftplib.FTP (host)
+	ftp.login (user, passwd)
+	ftp.set_pasv (1)
+	t = tempfile.mktemp (program_name)
+	try:
+		f = open (t, 'w')
+		ftp.retrbinary ('RETR %s/%s' % (dir, file),
+			lambda x, f=f: f.write (x))
+		f.close ()
+		# huh? Invalid cross-device link
+		# os.rename (t, file)
+		system ('mv %s %s' % (t, file))
+	except:
+		os.remove (t)
+		raise 'Foo'
+	try:
+		ftp.quit ()
+	except:
+		ftp.close ()
+	return list
 	
+
+
 def copy_url (url, dir):
 	os.chdir (dir)
 	s = "copy_%s ('%s', '%s', '%s', '%s', '%s')" % split_url (url)
@@ -320,24 +394,41 @@ def copy_url (url, dir):
 
 
 def find_latest (url):
-	progress (_ ("listing %s...") % url)
+	progress (_ ("Listing `%s'...") % url)
 	list = map (split_package, list_url (url))
 	list.sort ()
 	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:
-	(options, files) = getopt.getopt (sys.argv[1:], sh, long)
-except:
+	(options, files) = getopt.getopt(sys.argv[1:], sh, long)
+except getopt.error, s:
+	errorport.write ('\n')
+	errorport.write (_ ("error: ") + _ ("getopt says: `%s\'" % s))
+	errorport.write ('\n')
+	errorport.write ('\n')
 	help ()
 	sys.exit (2)
-	
+
 for opt in options:	
 	o = opt[0]
 	a = opt[1]
@@ -346,8 +437,15 @@ for opt in options:
 		pass
 	elif o == '--help' or o == '-h':
 		help ()
+		sys.exit (0)
 	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':
@@ -362,8 +460,9 @@ for opt in options:
 if 1:
 	latest = find_latest (url)
 
-	if os.path.isdir ('%s/%s' % (build_root, latest)):
-		progress (_ ("latest is %s") % latest)
+	# if os.path.isdir ('%s/%s' % (build_root, latest)):
+	if os.path.exists ('%s/%s/index.html' % (build_root, latest)):
+		progress (_ ("latest is: %s") % latest)
 		progress (_ ("relax, %s is up to date" % package_name))
 		sys.exit (0)
 
@@ -372,11 +471,12 @@ if 1:
 		os.chdir (patch_dir)
 		if not os.path.isfile (latest + '.diff.gz'):
 			get = get_base + latest + '.diff.gz'
-			progress (_ ("fetching %s...") % get)
+			progress (_ ("Fetching `%s'...") % get)
 			copy_url (get, '.')
 
 	if not os.path.isdir (build_root):
 		build_root = temp_dir
+		
 	if not os.path.isdir (release_dir):
 		release_dir = temp_dir
 		setup_temp ()
@@ -384,19 +484,24 @@ if 1:
 	os.chdir (release_dir)
 	if not os.path.isfile (latest + '.tar.gz'):
 		get = get_base + latest + '.tar.gz'
-		progress (_ ("fetching %s...") % get)
+		progress (_ ("Fetching `%s'...") % get)
 		copy_url (get, '.')
 
-	build_command = './configure --prefix=$HOME/usr && make web'
+	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 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 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: