changeset 258:8ff55760882d

don't look for ignore libs in __init__.
author hanwen <hanwen@xs4all.nl>
date Sun, 18 Dec 2005 11:11:28 +0100
parents 8d1a70e8f4cc
children daac0acb3f70
files specs/framework.py specs/installer.py
diffstat 2 files changed, 2 insertions(+), 26 deletions(-) [+]
line wrap: on
line diff
--- a/specs/framework.py	Sun Dec 18 09:24:53 2005 +0100
+++ b/specs/framework.py	Sun Dec 18 11:11:28 2005 +0100
@@ -680,32 +680,7 @@
 
 def get_installers (settings):
 	installers = {
-		# Comment out to build the windows installer,
-		# see below.
 		'darwin' : [installer.Darwin_bundle (settings)],
-
-		# rm -rf target/*
-		# make mingw ... BOOM (just before installer is to be made)
-
-#  *** Stage: install_gub (lilypond)
-# invoking mkdir -p /home/janneke/bzr/gub/target/i686-mingw32/installer
-# invoking tar -C /home/janneke/bzr/gub/target/i686-mingw32/installer -zxf /home/janneke/bzr/gub/uploads/gub/lilypond-2.7.24-0.mingw.gub
-# Traceback (most recent call last):
-#   File "driver.py", line 267, in ?
-#     main ()
-#   File "driver.py", line 264, in main
-#     make_installers (settings, packages)
-#   File "driver.py", line 161, in make_installers
-#     for p in framework.get_installers (settings):
-#   File "specs/framework.py", line 682, in get_installers
-#     installers = {
-#   File "specs/installer.py", line 125, in __init__
-#     self.ignore_libs = self.get_ignore_libs ()
-#   File "specs/installer.py", line 156, in get_ignore_libs
-#     (root, dirs, files) = os.walk (self.settings.installdir + '/darwin-sdk-root/usr/lib').next ()
-# StopIteration
-# make: *** [mingw] Fout 1
-
 		'linux' : [
 		installer.Tgz (settings),
 		installer.Deb (settings),
--- a/specs/installer.py	Sun Dec 18 09:24:53 2005 +0100
+++ b/specs/installer.py	Sun Dec 18 11:11:28 2005 +0100
@@ -122,7 +122,7 @@
 class Darwin_bundle (Installer):
 	def __init__ (self, settings):
 		Installer.__init__ (self, settings)
-		self.ignore_libs = self.get_ignore_libs ()
+		self.ignore_libs = None
 		self.strip_command += ' -S '
 
 	def rewire_mach_o_object (self, name):
@@ -158,6 +158,7 @@
 		return d
 	
 	def create (self):
+		self.ignore_libs = self.get_ignore_libs ()
 		self.rewire_binary_dir (self.settings.installer_root + '/usr/lib')
 		self.rewire_binary_dir (self.settings.installer_root + '/usr/bin')
 		Installer.create (self)