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

Report from the setbuilder's build config.

Browse Source 
Refactor the reporter to allow the setbuilder to use its build config
rather than regenerating the configuration from the configuration file.
Using the config file and the build macros exposed an issue if a
macro was undefined that was defined in a build set above the
config file. Using the build set's configuration as used to build
is a better solution.

The reporter was refactored to allow a config class to be used
to report.

The setbuild can now take a configuration file as an input file.
This commit is contained in:
Chris Johns
2013-04-29 09:01:14 +10:00
parent 8837860347
commit adf09460a2
2 changed files with 92 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -154,7 +154,7 @@ class report:
self.output("'''")
self.output('')
def introduction(self, name, intro_text):
def introduction(self, name, intro_text = None):
if self.is_asciidoc():
h = 'RTEMS Source Builder Report'
self.output(h)
@@ -245,21 +245,20 @@ class report:
if self.is_asciidoc():
self.output('--------------------------------------------')
def config(self, configname, opts, macros):
def config(self, _config, opts, macros):
_config = config.file(configname, opts, macros)
packages = _config.packages()
package = packages['main']
name = package.name()
self.config_start(name)
if self.is_asciidoc():
self.output('*Package*: _%s_ +' % (name))
self.output('*Config*: %s' % (configname))
self.output('*Config*: %s' % (_config.file_name()))
self.output('')
else:
self.output('-' * self.line_len)
self.output('Package: %s' % (name))
self.output(' Config: %s' % (configname))
self.output(' Config: %s' % (_config.file_name()))
self.output_info('Summary', package.get_info('summary'), True)
self.output_info('URL', package.get_info('url'))
self.output_info('Version', package.get_info('version'))
@@ -302,25 +301,7 @@ class report:
self.output_directive('Clean', package.clean())
self.config_end(name)
def buildset(self, name, opts = None, macros = None):
self.bset_nesting += 1
self.buildset_start(name)
if opts is None:
opts = self.opts
if macros is None:
macros = self.macros
bset = setbuilder.buildset(name, self.configs, opts, macros)
for c in bset.load():
if c.endswith('.bset'):
self.buildset(c, bset.opts, bset.macros)
elif c.endswith('.cfg'):
self.config(c, bset.opts, bset.macros)
else:
raise error.general('invalid config type: %s' % (c))
self.buildset_end(name)
self.bset_nesting -= 1
def generate(self, name):
def write(self, name):
if self.format == 'html':
if self.asciidoc is None:
raise error.general('asciidoc not initialised')
@@ -340,19 +321,30 @@ class report:
except IOError, err:
raise error.general('writing output file: %s: %s' % (name, err))
def make(self, inname, outname = None, intro_text = None):
def generate(self, name, opts = None, macros = None):
self.bset_nesting += 1
self.buildset_start(name)
if opts is None:
opts = self.opts
if macros is None:
macros = self.macros
bset = setbuilder.buildset(name, self.configs, opts, macros)
for c in bset.load():
if c.endswith('.bset'):
self.buildset(c, bset.opts, bset.macros)
elif c.endswith('.cfg'):
self.config(config.file(c, bset.opts, bset.macros),
bset.opts, bset.macros)
else:
raise error.general('invalid config type: %s' % (c))
self.buildset_end(name)
self.bset_nesting -= 1
def create(self, inname, outname = None, intro_text = None):
self.setup()
self.introduction(inname, intro_text)
config = build.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, self.opts, self.macros)
else:
raise error.general('invalid config type: %s' % (config))
self.generate(outname)
self.generate(inname)
self.write(outname)
def run(args):
try:
@@ -394,8 +386,13 @@ def run(args):
outname = outname.replace('/', '-')
else:
outname = output
r.make(_config, outname)
config = build.find_config(_config, configs)
if config is None:
raise error.general('config file not found: %s' % (inname))
r.create(config, outname)
del r
else:
raise error.general('invalid config type: %s' % (config))
except error.general, gerr:
print gerr
sys.exit(1)