Mercurial > gub

changeset 49:0e19ad3d7d14

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
resolve conflicts that I could not foresee
author janneke <janneke@gnu.org>
date Sat, 26 Nov 2005 09:51:42 +0100
parents c81f713ff227 (current diff) 8822316d6744 (diff)
children 952dc2146023
files driver.py specs/framework.py specs/gub.py
diffstat 3 files changed, 12 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/driver.py	Sat Nov 26 09:39:08 2005 +0100
+++ b/driver.py	Sat Nov 26 09:51:42 2005 +0100
@@ -100,6 +100,7 @@
 		settings.target_gcc_flags = '-mwindows -mms-bitfields' 
 		platform = 'mingw'
 
+	gub.start_log ()
 	settings.verbose = verbose
 	settings.platform = platform
 	
--- a/specs/download.py	Sat Nov 26 09:39:08 2005 +0100
+++ b/specs/download.py	Sat Nov 26 09:51:42 2005 +0100
@@ -30,4 +30,4 @@
 	return 'http://www.zlib.net/%(name)s-%(version)s.tar.%(format)s'
 
 def sourceforge():
-	return 'http://belnet.dl.sourceforge.net/sourceforge/%(name)s/%(name)s-%(version)s.tar.%(format)s' 
+	return 'http://dl.sourceforge.net/%(name)s/%(name)s-%(version)s.tar.%(format)s' 
--- a/specs/framework.py	Sat Nov 26 09:39:08 2005 +0100
+++ b/specs/framework.py	Sat Nov 26 09:51:42 2005 +0100
@@ -57,10 +57,13 @@
 		rm -f %(srcdir)s/builds/unix/{unix-def.mk,unix-cc.mk,ftconfig.h,freetype-config,freetype2.pc,config.status,config.log}
 ''')
 		gub.Package.configure (self)
-		## FIXME: use handy file re.sub
-		self.system ('''
-sed -i~	-e "s@^LIBTOOL=.*@LIBTOOL=%(builddir)s/libtool --tag=CXX@" %(builddir)s/Makefile
-''')
+
+		## FIXME: use handy re.sub
+		str = open (self.builddir () + '/Makefile').read ()
+		str = re.sub ('\nLIBTOOL=[^\n]', 'LIBTOOL=%(builddir)s/libtool --tag=CXX' % self.package_dict (),
+			      str)
+		open (self.builddir () + '/Makefile','w').write (str)
+
 		self.dump ('%(builddir)s/Makefile', '''
 # libtool will not build dll if -no-undefined flag is not present
 LDFLAGS:=$(LDFLAGS) -no-undefined
@@ -147,7 +150,9 @@
 	'mac': (
 		Gettext (settings).with (version='0.10.40'),
 		Freetype (settings).with (version='2.1.9', mirror=download.freetype),
+		Expat (settings).with (version='1.95.8', mirror=download.sourceforge, format='gz'),
 		Glib (settings).with (version='2.8.4', mirror=download.gtk),
+		Fontconfig (settings).with (version='2.3.2', mirror=download.fontconfig),
 	),
 	'mingw': (
 		Mingw (settings).with (version='3.8', download=gub.Package.skip),
@@ -155,6 +160,7 @@
 		Gettext (settings).with (version='0.14.5'),
 		Libiconv (settings).with (version='1.9.2'),
 		Glib (settings).with (version='2.8.4', mirror=download.gtk),
+#FIXME: for all lp.org packages, should try if vanilla+autoupdate works
 		Zlib (settings).with (version='1.2.2-1', mirror=download.lp, format='bz2'),
 # vanilla 1.2.3 builds only static libraries
 #		Zlib (settings).with (version='1.2.3', mirror=download.zlib, format='bz2'),