Mercurial > gub

changeset 57:d4212b7353fa

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
oops, CPP,LDFLAGS installdir fixes
author janneke <janneke@gnu.org>
date Sat, 26 Nov 2005 14:37:31 +0100
parents 4d9a1c54b251
children ad3903794d25
files GNUmakefile driver.py specs/framework.py specs/gub.py
diffstat 4 files changed, 50 insertions(+), 40 deletions(-) [+]
line wrap: on
line diff
--- a/GNUmakefile	Sat Nov 26 14:19:36 2005 +0100
+++ b/GNUmakefile	Sat Nov 26 14:37:31 2005 +0100
@@ -11,7 +11,7 @@
 	python driver.py mac
 
 mingw:
-	python driver.py mingw
+	python driver.py -V mingw
 
 realclean:
 	rm -rf src target
--- a/driver.py	Sat Nov 26 14:19:36 2005 +0100
+++ b/driver.py	Sat Nov 26 14:37:31 2005 +0100
@@ -1,3 +1,5 @@
+#!/usr/bin/python
+
 import __main__
 import os
 import re
--- a/specs/framework.py	Sat Nov 26 14:19:36 2005 +0100
+++ b/specs/framework.py	Sat Nov 26 14:37:31 2005 +0100
@@ -24,6 +24,9 @@
 class Libtool (gub.Target_package):
 	pass
 
+class Guile (gub.Target_package):
+	pass
+
 class LilyPond (gub.Target_package):
 	def configure (self):
 		self.autoupdate ()
@@ -53,6 +56,9 @@
 
 class Freetype (gub.Target_package):
 	def configure (self):
+#		self.autoupdate (autodir=os.path.join (self.srcdir (),
+#						       'builds/unix'))
+		
 		gub.Package.system (self, '''
 		rm -f %(srcdir)s/builds/unix/{unix-def.mk,unix-cc.mk,ftconfig.h,freetype-config,freetype2.pc,config.status,config.log}
 ''')
@@ -91,6 +97,7 @@
 		return cmd
 	
 	def configure (self):
+##		self.autoupdate ()
 		gub.Package.system (self, '''
 		rm -f %(srcdir)s/builds/unix/{unix-def.mk,unix-cc.mk,ftconfig.h,freetype-config,freetype2.pc,config.status,config.log}
 ''',
@@ -115,9 +122,9 @@
 ''', locals ())
 
 class Expat (gub.Target_package):
-	def xxconfigure (self):
-		self.autoupdate ()
-		gub.Target_package.configure (self)
+#	def configure (self):
+#		self.autoupdate ()
+#		gub.Target_package.configure (self)
 
 	def compile_command (self):
 		return gub.Target_package.compile_command (self) + ''' \
@@ -141,6 +148,12 @@
 cd %(builddir)s && target=mingw AR="%(AR)s r" %(srcdir)s/configure --shared
 ''')
 
+# latest vanilla packages
+#Zlib (settings).with (version='1.2.3', mirror=download.zlib, format='bz2'),
+#Freetype (settings).with (version='2.1.9', mirror=download.freetype),
+#Expat (settings).with (version='1.95.8', mirror=download.sf),
+#Fontconfig (settings).with (version='2.3.92', mirror=download.fontconfig),
+
 def get_packages (settings, platform):
 	packages = {
 	'mac': (
@@ -153,23 +166,15 @@
 	'mingw': (
 		Mingw (settings).with (version='3.8', download=gub.Package.skip),
 		Libtool (settings).with (version='1.5.20'),
+		Zlib (settings).with (version='1.2.2-1', mirror=download.lp, format='bz2'),
 		Gettext (settings).with (version='0.14.5'),
 		Libiconv (settings).with (version='1.9.2'),
+		Freetype (settings).with (version='2.1.7-1', mirror=download.lp, format='bz2'),
+		Expat (settings).with (version='1.95.8-1', mirror=download.lp, format='bz2'),
+		Fontconfig (settings).with (version='2.3.2-1', mirror=download.lp, format='bz2'),
+		Guile (settings).with (version='1.7.2-3', mirror=download.lp, format='bz2'),
 		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'),
-		Freetype (settings).with (version='2.1.7-1', mirror=download.lp, format='bz2'),
-#		Freetype (settings).with (version='2.1.7', mirror=download.freetype),
-# 2.1.9 builds only static libraries
-#		Freetype (settings).with (version='2.1.9', mirror=download.freetype),
-# vanilla expat does not link
-#		Expat (settings).with (version='1.95.8', mirror=download.sf),
-		Expat (settings).with (version='1.95.8-1', mirror=download.lp, format='bz2'),
-#		Fontconfig (settings).with (version='2.3.92', mirror=download.fontconfig),
-#		Fontconfig (settings).with (version='2.3.2', mirror=download.fontconfig),
-		Fontconfig (settings).with (version='2.3.2-1', mirror=download.lp, format='bz2'),
+#		Pango (settings).with (version='1.10.1', mirror=download.gtk),
 		LilyPond (settings).with (mirror=cvs.gnu, download=gub.Package.cvs),
 	),
 	}
--- a/specs/gub.py	Sat Nov 26 14:19:36 2005 +0100
+++ b/specs/gub.py	Sat Nov 26 14:37:31 2005 +0100
@@ -146,7 +146,7 @@
 
 	def cvs (self):
 		dir = self.settings.srcdir
-		if not os.path.exists (dir):
+		if not os.path.exists (os.path.join (dir, self.name ())):
 			self.system ('''
 cd %(dir)s && cvs -d %(url)s co -r %(version)s %(name)s
 ''', locals ())
@@ -191,34 +191,36 @@
 	def set_done (self, stage):
 		open (self.done (stage), 'w').write ('')
 
-	def autoupdate (self):
+	def autoupdate (self, autodir=0):
+		if not autodir:
+			autodir = self.srcdir ()
 		if os.path.isdir (os.path.join (self.srcdir (), 'ltdl')):
 			self.system ('''
-rm -rf %(srcdir)s/libltdl
-cd %(srcdir)s && libtoolize --force --copy --automake --ltdl
-''')
+rm -rf %(autodir)s/libltdl
+cd %(autodir)s && libtoolize --force --copy --automake --ltdl
+''', locals ())
 		else:
 			self.system ('''
-cd %(srcdir)s && libtoolize --force --copy --automake
-''')
-		if os.path.exists (os.path.join (self.srcdir (), 'bootstrap')):
+cd %(autodir)s && libtoolize --force --copy --automake
+''', locals ())
+		if os.path.exists (os.path.join (autodir, 'bootstrap')):
 			self.system ('''
-cd %(srcdir)s && ./bootstrap
-''')
-		elif os.path.exists (os.path.join (self.srcdir (), 'autogen.sh')):
+cd %(autodir)s && ./bootstrap
+''', locals ())
+		elif os.path.exists (os.path.join (autodir, 'autogen.sh')):
 			self.system ('''
-cd %(srcdir)s && bash autogen.sh --noconfigure
-''')
+cd %(autodir)s && bash autogen.sh --noconfigure
+''', locals ())
 		else:
 			self.system ('''
-cd %(srcdir)s && aclocal
-cd %(srcdir)s && autoheader
-cd %(srcdir)s && autoconf
-''')
+cd %(autodir)s && aclocal
+cd %(autodir)s && autoheader
+cd %(autodir)s && autoconf
+''', locals ())
 			if os.path.exists (os.path.join (self.srcdir (), 'Makefile.am')):
 				self.system ('''
 cd %(srcdir)s && automake --add-missing
-''')
+''', locals ())
 
 	def configure_command (self):
 		return '%(srcdir)s/configure --prefix=%(installdir)s'
@@ -351,21 +353,22 @@
 
 	def sysinstall (self):
 		self.system ('''
-tar -C %(systemdir)s -zxf %(uploaddir)s/%(name)s.gub
+mkdir -p %(systemdir)s/usr
+tar -C %(systemdir)s/usr -zxf %(uploaddir)s/%(name)s.gub
 ''')
 
 	def target_dict (self, env={}):
 		dict = {
 			'AR': '%(target_architecture)s-ar',
 			'CC':'%(target_architecture)s-gcc %(target_gcc_flags)s',
-			'CPPFLAGS': '-I%(installdir)s/include',
+			'CPPFLAGS': '-I%(systemdir)s/usr/include',
 			'CXX':'%(target_architecture)s-g++ %(target_gcc_flags)s',
 			'DLLTOOL' : '%(target_architecture)s-dlltool',
 			'DLLWRAP' : '%(target_architecture)s-dllwrap',
 			'LD': '%(target_architecture)s-ld',
-#			'LDFLAGS': '-L%(installdir)s/lib',
+#			'LDFLAGS': '-L%(systemdir)s/usr/lib',
 # FIXME: for zlib, try adding bin
-			'LDFLAGS': '-L%(installdir)s/lib -L%(installdir)s/bin',
+			'LDFLAGS': '-L%(systemdir)s/usr/lib -L%(systemdir)s/usr/bin',
 			'MINGW_RUNTIME_DIR': self.settings.runtimedir,
 			'NM': '%(target_architecture)s-nm',
 			'PKG_CONFIG_PATH': '%(systemdir)s/usr/lib/pkgconfig',