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

Build set reports are the package name and not the config name.

Browse Source
This commit is contained in:
Chris Johns
2013-03-04 18:07:38 +11:00
parent 5e502a9ab1
commit 06834cfcf5
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
source-builder/sb/setbuilder.py
View File

@@ -27,6 +27,7 @@ import distutils.dir_util
import glob import glob
import operator import operator
import os import os
import sys
try: try:
import build import build
@@ -37,10 +38,10 @@ try:
import path import path
import reports import reports
except KeyboardInterrupt: except KeyboardInterrupt:
print 'user terminated' print 'abort: user terminated'
sys.exit(1) sys.exit(1)
except: except:
print 'unknown application load error' print 'error: unknown application load error'
sys.exit(1) sys.exit(1)
# #
@@ -110,7 +111,7 @@ class buildset:
raise error.general('invalid report format: %s' % (format[1])) raise error.general('invalid report format: %s' % (format[1]))
buildroot = _build.config.abspath('%{buildroot}') buildroot = _build.config.abspath('%{buildroot}')
prefix = self.opts.expand('%{_prefix}', self.defaults) prefix = self.opts.expand('%{_prefix}', self.defaults)
name = path.splitext(path.basename(_config))[0] + ext name = _build.main_package().name() + ext
outpath = path.host(path.join(buildroot, prefix, 'rtems-source-builder')) outpath = path.host(path.join(buildroot, prefix, 'rtems-source-builder'))
outname = path.host(path.join(outpath, name)) outname = path.host(path.join(outpath, name))
_notice(self.opts, 'reporting: %s -> %s' % (_config, name)) _notice(self.opts, 'reporting: %s -> %s' % (_config, name))
@@ -354,7 +355,7 @@ def run():
except error.exit, eerr: except error.exit, eerr:
pass pass
except KeyboardInterrupt: except KeyboardInterrupt:
_notice(opts, 'user terminated') _notice(opts, 'abort: user terminated')
sys.exit(1) sys.exit(1)
sys.exit(0) sys.exit(0)