Mercurial > gub
changeset 3367:661038b341df
Fixes for cross/ prefix.
| author | Jan Nieuwenhuizen <janneke@gnu.org> |
|---|---|
| date | Tue, 01 May 2007 11:49:35 +0200 |
| parents | 7d7c2146ad59 |
| children | 54ea8a88f170 |
| files | TODO gub/gubb.py gub/settings.py gub/specs/cross/gcc-core.py |
| diffstat | 4 files changed, 16 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/TODO Sun Apr 29 23:30:30 2007 +0200 +++ b/TODO Tue May 01 11:49:35 2007 +0200 @@ -11,6 +11,8 @@ * cygwin GCC + * zlib + - update packages: * Gnome 2.16
--- a/gub/gubb.py Sun Apr 29 23:30:30 2007 +0200 +++ b/gub/gubb.py Tue May 01 11:49:35 2007 +0200 @@ -133,9 +133,11 @@ @subst_method def name (self): - file = self.__class__.__name__.lower () - file = re.sub ('__.*', '', file) - file = re.sub ('_', '-', file) + if 0: # old method, removes cross/ + file = self.__class__.__name__.lower () + file = re.sub ('__.*', '', file) + file = re.sub ('_', '-', file) + file = self.__class__.__module__ ## UGH ? what happens if xx is in a normal name?! file = re.sub ('xx', '++', file)
--- a/gub/settings.py Sun Apr 29 23:30:30 2007 +0200 +++ b/gub/settings.py Tue May 01 11:49:35 2007 +0200 @@ -66,8 +66,10 @@ self.uploads = self.topdir + '/uploads' self.gub_uploads = self.uploads + '/' + self.platform - ## FIXME -## self.gub_cross_uploads = '%s/%s-cross' % (self.uploads, self.platform) + # Hmm, change `cross/' to `cross.' or `cross-' in name? + self.cross_gub_uploads = self.gub_uploads + '/cross' + self.cross_allsrcdir = self.allsrcdir + '/cross' + self.cross_statusdir = self.statusdir + '/cross' self.distcc_hosts = '' @@ -121,7 +123,6 @@ 'downloads', 'logdir', 'gub_uploads', -# 'gub_cross_uploads', 'specdir', 'allsrcdir', 'statusdir', @@ -131,6 +132,10 @@ 'targetdir', 'local_prefix', 'topdir', + + 'cross_gub_uploads', + 'cross_statusdir', + 'cross_allsrcdir', ): dir = self.__dict__[a] if os.path.isdir (dir):
--- a/gub/specs/cross/gcc-core.py Sun Apr 29 23:30:30 2007 +0200 +++ b/gub/specs/cross/gcc-core.py Tue May 01 11:49:35 2007 +0200 @@ -14,7 +14,7 @@ def get_subpackage_names (self): return [''] def name (self): - return 'gcc-core' + return 'cross/gcc-core' def file_name (self): return 'gcc-core' def get_conflict_dict (self):