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

Add optargs for tool extensions of arguments. Fix up the builder.

Browse Source
This commit is contained in:
Chris Johns 2012-11-05 12:29:25 +11:00
parent 8f7642f224
commit 71b88934f1
3 changed files with 65 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
sb/build.py
View File

@ -30,6 +30,7 @@ import sys
import urllib2
import urlparse
import check
import config
import defaults
import error
@ -429,15 +430,34 @@ class build:
package = packages['main']
return package.name()
def list_configs(opts, _defaults):
configs = []
for cp in opts.expand('%{_configdir}', _defaults).split(':'):
print 'Examining: %s' % (os.path.abspath(cp))
configs += glob.glob(os.path.join(cp, '*.cfg'))
for c in sorted(configs):
config = os.path.basename(c)
if config.endswith('.cfg'):
config = config[:-4]
print ' ', config
def run(args):
try:
opts, _defaults = defaults.load(args)
optargs = { '--list-configs': 'List available configurations' }
opts, _defaults = defaults.load(args, optargs)
log.default = log.log(opts.logfiles())
_notice(opts, 'Source Builder, Package Builder v%s' % (version))
for config_file in opts.config_files():
b = build(config_file, _defaults = _defaults, opts = opts)
b.make()
del b
if not check.host_setup(opts, _defaults):
if not opts.force():
raise error.general('host build environment is not set up correctly (use --force to proceed)')
_notice(opts, 'warning: forcing build with known host setup problems')
if opts.get_arg('--list-configs'):
list_configs(opts, _defaults)
else:
for config_file in opts.config_files():
b = build(config_file, _defaults = _defaults, opts = opts)
b.make()
del b
except error.general, gerr:
print gerr
sys.exit(1)

39
sb/defaults.py
View File

@ -276,14 +276,18 @@ class command_line:
print '--libstdcxxflags flags : List of C++ flags to build the target libstdc++ code'
print '--with-<label> : Add the --with-<label> to the build'
print '--without-<label> : Add the --without-<label> to the build'
if self.optargs:
for a in self.optargs:
print '%-22s : %s' % (a, self.optargs[a])
raise error.exit()
def __init__(self, argv):
def __init__(self, argv, optargs):
self.command_path = path.dirname(argv[0])
if len(self.command_path) == 0:
self.command_path = '.'
self.command_name = path.basename(argv[0])
self.args = argv[1:]
self.optargs = optargs
self.defaults = {}
for to in command_line._long_true_opts:
self.defaults[command_line._long_true_opts[to]] = ('none', 'none', '0')
@ -393,8 +397,8 @@ class command_line:
self.defaults[_arch] = ('none', 'none', _arch_value)
self.defaults[_vendor] = ('none', 'none', _vendor_value)
self.defaults[_os] = ('none', 'none', _os_value)
if not lo:
raise error.general('invalid argument: ' + a)
if not lo and a not in self.optargs:
raise error.general('invalid argument (try --help): %s' % (a))
else:
if a == '-f':
self.opts['force'] = '1'
@ -404,6 +408,8 @@ class command_line:
self.opts['quiet'] = '1'
elif a == '-?':
self._help()
else:
raise error.general('invalid argument (try --help): %s' % (a))
else:
self.opts['params'].append(a)
i += 1
@ -463,6 +469,14 @@ class command_line:
def params(self):
return self.opts['params']
def get_arg(self, arg):
if not arg in self.optargs:
raise error.internal('bad arg: %s' % (arg))
for a in self.args:
if a.startswith(arg):
return a
return None
def get_config_files(self, config):
#
# Convert to shell paths and return shell paths.
@ -471,20 +485,21 @@ class command_line:
# not the initial set of values ?
#
config = path.shell(config)
if config.find('*') >= 0 or config.find('?'):
if '*' in config or '?' in config:
print config
configdir = path.dirname(config)
configbase = path.basename(config)
if len(configbase) == 0:
configbase = '*'
if not configbase.endswith('.cfg'):
configbase = configbase + '.cfg'
if len(configdir) == 0:
configdir = self.expand(defaults['_configdir'][2], defaults)
hostconfigdir = path.host(configdir)
if not os.path.isdir(hostconfigdir):
raise error.general('configdir is not a directory or does not exist: %s' % (hostconfigdir))
files = glob.glob(os.path.join(hostconfigdir, configbase))
configs = []
for f in files:
configs += path.shell(f)
for cp in configdir.split(':'):
hostconfigdir = path.host(cp)
for f in glob.glob(os.path.join(hostconfigdir, configbase)):
configs += path.shell(f)
else:
configs = [config]
return configs
@ -510,7 +525,7 @@ class command_line:
return self.opts['prefixbase']
return None
def load(args):
def load(args, optargs = None):
"""
Copy the defaults, get the host specific values and merge them overriding
any matching defaults, then create an options object to handle the command
@ -540,7 +555,7 @@ def load(args):
raise error.general('no hosts defaults found; please add')
for k in overrides:
d[k] = overrides[k]
o = command_line(args)
o = command_line(args, optargs)
for k in o.defaults:
d[k] = o.defaults[k]
d = o._post_process(d)

19
sb/setbuilder.py
View File

@ -23,6 +23,7 @@
#
import distutils.dir_util
import glob
import operator
import os
@ -214,15 +215,21 @@ class buildset:
def run():
import sys
try:
opts, _defaults = defaults.load(sys.argv)
optargs = { '--list-configs': 'List available configurations' }
opts, _defaults = defaults.load(sys.argv, optargs)
log.default = log.log(opts.logfiles())
_notice(opts, 'Source Builder - Set Builder, v%s' % (version))
if not check.host_setup(opts, _defaults):
raise error.general('host build environment is not set up correctly')
for bset in opts.params():
c = buildset(bset, _defaults = _defaults, opts = opts)
c.make()
del c
if not opts.force():
raise error.general('host build environment is not set up correctly (use --force to proceed)')
_notice(opts, 'warning: forcing build with known host setup problems')
if opts.get_arg('--list-configs'):
build.list_configs(opts, _defaults)
else:
for bset in opts.params():
c = buildset(bset, _defaults = _defaults, opts = opts)
c.make()
del c
except error.general, gerr:
print gerr
sys.exit(1)