Mercurial > gub

changeset 13:3f5c14f974bc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
resurrect darwintools
author janneke <janneke@gnu.org>
date Fri, 25 Nov 2005 10:30:43 +0100
parents 30aa2d214b5c
children 9ac7984e774f
files specs/darwintools.py specs/download.py specs/gub.py
diffstat 3 files changed, 15 insertions(+), 17 deletions(-) [+]
line wrap: on
line diff
--- a/specs/darwintools.py	Fri Nov 25 10:10:04 2005 +0100
+++ b/specs/darwintools.py	Fri Nov 25 10:30:43 2005 +0100
@@ -18,7 +18,7 @@
 	def install (self):
 		pass
 	
-class Odcc_tools (gub.Cross_package):
+class Odcctools (gub.Cross_package):
 	def installdir (self):
 		return self.settings.tooldir
 	
@@ -45,21 +45,10 @@
 --enable-languages=c,c++ ''' % self.settings.__dict__
 		return cmd
 
-		
-
 
 def get_packages (settings):
-	sdk = Darwin_sdk (settings)
-	sdk.url = 'http://lilypond.org/~hanwen/darwin-sdk.tar.gz'
-	
-	odc = Odcc_tools (settings)
-	odc.url = 'http://www.opendarwin.org/downloads/odcctools-20051031.tar.bz2'
-	
-	gcc = Gcc (settings)
-
-	download.set_gnu_download (gcc, '4.0.2', 'bz2')
-	
-	return [sdk, odc, gcc]
-		
-		
-	
+	return (
+		Darwin_sdk (settings).with (version='', mirror=download.hw),
+		Odcctools (settings).with (version='20051031', mirror=download.opendarwin, format='bz2'),
+		Gcc (settings).with (version='4.0.2', format='bz2'),
+		)		
--- a/specs/download.py	Fri Nov 25 10:10:04 2005 +0100
+++ b/specs/download.py	Fri Nov 25 10:30:43 2005 +0100
@@ -12,3 +12,8 @@
 def fontconfig ():
 	return 'http://www.fontconfig.org/release/%(name)s-%(version)s.tar.%(format)s'
 
+def hw ():
+	return 'http://lilypond.org/~hanwen/%(name)s-%(version)s.tar.%(format)s'
+
+def opendarwin ():
+	return 'http://www.opendarwin.org/downloads/%(name)s-%(version)s.tar.%(format)s'
--- a/specs/gub.py	Fri Nov 25 10:10:04 2005 +0100
+++ b/specs/gub.py	Fri Nov 25 10:30:43 2005 +0100
@@ -119,6 +119,7 @@
 			file = re.sub ('.*/([^/]+)', '\\1', self.url)
 		else:
 			file = self.__class__.__name__.lower ()
+			file = re.sub ('_', '-', file)
 		return file
 	
 	def done (self, stage):
@@ -184,6 +185,9 @@
 	def unpack (self):
 		file = self.settings.downloaddir + '/' + self.file_name ()
 
+		if not os.path.exists (file):
+			return
+
 		flags = ''
 		if re.search ('.tar$', file):
 			flags = '-xf '