changeset 298:5482ad0c7b33

add track_development flag to Package.
author hanwen <hanwen@xs4all.nl>
date Sun, 18 Dec 2005 20:23:08 +0100
parents 045f5141509d
children 2e3fe124ca1c
files specs/framework.py specs/gub.py
diffstat 2 files changed, 28 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/specs/framework.py	Sun Dec 18 20:22:47 2005 +0100
+++ b/specs/framework.py	Sun Dec 18 20:23:08 2005 +0100
@@ -328,6 +328,9 @@
 			elif  s.find ('python') >= 0:
 				self.system ('mv %(i)s %(i)s.py', locals ())
 
+
+
+		
 class LilyPond__linux (LilyPond):
 	def configure_command (self):
 		return LilyPond.configure_command (self) \
@@ -338,6 +341,7 @@
 		return 'export LD_LIBRARY_PATH=%(system_root)s/usr/lib:$LD_LIBRARY_PATH;' \
 		       + LilyPond.compile_command (self)
 
+
 	
 	def xinstall_gub (self):
 		gub.Target_package.install_gub (self)
@@ -724,7 +728,8 @@
 				       depends=['gmp','darwin-sdk']
 				       ),
 		LilyPond__darwin (settings).with (mirror=cvs.gnu, download=gub.Package.cvs,
-						  depends = ['pango', 'guile']
+						  track_development=True,
+						  depends=['pango', 'guile']
 						  ),
 	),
 	'mingw': (
@@ -760,7 +765,9 @@
 		W32api (settings).with (version='3.5', mirror=download.mingw),
 		Regex (settings).with (version='2.3.90-1', mirror=download.lp, format='bz2', depends=['mingw-runtime']),
 		LilyPad (settings).with (version='0.0.7-1', mirror=download.lp, format='bz2', depends=['w32api']),
-		LilyPond__mingw (settings).with (mirror=cvs.gnu, download=gub.Package.cvs, depends=['gettext', 'guile', 'pango', 'python']),
+		LilyPond__mingw (settings).with (mirror=cvs.gnu, download=gub.Package.cvs,
+						 depends=['gettext', 'guile', 'pango', 'python'],
+						 track_development=True),
 	),
 	'linux': (
 		Libtool (settings).with (version='1.5.20'),
@@ -775,7 +782,8 @@
 		Glib (settings).with (version='2.8.4', mirror=download.gtk),
 		Pango__linux (settings).with (version='1.10.1', mirror=download.gtk),
 		Python (settings).with (version='2.4.2', mirror=download.python, format='bz2'),
-		LilyPond__linux (settings).with (mirror=cvs.gnu, download=gub.Package.cvs),
+		LilyPond__linux (settings).with (mirror=cvs.gnu, download=gub.Package.cvs,
+						 track_development=True),
 	),
 	}
 
--- a/specs/gub.py	Sun Dec 18 20:22:47 2005 +0100
+++ b/specs/gub.py	Sun Dec 18 20:23:08 2005 +0100
@@ -125,6 +125,9 @@
 		self.download = self.wget
 		self._build = 0
 
+		# set to true for CVS releases 
+		self.track_development = False
+
 	def package_dict (self, env={}):
 		dict = self.settings.get_substitution_dict ()
 		for (k, v) in self.__dict__.items():
@@ -372,17 +375,21 @@
 
 	def clean (self):
 		stamp = self.stamp_file ()
-		self.system ('''rm -rf %(srcdir)s %(builddir)s %(install_root)s %(stamp)s
-''', locals ())
-						 
+		self.system ('rm -rf  %(stamp)s %(install_root)s', locals ())
+		if self.track_development:
+			return
+
+		self.system ('''rm -rf %(srcdir)s %(builddir)s''', locals ())
+
 	def untar (self):
-		if self.download == self.cvs:
+		if self.track_development:
 			return
 		
 		tarball = self.settings.downloaddir + '/' + self.file_name ()
 		if not os.path.exists (tarball):
 			raise 'no such file: ' + tarball
 		flags = download.untar_flags (tarball)
+		
 		# clean up
 		self.system ('''
 rm -rf %(srcdir)s %(builddir)s %(install_root)s
@@ -402,14 +409,15 @@
 		d.update (locals ())
 		self.url = mirror () % d
 		self.download = lambda : download (self)
-		if self.download == self.cvs:
-			# preserve CVS checkouts
-			self.clean = self.skip
-
-	def with (self, version='HEAD', mirror=download.gnu, format='gz', download=wget, depends=[]):
+		
+	def with (self, version='HEAD', mirror=download.gnu,
+		  format='gz', download=wget, depends=[],
+		  track_development=False
+		  ):
 		self.ball_version = version
 		self.set_download (mirror, format, download)
 		self.depends = depends
+		self.track_development = track_development
 		return self
 
 class Cross_package (Package):