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

Use separate defaults and opts for each build set.

Browse Source
This commit is contained in:
Chris Johns 2013-03-13 11:35:21 +11:00
parent 1efc3f79b3
commit fd4e4fb875
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,6 +22,7 @@
# installed not to be package unless you run a packager around this. # installed not to be package unless you run a packager around this.
# #
import copy
import datetime import datetime
import os import os
import sys import sys
@ -251,9 +252,9 @@ class report:
if self.is_asciidoc(): if self.is_asciidoc():
self.output('--------------------------------------------') self.output('--------------------------------------------')
def config(self, configname): def config(self, configname, _defaults, _opts):
_config = config.file(configname, _defaults = self.defaults, opts = self.opts) _config = config.file(configname, _defaults = _defaults, opts = _opts)
packages = _config.packages() packages = _config.packages()
package = packages['main'] package = packages['main']
name = package.name() name = package.name()
@ -311,15 +312,17 @@ class report:
def buildset(self, name): def buildset(self, name):
self.bset_nesting += 1 self.bset_nesting += 1
self.buildset_start(name) self.buildset_start(name)
_opts = copy.deepcopy(self.opts)
_defaults = copy.deepcopy(self.defaults)
bset = setbuilder.buildset(name, bset = setbuilder.buildset(name,
_configs = self.configs, _configs = self.configs,
_defaults = self.defaults, _defaults = _defaults,
opts = self.opts) opts = _opts)
for c in bset.load(): for c in bset.load():
if c.endswith('.bset'): if c.endswith('.bset'):
self.buildset(c) self.buildset(c)
elif c.endswith('.cfg'): elif c.endswith('.cfg'):
self.config(c) self.config(c, _defaults, _opts)
else: else:
raise error.general('invalid config type: %s' % (c)) raise error.general('invalid config type: %s' % (c))
self.buildset_end(name) self.buildset_end(name)