rtems/rtems-libbsd
1
0
Fork 0
mirror of https://git.rtems.org/rtems-libbsd/ synced 2025-10-17 21:47:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add RTEMS version support, update all python to 2 and 3.

Browse Source 
Add support to force the RTEMS version. This remove the need for using
the --rtems-version command line option if the automatic detection fails.

Update all python code to support python 2 and 3.

Update rtems_waf to the latest version to support the RTEMS version,
check environment variables and to display the CC version.

Sort all tests. I think the unsorted list is dependent on the version
of python and so would result in repo noise as if it regenerted.
This commit is contained in:
Chris Johns
2016-04-18 10:53:20 +10:00
parent 891a7568e5
commit 97c5024a79
8 changed files with 341 additions and 315 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
waf_generator.py
View File

@@ -1,5 +1,5 @@
#
# Copyright (c) 2015 Chris Johns <chrisj@rtems.org>. All rights reserved.
# Copyright (c) 2015-2016 Chris Johns <chrisj@rtems.org>. All rights reserved.
#
# Copyright (c) 2009-2015 embedded brains GmbH. All rights reserved.
#
@@ -32,7 +32,10 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
from __future__ import print_function
import os
import sys
import tempfile
import builder
@@ -146,7 +149,10 @@ class ModuleManager(builder.ModuleManager):
def write(self):
try:
out = tempfile.NamedTemporaryFile(delete = False)
out.write(self.script)
try:
out.write(bytes(self.script, sys.stdin.encoding))
except:
out.write(self.script)
out.close()
wscript = builder.RTEMS_DIR + '/wscript'
builder.processIfDifferent(out.name, wscript, "wscript")
@@ -176,7 +182,7 @@ class ModuleManager(builder.ModuleManager):
self.generator['lex'] = LexFragmentComposer
self.generator['yacc'] = YaccFragmentComposer
def generate(self):
def generate(self, rtems_version):
def _source_list(lhs, files, append = False):
if append:
@@ -257,8 +263,12 @@ class ModuleManager(builder.ModuleManager):
self.add('# To use see README.waf shipped with this file.')
self.add('#')
self.add('')
self.add('from __future__ import print_function')
self.add('')
self.add('import os.path')
self.add('')
self.add('rtems_version = "%s"' % (rtems_version))
self.add('')
self.add('try:')
self.add(' import rtems_waf.rtems as rtems')
self.add('except:')
@@ -267,7 +277,7 @@ class ModuleManager(builder.ModuleManager):
self.add(' sys.exit(1)')
self.add('')
self.add('def init(ctx):')
self.add(' rtems.init(ctx)')
self.add(' rtems.init(ctx, version = rtems_version)')
self.add('')
self.add('def options(opt):')
self.add(' rtems.options(opt)')
@@ -569,7 +579,7 @@ class ModuleManager(builder.ModuleManager):
self.add(' # Tests')
tests = data['tests']
for test_name in tests:
for test_name in sorted(tests):
files = ['testsuite/%s/%s.c' % (test_name, f) for f in data['tests'][test_name]['all']['files']]
_source_list(' test_%s' % (test_name), sorted(files))
self.add(' bld.program(target = "%s.exe",' % (test_name))