rtems/rtems-source-builder
1
0
Fork 0
mirror of https://git.rtems.org/rtems-source-builder synced 2024-10-09 07:15:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Move the build sets to .bset naming.

Browse Source
This commit is contained in:
Chris Johns 2012-11-05 15:28:36 +11:00
parent 4882ff3655
commit e9af460249
3 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
config/gnu-tools-4.6.cfg → config/gnu-tools-4.6.bset
View File

8
sb/build.py
View File

@ -431,15 +431,15 @@ class build:
package = packages['main'] package = packages['main']
return package.name() return package.name()
def list_configs(opts, _defaults): def list_configs(opts, _defaults, ext = '.cfg'):
configs = [] configs = []
for cp in opts.expand('%{_configdir}', _defaults).split(':'): for cp in opts.expand('%{_configdir}', _defaults).split(':'):
print 'Examining: %s' % (os.path.abspath(cp)) print 'Examining: %s' % (os.path.abspath(cp))
configs += glob.glob(os.path.join(cp, '*.cfg')) configs += glob.glob(os.path.join(cp, '*%s' % (ext)))
for c in sorted(configs): for c in sorted(configs):
config = os.path.basename(c) config = os.path.basename(c)
if config.endswith('.cfg'): if config.endswith(ext):
config = config[:-4] config = config[:0 - len(ext)]
print ' ', config print ' ', config
def run(args): def run(args):

17
sb/setbuilder.py
View File

@ -125,22 +125,22 @@ class buildset:
root, ext = path.splitext(exbset) root, ext = path.splitext(exbset)
if exbset.endswith('.cfg'): if exbset.endswith('.bset'):
bsetcfg = exbset bset = exbset
else: else:
bsetcfg = '%s.cfg' % (exbset) bset = '%s.bset' % (exbset)
bsetname = bsetcfg bsetname = bset
if not path.exists(bsetname): if not path.exists(bsetname):
for cp in self.opts.expand('%{_configdir}', self.defaults).split(':'): for cp in self.opts.expand('%{_configdir}', self.defaults).split(':'):
configdir = path.abspath(cp) configdir = path.abspath(cp)
bsetname = path.join(configdir, bsetcfg) bsetname = path.join(configdir, bset)
if path.exists(bsetname): if path.exists(bsetname):
break break
bsetname = None bsetname = None
if bsetname is None: if bsetname is None:
raise error.general('no build set file found: %s' % (bsetcfg)) raise error.general('no build set file found: %s' % (bset))
try: try:
if self.opts.trace(): if self.opts.trace():
print '_bset:%s: open: %s' % (self.bset, bsetname) print '_bset:%s: open: %s' % (self.bset, bsetname)
@ -215,7 +215,8 @@ class buildset:
def run(): def run():
import sys import sys
try: try:
optargs = { '--list-configs': 'List available configurations' } optargs = { '--list-configs': 'List available configurations',
'--list-bsets': 'List available build sets'}
opts, _defaults = defaults.load(sys.argv, optargs) opts, _defaults = defaults.load(sys.argv, optargs)
log.default = log.log(opts.logfiles()) log.default = log.log(opts.logfiles())
_notice(opts, 'Source Builder - Set Builder, v%s' % (version)) _notice(opts, 'Source Builder - Set Builder, v%s' % (version))
@ -225,6 +226,8 @@ def run():
_notice(opts, 'warning: forcing build with known host setup problems') _notice(opts, 'warning: forcing build with known host setup problems')
if opts.get_arg('--list-configs'): if opts.get_arg('--list-configs'):
build.list_configs(opts, _defaults) build.list_configs(opts, _defaults)
elif opts.get_arg('--list-bsets'):
build.list_configs(opts, _defaults, ext = '.bset')
else: else:
for bset in opts.params(): for bset in opts.params():
c = buildset(bset, _defaults = _defaults, opts = opts) c = buildset(bset, _defaults = _defaults, opts = opts)