Mercurial > gub

changeset 3387:c5c232eff40c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add . to sys.path; fixes for powerpc fro a 32-bit machine.
author Jan Nieuwenhuizen <janneke@esur.localdomain>
date Wed, 02 May 2007 15:07:06 +0200
parents 31c1afbd9de4
children 02234090a788
files TODO bin/cygwin-packager bin/gpkg bin/gub bin/installer-builder bin/test-gub gub/gubb.py gub/specs/darwin/cross/gcc.py
diffstat 8 files changed, 18 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/TODO	Wed May 02 13:53:51 2007 +0200
+++ b/TODO	Wed May 02 15:07:06 2007 +0200
@@ -53,4 +53,4 @@
 
 - junk Makefile, create python based driver.
 
-- prerequisites: curl [lilypond: texinfo]
+- prerequisites: curl, gcc, libc-dev [lilypond: texinfo]
--- a/bin/cygwin-packager	Wed May 02 13:53:51 2007 +0200
+++ b/bin/cygwin-packager	Wed May 02 15:07:06 2007 +0200
@@ -25,6 +25,7 @@
 import optparse
 import os
 import sys
+sys.path.insert (0, '.')
 #
 from gub import context
 from gub import gup
--- a/bin/gpkg	Wed May 02 13:53:51 2007 +0200
+++ b/bin/gpkg	Wed May 02 15:07:06 2007 +0200
@@ -27,6 +27,7 @@
 import re
 import string
 import sys
+sys.path.insert (0, '.')
 #
 from gub import gup
 from gub import oslog
--- a/bin/gub	Wed May 02 13:53:51 2007 +0200
+++ b/bin/gub	Wed May 02 15:07:06 2007 +0200
@@ -24,6 +24,7 @@
 import re
 import string
 import sys
+sys.path.insert (0, '.')
 #
 from gub import cross
 ## fixme: double use of gub name.
--- a/bin/installer-builder	Wed May 02 13:53:51 2007 +0200
+++ b/bin/installer-builder	Wed May 02 15:07:06 2007 +0200
@@ -25,9 +25,8 @@
 import os
 import sys
 import pickle
-
-sys.path.insert (0, 'lib/')
-
+sys.path.insert (0, '.')
+#
 from gub import gup
 from gub import installer
 import gub.settings
--- a/bin/test-gub	Wed May 02 13:53:51 2007 +0200
+++ b/bin/test-gub	Wed May 02 15:07:06 2007 +0200
@@ -11,6 +11,7 @@
 import time
 import dbhash
 
+sys.path.insert (0, '.')
 from gub import repository
 
 
--- a/gub/gubb.py	Wed May 02 13:53:51 2007 +0200
+++ b/gub/gubb.py	Wed May 02 15:07:06 2007 +0200
@@ -154,7 +154,7 @@
         if self.url:
             file = re.sub ('.*/([^/]+)', '\\1', self.url)
         else:
-            file = self.name ()
+            file = os.path.basename (self.name ())
         return file
 
     @subst_method
@@ -627,7 +627,7 @@
 
     def get_tarball (self, mirror, version, format='gz', strip_components=1, name=''):
         if not name:
-            name = self.name ()
+            name = self.file_name ()
         if not format:
             format = self.__dict__.get ('format', 'gz')
         if not mirror:
@@ -647,7 +647,7 @@
               name=''):
 
         if not name:
-            name = self.name ()
+            name = self.file_name ()
         if not format:
             format = self.__dict__.get ('format', 'gz')
         if not mirror:
--- a/gub/specs/darwin/cross/gcc.py	Wed May 02 13:53:51 2007 +0200
+++ b/gub/specs/darwin/cross/gcc.py	Wed May 02 15:07:06 2007 +0200
@@ -27,15 +27,19 @@
         cross.Gcc.configure (self)
 
     def rewire_gcc_libs (self):
+	import os
         skip_libs = ['libgcc_s']
-        for l in self.locate_files ("%(install_root)s/usr/lib/", '*.dylib'):
-            found_skips = [s for s in  skip_libs if l.find (s) >= 0]
+        for ell in self.locate_files ("%(install_root)s/usr/lib/", '*.dylib'):
+            found_skips = [s for s in  skip_libs if ell.find (s) >= 0]
             if found_skips:
                 continue
             
-            id = self.read_pipe ('%(tool_prefix)sotool -L %(l)s', locals ()).split()[1]
+            id = self.read_pipe ('%(tool_prefix)sotool -L %(ell)s', 
+		locals ()).split()[1]
             id = os.path.split (id)[1]
-            self.system ('%(tool_prefix)sinstall_name_tool -id /usr/lib/%(id)s %(l)s', locals ())
+            self.system ('''
+%(tool_prefix)sinstall_name_tool -id /usr/lib/%(id)s %(ell)s
+''', locals ())
         
     def install (self):
         cross.Gcc.install (self)