changeset 480:da90133bed1a

darwin fixes.
author hanwen <hanwen@xs4all.nl>
date Wed, 28 Dec 2005 14:11:34 +0100
parents 357c252b1f0d
children 6d4d9fd28ec7
files specs/framework.py specs/installer.py
diffstat 2 files changed, 13 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/specs/framework.py	Wed Dec 28 13:16:03 2005 +0100
+++ b/specs/framework.py	Wed Dec 28 14:11:34 2005 +0100
@@ -328,6 +328,7 @@
 mkdir -p %(builddir)s
 cp /usr/include/FlexLexer.h %(system_root)s/usr/include
 cp /usr/include/FlexLexer.h %(builddir)s/lily/out/
+cp /usr/include/FlexLexer.h %(builddir)s/lily/out-console/
 ''')
 		gub.Target_package.configure (self)
 		self.config_cache ()
--- a/specs/installer.py	Wed Dec 28 13:16:03 2005 +0100
+++ b/specs/installer.py	Wed Dec 28 14:11:34 2005 +0100
@@ -11,14 +11,14 @@
 		self.strip_command = self.settings.target_architecture + "-strip"
 		self.no_binary_strip = []
 
-	@subst_method
+	@context.subst_method
         def name (self):
 		return 'lilypond'
 
 	def build (self):
 		return self.settings.bundle_build
 
-	@subst_method
+	@context.subst_method
 	def version (self):
 		return self.settings.bundle_version
 
@@ -129,11 +129,19 @@
 	def __init__ (self, settings):
 		Installer.__init__ (self, settings)
 		self.strip_command += ' -S '
-
+		self.darwin_bundle_dir = '%(targetdir)s/LilyPond.app'
+		
 	def create (self):
 		Installer.create (self)
 		rw = darwintools.Rewirer (self.settings)
-		rw.rewire_root (self.settings.installer_root)
+#		rw.rewire_root (self.settings.installer_root)
+
+		self.system ('''
+rm -rf %(darwin_bundle_dir)s
+tar -C %(targetdir)s -zxf %(downloaddir)s/OSX-LilyPad-0.0.tar.gz
+cp -R --link %(installer_root)s/usr/* %(darwin_bundle_dir)s/Contents/Resources/
+''')
+
 		
 	def strip (self):
 		self.strip_unnecessary_files ()