Mercurial > gub

changeset 65:e0eba72edffd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
lilypad, guile-config bugfix, more lilypond stuff
author janneke <janneke@gnu.org>
date Mon, 28 Nov 2005 23:06:34 +0100
parents 81ad4c2646fc
children 3e0157ebcab8
files specs/framework.py specs/gub.py specs/mingw.py
diffstat 3 files changed, 67 insertions(+), 20 deletions(-) [+]
line wrap: on
line diff
--- a/specs/framework.py	Mon Nov 28 21:37:28 2005 +0100
+++ b/specs/framework.py	Mon Nov 28 23:06:34 2005 +0100
@@ -44,9 +44,6 @@
 MANDIR=%(installdir)s/share/man
 		       ''')
 
-class LilyPad (gub.Target_package):
-	pass
-
 class Gmp (gub.Target_package):
 	def xxconfigure (self):
 		self.system ('''cd %(srcdir)s && libtoolize --force --copy''')
@@ -131,7 +128,6 @@
 			os.chmod ('%(srcdir)s/configure' % self.package_dict (), 0755)
 		if self.settings.platform.startswith ('mingw'):
 			self.settings.target_gcc_flags = '-mms-bitfields'
-			self.settings.target_gxx_flags = '-mms-bitfields'
 		gub.Target_package.configure (self)
 		if self.settings.platform.startswith ('mingw'):
 			self.file_sub ('^\(allow_undefined_flag=.*\)unsupported',
@@ -146,7 +142,6 @@
 	def xxcompile (self):
 		if self.settings.platform.startswith ('mingw'):
 			self.settings.target_gcc_flags = '-mms-bitfields'
-			self.settings.target_gxx_flags = '-mms-bitfields'
 		gub.Target_package.compile (self)
 
 	def install (self):
@@ -159,7 +154,7 @@
 [ "$1" == "--version" ] && echo "%(target_architecture)s-guile-config - Guile version %(version)s"
 #[ "$1" == "compile" ] && echo "-I $%(systemdir)s/usr/include"
 #[ "$1" == "link" ] && echo "-L%(systemdir)s/usr/lib -lguile -lgmp"
-prefix=$(dirname $0)
+prefix=$(dirname $(dirname $0))
 [ "$1" == "compile" ] && echo "-I$prefix/include"
 [ "$1" == "link" ] && echo "-L$prefix/lib -lguile -lgmp"
 exit 0
@@ -173,48 +168,74 @@
 		gub.Target_package.configure (self)
 
 	def configure_command (self):
-		cmd = gub.Target_package.configure_command (self)
+		## FIXME: pickup $target-guile-config
+		cmd = 'PATH=%(systemdir)s/usr/bin:$PATH '
+
+		cmd += gub.Target_package.configure_command (self)
 		cmd += ' --disable-documentation'
 		if self.settings.platform.startswith ('mingw'):
 			cmd += gub.join_lines ('''
 --without-kpathsea
 --enable-relocation
---with-python-include=%(systemdir)s/include/python2.4
+--with-python-include=%(systemdir)s/usr/include/python2.4
 --disable-optimising
 ''')
 		return cmd
 
 	def configure (self):
+		# FIXME: should add to CPPFLAGS...
+		self.settings.target_gcc_flags += ' -I%(builddir)s' \
+						  % self.package_dict ()
+		gub.Package.system (self, '''
+mkdir -p %(builddir)s
+cp /usr/include/FlexLexer.h %(builddir)s
+''')
 		gub.Target_package.configure (self)
 		if self.settings.platform.startswith ('mingw'):
+			self.config_cache ()
 			self.settings.target_gcc_flags = '-mms-bitfields'
-			self.settings.target_gxx_flags = '-mms-bitfields'
+			# FIXME: should add to CPPFLAGS...
+			self.settings.target_gcc_flags += ' -I%(builddir)s' \
+							  % self.package_dict ()
 			cmd = self.configure_command () \
 			      + ' --enable-config=console'
 			self.system ('''cd %(builddir)s && %(cmd)s''',
 				     locals ())
-		gub.Package.system (self, '''
-cp /usr/include/FlexLexer.h .
-''')
 
 	def compile_command (self):
 		cmd = gub.Target_package.compile_command (self)
 		if self.settings.platform.startswith ('mingw'):
-			python_lib = "%(systemdir)s/libpython2.4.dll"
-			return cmd + 'LDFLAGS=%(python_lib)s' % locals ()
+			python_lib = "%(systemdir)s/usr/bin/libpython2.4.dll"
+			return cmd + gub.join_lines ('''
+LDFLAGS=%(python_lib)s
+HELP2MAN_GROFFS=
+'''% locals ())
 
 	def compile (self):
-		gub.Target_package.compile ()
+		gub.Target_package.compile (self)
 		if self.settings.platform.startswith ('mingw'):
 			gub.Package.system (self, '''
 mkdir -p %(builddir)s/mf/out-console
-cp -pv %(builddir)/mf/out/* mf/out-console
+cp -pv %(builddir)s/mf/out/* mf/out-console
 ''')
-			cmd = gub.Target_package.compile_command (self)
+			cmd = gub.Target_pacykage.compile_command (self)
 			cmd += ' conf=console'
 			self.system ('''cd %(builddir)s && %(cmd)s''',
 				     locals ())
 
+	def install_command (self):
+		return gub.Target_package.install_command (self) \
+		       + gub.join_lines ('''
+HELP2MAN_GROFFS=
+'''% locals ())
+	
+	def install (self):
+		gub.Target_package.install (self)
+		if self.settings.platform.startswith ('mingw'):
+			self.system ('''
+install -m755 %(builddir)/lily/out/lilypond %(installdir)/bin/lilypond-windows
+install -m755 %(builddir)/lily/out-console/lilypond %(installdir)/bin/lilypond
+''')
 
 class Gettext (gub.Target_package):
 	def config_cache_overrides (self, str):
@@ -402,7 +423,6 @@
 		Pango (settings).with (version='1.10.1', mirror=download.gtk),
 		Python (settings).with (version='2.4.2', mirror=download.python, format='bz2'),
 		LilyPond (settings).with (mirror=cvs.gnu, download=gub.Package.cvs),
-		LilyPad (settings).with (version='0.0.7-1', mirror=download.lp, format='bz2'),
 	),
 	}
 
--- a/specs/gub.py	Mon Nov 28 21:37:28 2005 +0100
+++ b/specs/gub.py	Mon Nov 28 23:06:34 2005 +0100
@@ -164,7 +164,8 @@
 
 	def name (self):
 		s = self.basename ()
-		s = re.sub ('-?[0-9][^-]+$', '', s)
+#		s = re.sub ('-?[0-9][^-]+$', '', s)
+		s = re.sub ('-[0-9][^-]+$', '', s)
 		return s
 	
 	def srcdir (self):
@@ -416,4 +417,3 @@
 	def system (self, cmd, env={}):
 		dict = self.target_dict (env)
 		Package.system (self, cmd, env=dict)
-		
--- a/specs/mingw.py	Mon Nov 28 21:37:28 2005 +0100
+++ b/specs/mingw.py	Mon Nov 28 23:06:34 2005 +0100
@@ -8,6 +8,7 @@
 	def set_download (self, mirror=download.gnu, format='gz', download=gub.Target_package.wget):
 		gub.Target_package.set_download (self, mirror, format, download)
 		self.url = re.sub ('mingw-runtime/', 'mingw/', self.url)
+		self.url = re.sub ('w32api/', 'mingw/', self.url)
 		gub.Target_package.wget (self)
 		
 	def untar (self):
@@ -32,6 +33,8 @@
 ''')
 		os.chmod ('%(srcdir)s/configure' % self.package_dict (), 0755)
 
+class W32api (Mingw_runtime):
+	pass
 
 class Regex (gub.Target_package):
 	pass
@@ -69,10 +72,34 @@
 		os.chmod ('%(srcdir)s/configure' % self.package_dict (), 0755)
 
 
+class LilyPad (gub.Target_package):
+	def makeflags (self):
+		# FIXME: better fix Makefile
+		return gub.join_lines ('''
+ALL_OBJS='$(OBJS)'
+WRC=/usr/bin/wrc
+CPPFLAGS=-I%(systemdir)s/usr/include
+RC='$(WRC) $(CPPFLAGS)'
+LIBWINE=
+LIBPORT=
+MKINSTALLDIRS=%(srcdir)s/mkinstalldirs
+INSTALL_PROGRAM=%(srcdir)s/install-sh
+''')
+		
+	def compile_command (self):
+		return gub.Target_package.compile_command (self) \
+		       + self.makeflags ()
+
+	def install_command (self):
+		return gub.Target_package.install_command (self) \
+		       + self.makeflags ()
+
 def get_packages (settings):
 	return (
 		Mingw_runtime (settings).with (version='3.9', mirror=download.sf),
+		W32api (settings).with (version='3.5', mirror=download.sf),
 		Regex (settings).with (version='2.3.90-1', mirror=download.lp, format='bz2'),
 		Gs (settings).with (version='8.15-1', mirror=download.lp, format='bz2'),
+		LilyPad (settings).with (version='0.0.7-1', mirror=download.lp, format='bz2'),
 		)