changeset 33:5423f185b99b

bugfixes: cvs, lily
author janneke <janneke@gnu.org>
date Fri, 25 Nov 2005 12:11:15 +0100
parents 29429ffb64b3
children d412e2bcc8c1
files specs/framework.py specs/gub.py
diffstat 2 files changed, 8 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/specs/framework.py	Fri Nov 25 15:26:44 2005 +0100
+++ b/specs/framework.py	Fri Nov 25 12:11:15 2005 +0100
@@ -7,7 +7,9 @@
 	pass
 
 class LilyPond (gub.Target_package):
-	pass
+	def configure (self):
+		self.autoupdate ()
+		gub.Target_package.configure (self)
 
 class Gettext (gub.Target_package):
 	def configure_cache_overrides (self, str):
--- a/specs/gub.py	Fri Nov 25 15:26:44 2005 +0100
+++ b/specs/gub.py	Fri Nov 25 12:11:15 2005 +0100
@@ -89,14 +89,14 @@
 ''', locals ())
 
 	def cvs (self):
-		dir = self.settings.downloaddir
-		if not os.path.exists (dir + '/' + self.file_name ()):
+		dir = self.settings.srcdir
+		if not os.path.exists (dir):
 			self.system ('''
-cvs -d %(url)s co %(name)s
+cd %(dir)s && cvs -d %(url)s co -r %(version)s %(name)s
 ''', locals ())
 		else:
 			self.system ('''
-cd %(dir)s && cvs update -dCAP -r %(version)s
+cd %(dir)s/%(name)s && cvs update -dCAP -r %(version)s
 ''', locals ())
  
 	def unpack_destination (self):
@@ -153,7 +153,7 @@
 ''')
 		elif os.path.exists (os.path.join (self.srcdir (), 'autogen.sh')):
 			self.system ('''
-cd %(srcdir) && bash autogen.sh
+cd %(srcdir)s && bash autogen.sh --noconfigure
 ''')
 		else:
 			self.system ('''