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

Fix the report command. Only output if an outname is given.

Browse Source
This commit is contained in:
Chris Johns 2013-04-28 16:10:02 +10:00
parent 22afed354e
commit 055e4906ef
1 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -302,17 +302,19 @@ class report:
self.output_directive('Clean', package.clean())
self.config_end(name)
def buildset(self, name):
def buildset(self, name, opts = None, macros = None):
self.bset_nesting += 1
self.buildset_start(name)
opts = copy.copy(self.opts)
macros = copy.copy(self.macros)
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)
self.buildset(c, bset.opts, bset.macros)
elif c.endswith('.cfg'):
self.config(c, opts, macros)
self.config(c, bset.opts, bset.macros)
else:
raise error.general('invalid config type: %s' % (c))
self.buildset_end(name)
@ -329,6 +331,7 @@ class report:
self.out = outfile.getvalue()
infile.close()
outfile.close()
if name is not None:
try:
o = open(name, "w")
o.write(self.out)
@ -337,7 +340,7 @@ class report:
except IOError, err:
raise error.general('writing output file: %s: %s' % (name, err))
def make(self, inname, outname, intro_text = None):
def make(self, inname, outname = None, intro_text = None):
self.setup()
self.introduction(inname, intro_text)
config = build.find_config(inname, self.configs)