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

Clean up build set configuration reporting.

Browse Source
This commit is contained in:
Chris Johns
2013-03-04 09:42:08 +11:00
parent c18c4b6d33
commit 864e8ff9fa
2 changed files with 43 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
source-builder/sb/reports.py
View File

@@ -266,30 +266,21 @@ class report:
self.config_end(name)
def buildset(self, name):
try_config = False
try:
self.bset_nesting += 1
self.buildset_start(name)
bset = setbuilder.buildset(name,
_configs = self.configs,
_defaults = self.defaults,
opts = self.opts)
for c in bset.load():
if c.endswith('.bset'):
self.buildset(c)
elif c.endswith('.cfg'):
self.config(c)
else:
raise error.general('invalid config type: %s' % (c))
self.buildset_end(name)
self.bset_nesting -= 1
except error.general, gerr:
if gerr.msg.startswith('no build set file found'):
try_config = True
self.bset_nesting += 1
self.buildset_start(name)
bset = setbuilder.buildset(name,
_configs = self.configs,
_defaults = self.defaults,
opts = self.opts)
for c in bset.load():
if c.endswith('.bset'):
self.buildset(c)
elif c.endswith('.cfg'):
self.config(c)
else:
raise
if try_config:
self.config(name)
raise error.general('invalid config type: %s' % (c))
self.buildset_end(name)
self.bset_nesting -= 1
def generate(self, name):
if self.format == 'html':
@@ -313,7 +304,15 @@ class report:
def make(self, inname, outname, intro_text = None):
self.setup()
self.introduction(inname, intro_text)
self.buildset(inname)
config = setbuilder.find_config(inname, self.configs)
if config is None:
raise error.general('config file not found: %s' % (inname))
if config.endswith('.bset'):
self.buildset(config)
elif config.endswith('.cfg'):
self.config(config)
else:
raise error.general('invalid config type: %s' % (config))
self.generate(outname)
def run(args):