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

sb: Fix the RTEMS options after strict option checking was added.

Browse Source
This commit is contained in:
Chris Johns 2019-01-22 17:18:21 +11:00 committed by Sebastian Huber
parent 0bb29a38fb
commit 34a99328b4
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rtems/config/rtems-version.bset
View File

@ -2,4 +2,6 @@
# Current version is RTEMS 5 # Current version is RTEMS 5
# #
%define rtems_version 5 %if %{!defined rtems_version}
%error RTEMS version is not defined
%endif

16
source-builder/sb/options.py
View File

@ -53,7 +53,7 @@ class command_line:
def __init__(self, argv, optargs, _defaults, command_path): def __init__(self, argv, optargs, _defaults, command_path):
self._long_opts = { self._long_opts = {
# key macro handler param defs init # key macro handler param defs init
'--prefix' : ('_prefix', self._lo_path, True, None, False), '--prefix' : ('_prefix', self._lo_path, True, None, False),
'--topdir' : ('_topdir', self._lo_path, True, None, False), '--topdir' : ('_topdir', self._lo_path, True, None, False),
'--configdir' : ('_configdir', self._lo_path, True, None, False), '--configdir' : ('_configdir', self._lo_path, True, None, False),
@ -83,6 +83,9 @@ class command_line:
'--host' : ('_host', self._lo_triplets, True, None, False), '--host' : ('_host', self._lo_triplets, True, None, False),
'--build' : ('_build', self._lo_triplets, True, None, False), '--build' : ('_build', self._lo_triplets, True, None, False),
'--target' : ('_target', self._lo_triplets, True, None, False), '--target' : ('_target', self._lo_triplets, True, None, False),
'--rtems-tools' : ('_rtems_tools', self._lo_string, True, None, False),
'--rtems-bsp' : ('_rtems_bsp', self._lo_string, True, None, False),
'--rtems-version' : ('_rtems_version', self._lo_string, True, None, False),
'--help' : (None, self._lo_help, False, None, False) '--help' : (None, self._lo_help, False, None, False)
} }
@ -575,6 +578,12 @@ class command_line:
if self.get_arg('--with-tools') is not None: if self.get_arg('--with-tools') is not None:
raise error.general('--rtems-tools and --with-tools cannot be used together') raise error.general('--rtems-tools and --with-tools cannot be used together')
self.args.append('--with-tools=%s' % (rtems_tools[1])) self.args.append('--with-tools=%s' % (rtems_tools[1]))
rtems_version = self.parse_args('--rtems-version')
if rtems_version is None:
rtems_version = version.version()
else:
rtems_version = rtems_version[1]
self.defaults['rtems_version'] = rtems_version
rtems_arch_bsp = self.parse_args('--rtems-bsp') rtems_arch_bsp = self.parse_args('--rtems-bsp')
if rtems_arch_bsp is not None: if rtems_arch_bsp is not None:
if self.get_arg('--target') is not None: if self.get_arg('--target') is not None:
@ -582,11 +591,6 @@ class command_line:
ab = rtems_arch_bsp[1].split('/') ab = rtems_arch_bsp[1].split('/')
if len(ab) != 2: if len(ab) != 2:
raise error.general('invalid --rtems-bsp option') raise error.general('invalid --rtems-bsp option')
rtems_version = self.parse_args('--rtems-version')
if rtems_version is None:
rtems_version = version.version()
else:
rtems_version = rtems_version[1]
self.args.append('--target=%s-rtems%s' % (ab[0], rtems_version)) self.args.append('--target=%s-rtems%s' % (ab[0], rtems_version))
self.args.append('--with-rtems-bsp=%s' % (ab[1])) self.args.append('--with-rtems-bsp=%s' % (ab[1]))