waf: Reformat to PEP8 using yapf

This commit is contained in:
Chris Johns 2020-09-01 14:01:14 +10:00
parent d2d3fabf30
commit 7afbccd8d7
3 changed files with 515 additions and 354 deletions

View File

@ -1,5 +1,8 @@
# # SPDX-License-Identifier: BSD-2-Clause
# Copyright (c) 2015-2016 Chris Johns <chrisj@rtems.org>. All rights reserved. '''Manage the libbsd build configuration data.
'''
# Copyright (c) 2015, 2020 Chris Johns <chrisj@rtems.org>. All rights reserved.
# #
# Copyright (c) 2009, 2017 embedded brains GmbH. All rights reserved. # Copyright (c) 2009, 2017 embedded brains GmbH. All rights reserved.
# #
@ -9,8 +12,6 @@
# Germany # Germany
# <info@embedded-brains.de> # <info@embedded-brains.de>
# #
# Copyright (c) 2012 OAR Corporation. All rights reserved.
#
# Redistribution and use in source and binary forms, with or without # Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions # modification, are permitted provided that the following conditions
# are met: # are met:
@ -20,19 +21,17 @@
# notice, this list of conditions and the following disclaimer in the # notice, this list of conditions and the following disclaimer in the
# documentation and/or other materials provided with the distribution. # documentation and/or other materials provided with the distribution.
# #
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT # ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, # LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT # CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, # SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY # INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT # CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # POSSIBILITY OF SUCH DAMAGE.
# FreeBSD: http://svn.freebsd.org/base/releng/8.2/sys (revision 222485)
from __future__ import print_function from __future__ import print_function
@ -67,6 +66,7 @@ verboseDetail = 2
verboseMoreDetail = 3 verboseMoreDetail = 3
verboseDebug = 4 verboseDebug = 4
def _cflagsIncludes(cflags, includes): def _cflagsIncludes(cflags, includes):
if type(cflags) is not list: if type(cflags) is not list:
if cflags is not None: if cflags is not None:
@ -81,9 +81,11 @@ def _cflagsIncludes(cflags, includes):
_includes = includes _includes = includes
return _cflags, _includes return _cflags, _includes
def verbose(level=verboseInfo): def verbose(level=verboseInfo):
return verboseLevel >= level return verboseLevel >= level
def changedFileSummary(statsReport=False): def changedFileSummary(statsReport=False):
global filesTotal, filesTotalLines, filesTotalInserts, filesTotalDeletes global filesTotal, filesTotalLines, filesTotalInserts, filesTotalDeletes
@ -107,18 +109,25 @@ def changedFileSummary(statsReport = False):
# #
# Sort by opacity. # Sort by opacity.
# #
ordered_diffs = sorted(diffDetails.items(), key = lambda diff: diff[1].opacity, reverse = True) ordered_diffs = sorted(diffDetails.items(),
key=lambda diff: diff[1].opacity,
reverse=True)
for f in ordered_diffs: for f in ordered_diffs:
print(' %s' % (diffDetails[f[0]].status())) print(' %s' % (diffDetails[f[0]].status()))
def readFile(name): def readFile(name):
try: try:
contents = codecs.open(name, mode = 'r', encoding = 'utf-8', errors = 'ignore').read() contents = codecs.open(name,
mode='r',
encoding='utf-8',
errors='ignore').read()
except UnicodeDecodeError as ude: except UnicodeDecodeError as ude:
print('error: reading: %s: %s' % (name, ude)) print('error: reading: %s: %s' % (name, ude))
sys.exit(1) sys.exit(1)
return contents return contents
def writeFile(name, contents): def writeFile(name, contents):
path = os.path.dirname(name) path = os.path.dirname(name)
if not os.path.exists(path): if not os.path.exists(path):
@ -128,11 +137,13 @@ def writeFile(name, contents):
print('error: cannot create directory: %s: %s' % (path, oe)) print('error: cannot create directory: %s: %s' % (path, oe))
sys.exit(1) sys.exit(1)
try: try:
codecs.open(name, mode = 'w', encoding = 'utf-8', errors = 'ignore').write(contents) codecs.open(name, mode='w', encoding='utf-8',
errors='ignore').write(contents)
except UnicodeDecodeError as ude: except UnicodeDecodeError as ude:
print('error: write: %s: %s' % (name, ude)) print('error: write: %s: %s' % (name, ude))
sys.exit(1) sys.exit(1)
# #
# A builder error. # A builder error.
# #
@ -140,11 +151,14 @@ class error(Exception):
"""Base class for exceptions.""" """Base class for exceptions."""
def __init__(self, msg): def __init__(self, msg):
self.msg = 'error: %s' % (msg) self.msg = 'error: %s' % (msg)
def set_output(self, msg): def set_output(self, msg):
self.msg = msg self.msg = msg
def __str__(self): def __str__(self):
return self.msg return self.msg
# #
# Diff Record # Diff Record
# #
@ -158,7 +172,8 @@ class diffRecord:
self.inserts = inserts self.inserts = inserts
self.deletes = deletes self.deletes = deletes
self.changes = inserts + deletes self.changes = inserts + deletes
self.opacity = (float(self.changes) / (self.lines + self.changes)) * 100.0 self.opacity = (float(self.changes) /
(self.lines + self.changes)) * 100.0
def __repr__(self): def __repr__(self):
return self.src return self.src
@ -167,36 +182,50 @@ class diffRecord:
return 'opacity:%5.1f%% edits:%4d (+):%-4d (-):%-4d %s' % \ return 'opacity:%5.1f%% edits:%4d (+):%-4d (-):%-4d %s' % \
(self.opacity, self.changes, self.inserts, self.deletes, self.src) (self.opacity, self.changes, self.inserts, self.deletes, self.src)
# #
# This stuff needs to move to libbsd.py. # This stuff needs to move to libbsd.py.
# #
# Move target dependent files under a machine directory # Move target dependent files under a machine directory
def mapCPUDependentPath(path): def mapCPUDependentPath(path):
return path.replace("include/", "include/machine/") return path.replace("include/", "include/machine/")
def fixIncludes(data): def fixIncludes(data):
data = re.sub('#include <sys/resource.h>', '#include <rtems/bsd/sys/resource.h>', data) data = re.sub('#include <sys/resource.h>',
data = re.sub('#include <sys/unistd.h>', '#include <rtems/bsd/sys/unistd.h>', data) '#include <rtems/bsd/sys/resource.h>', data)
data = re.sub('#include <sys/unistd.h>',
'#include <rtems/bsd/sys/unistd.h>', data)
return data return data
# revert fixing the include paths inside a C or .h file # revert fixing the include paths inside a C or .h file
def revertFixIncludes(data): def revertFixIncludes(data):
data = re.sub('#include <rtems/bsd/', '#include <', data) data = re.sub('#include <rtems/bsd/', '#include <', data)
data = re.sub('#include <util.h>', '#include <rtems/bsd/util.h>', data) data = re.sub('#include <util.h>', '#include <rtems/bsd/util.h>', data)
data = re.sub('#include <bsd.h>', '#include <rtems/bsd/bsd.h>', data) data = re.sub('#include <bsd.h>', '#include <rtems/bsd/bsd.h>', data)
data = re.sub('#include <zerocopy.h>', '#include <rtems/bsd/zerocopy.h>', data) data = re.sub('#include <zerocopy.h>', '#include <rtems/bsd/zerocopy.h>',
data = re.sub('#include <modules.h>', '#include <rtems/bsd/modules.h>', data) data)
data = re.sub('#include <modules.h>', '#include <rtems/bsd/modules.h>',
data)
return data return data
# fix include paths inside a C or .h file # fix include paths inside a C or .h file
def fixLocalIncludes(data): def fixLocalIncludes(data):
data = re.sub('#include "opt_([^"]*)"', '#include <rtems/bsd/local/opt_\\1>', data) data = re.sub('#include "opt_([^"]*)"',
data = re.sub('#include "([^"]*)_if.h"', '#include <rtems/bsd/local/\\1_if.h>', data) '#include <rtems/bsd/local/opt_\\1>', data)
data = re.sub('#include "miidevs([^"]*)"', '#include <rtems/bsd/local/miidevs\\1>', data) data = re.sub('#include "([^"]*)_if.h"',
data = re.sub('#include "usbdevs([^"]*)"', '#include <rtems/bsd/local/usbdevs\\1>', data) '#include <rtems/bsd/local/\\1_if.h>', data)
data = re.sub('#include "miidevs([^"]*)"',
'#include <rtems/bsd/local/miidevs\\1>', data)
data = re.sub('#include "usbdevs([^"]*)"',
'#include <rtems/bsd/local/usbdevs\\1>', data)
return data return data
# revert fixing the include paths inside a C or .h file # revert fixing the include paths inside a C or .h file
def revertFixLocalIncludes(data): def revertFixLocalIncludes(data):
data = re.sub('#include <rtems/bsd/local/([^>]*)>', '#include "\\1"', data) data = re.sub('#include <rtems/bsd/local/([^>]*)>', '#include "\\1"', data)
@ -211,25 +240,29 @@ def assertHeaderFile(path):
print("*** Move it to a C source file list") print("*** Move it to a C source file list")
sys.exit(2) sys.exit(2)
def assertSourceFile(path): def assertSourceFile(path):
if path[-2:] != '.c' and path[-2:] != '.S' and path[-3:] != '.cc': if path[-2:] != '.c' and path[-2:] != '.S' and path[-3:] != '.cc':
print("*** " + path + " does not end in .c, .cc or .S") print("*** " + path + " does not end in .c, .cc or .S")
print("*** Move it to a header file list") print("*** Move it to a header file list")
sys.exit(2) sys.exit(2)
def assertHeaderOrSourceFile(path): def assertHeaderOrSourceFile(path):
if path[-2] != '.' or (path[-1] != 'h' and path[-1] != 'c'): if path[-2] != '.' or (path[-1] != 'h' and path[-1] != 'c'):
print("*** " + path + " does not end in .h or .c") print("*** " + path + " does not end in .h or .c")
print("*** Move it to another list") print("*** Move it to another list")
sys.exit(2) sys.exit(2)
def diffSource(dstLines, srcLines, src, dst): def diffSource(dstLines, srcLines, src, dst):
global filesTotal, filesTotalLines, filesTotalInserts, filesTotalDeletes global filesTotal, filesTotalLines, filesTotalInserts, filesTotalDeletes
# #
# Diff, note there is no line termination on each string. Expand the # Diff, note there is no line termination on each string. Expand the
# generator to list because the generator is not reusable. # generator to list because the generator is not reusable.
# #
diff = list(difflib.unified_diff(dstLines, diff = list(
difflib.unified_diff(dstLines,
srcLines, srcLines,
fromfile=src, fromfile=src,
tofile=dst, tofile=dst,
@ -240,13 +273,15 @@ def diffSource(dstLines, srcLines, src, dst):
if len(diff) > 0: if len(diff) > 0:
if src in diffDetails and \ if src in diffDetails and \
diffDetails[src].dst != dst and diffDetails[src].diff != diff: diffDetails[src].dst != dst and diffDetails[src].diff != diff:
raise error('repeated diff of file different: src:%s dst:%s' % (src, dst)) raise error('repeated diff of file different: src:%s dst:%s' %
(src, dst))
for l in diff: for l in diff:
if l[0] == '-': if l[0] == '-':
deletes += 1 deletes += 1
elif l[0] == '+': elif l[0] == '+':
inserts += 1 inserts += 1
diffDetails[src] = diffRecord(src, dst, srcLines, diff, inserts, deletes) diffDetails[src] = diffRecord(src, dst, srcLines, diff, inserts,
deletes)
# #
# Count the total files, lines and the level of changes. # Count the total files, lines and the level of changes.
@ -258,6 +293,7 @@ def diffSource(dstLines, srcLines, src, dst):
return diff return diff
# #
# Converters provide a way to alter the various types of code. The conversion # Converters provide a way to alter the various types of code. The conversion
# process filters a file as it is copies from the source path to the # process filters a file as it is copies from the source path to the
@ -265,8 +301,12 @@ def diffSource(dstLines, srcLines, src, dst):
# source. # source.
# #
class Converter(object): class Converter(object):
def convert(self,
def convert(self, src, dst, hasSource = True, sourceFilter = None, srcContents = None): src,
dst,
hasSource=True,
sourceFilter=None,
srcContents=None):
global filesProcessed, filesProcessedCount global filesProcessed, filesProcessedCount
@ -337,10 +377,12 @@ class Converter(object):
for l in diff: for l in diff:
print(l) print(l)
class NoConverter(Converter): class NoConverter(Converter):
def convert(self, src, dst, hasSource=True, sourceFilter=None): def convert(self, src, dst, hasSource=True, sourceFilter=None):
return '/* EMPTY */\n' return '/* EMPTY */\n'
class FromFreeBSDToRTEMSHeaderConverter(Converter): class FromFreeBSDToRTEMSHeaderConverter(Converter):
def sourceFilter(self, data): def sourceFilter(self, data):
data = fixLocalIncludes(data) data = fixLocalIncludes(data)
@ -351,6 +393,7 @@ class FromFreeBSDToRTEMSHeaderConverter(Converter):
sconverter = super(FromFreeBSDToRTEMSHeaderConverter, self) sconverter = super(FromFreeBSDToRTEMSHeaderConverter, self)
sconverter.convert(src, dst, sourceFilter=self.sourceFilter) sconverter.convert(src, dst, sourceFilter=self.sourceFilter)
class FromFreeBSDToRTEMSUserSpaceHeaderConverter(Converter): class FromFreeBSDToRTEMSUserSpaceHeaderConverter(Converter):
def sourceFilter(self, data): def sourceFilter(self, data):
data = fixIncludes(data) data = fixIncludes(data)
@ -360,6 +403,7 @@ class FromFreeBSDToRTEMSUserSpaceHeaderConverter(Converter):
sconverter = super(FromFreeBSDToRTEMSUserSpaceHeaderConverter, self) sconverter = super(FromFreeBSDToRTEMSUserSpaceHeaderConverter, self)
sconverter.convert(src, dst, sourceFilter=self.sourceFilter) sconverter.convert(src, dst, sourceFilter=self.sourceFilter)
class FromFreeBSDToRTEMSSourceConverter(Converter): class FromFreeBSDToRTEMSSourceConverter(Converter):
def sourceFilter(self, data): def sourceFilter(self, data):
data = fixLocalIncludes(data) data = fixLocalIncludes(data)
@ -371,6 +415,7 @@ class FromFreeBSDToRTEMSSourceConverter(Converter):
sconverter = super(FromFreeBSDToRTEMSSourceConverter, self) sconverter = super(FromFreeBSDToRTEMSSourceConverter, self)
sconverter.convert(src, dst, sourceFilter=self.sourceFilter) sconverter.convert(src, dst, sourceFilter=self.sourceFilter)
class FromFreeBSDToRTEMSUserSpaceSourceConverter(Converter): class FromFreeBSDToRTEMSUserSpaceSourceConverter(Converter):
def sourceFilter(self, data): def sourceFilter(self, data):
data = fixIncludes(data) data = fixIncludes(data)
@ -381,6 +426,7 @@ class FromFreeBSDToRTEMSUserSpaceSourceConverter(Converter):
sconverter = super(FromFreeBSDToRTEMSUserSpaceSourceConverter, self) sconverter = super(FromFreeBSDToRTEMSUserSpaceSourceConverter, self)
sconverter.convert(src, dst, sourceFilter=self.sourceFilter) sconverter.convert(src, dst, sourceFilter=self.sourceFilter)
class FromRTEMSToFreeBSDHeaderConverter(Converter): class FromRTEMSToFreeBSDHeaderConverter(Converter):
def sourceFilter(self, data): def sourceFilter(self, data):
data = revertFixLocalIncludes(data) data = revertFixLocalIncludes(data)
@ -389,19 +435,29 @@ class FromRTEMSToFreeBSDHeaderConverter(Converter):
def convert(self, src, dst): def convert(self, src, dst):
sconverter = super(FromRTEMSToFreeBSDHeaderConverter, self) sconverter = super(FromRTEMSToFreeBSDHeaderConverter, self)
sconverter.convert(src, dst, hasSource = False, sourceFilter = self.sourceFilter) sconverter.convert(src,
dst,
hasSource=False,
sourceFilter=self.sourceFilter)
class FromRTEMSToFreeBSDSourceConverter(Converter): class FromRTEMSToFreeBSDSourceConverter(Converter):
def sourceFilter(self, data): def sourceFilter(self, data):
data = re.sub('#include <machine/rtems-bsd-kernel-space.h>\n\n', '', data) data = re.sub('#include <machine/rtems-bsd-kernel-space.h>\n\n', '',
data = re.sub('#include <machine/rtems-bsd-user-space.h>\n\n', '', data) data)
data = re.sub('#include <machine/rtems-bsd-user-space.h>\n\n', '',
data)
data = revertFixLocalIncludes(data) data = revertFixLocalIncludes(data)
data = revertFixIncludes(data) data = revertFixIncludes(data)
return data return data
def convert(self, src, dst): def convert(self, src, dst):
sconverter = super(FromRTEMSToFreeBSDSourceConverter, self) sconverter = super(FromRTEMSToFreeBSDSourceConverter, self)
sconverter.convert(src, dst, hasSource = False, sourceFilter = self.sourceFilter) sconverter.convert(src,
dst,
hasSource=False,
sourceFilter=self.sourceFilter)
# #
# Compose a path based for the various parts of the source tree. # Compose a path based for the various parts of the source tree.
@ -413,6 +469,7 @@ class PathComposer(object):
def composeLibBSDPath(self, path, prefix): def composeLibBSDPath(self, path, prefix):
return os.path.join(prefix, path) return os.path.join(prefix, path)
class FreeBSDPathComposer(PathComposer): class FreeBSDPathComposer(PathComposer):
def composeOriginPath(self, path): def composeOriginPath(self, path):
return os.path.join(FreeBSD_DIR, path) return os.path.join(FreeBSD_DIR, path)
@ -420,6 +477,7 @@ class FreeBSDPathComposer(PathComposer):
def composeLibBSDPath(self, path, prefix): def composeLibBSDPath(self, path, prefix):
return os.path.join(prefix, 'freebsd', path) return os.path.join(prefix, 'freebsd', path)
class RTEMSPathComposer(PathComposer): class RTEMSPathComposer(PathComposer):
def composeOriginPath(self, path): def composeOriginPath(self, path):
return path return path
@ -427,6 +485,7 @@ class RTEMSPathComposer(PathComposer):
def composeLibBSDPath(self, path, prefix): def composeLibBSDPath(self, path, prefix):
return os.path.join(prefix, 'rtemsbsd', path) return os.path.join(prefix, 'rtemsbsd', path)
class LinuxPathComposer(PathComposer): class LinuxPathComposer(PathComposer):
def composeOriginPath(self, path): def composeOriginPath(self, path):
return path return path
@ -434,34 +493,43 @@ class LinuxPathComposer(PathComposer):
def composeLibBSDPath(self, path, prefix): def composeLibBSDPath(self, path, prefix):
return os.path.join(prefix, 'linux', path) return os.path.join(prefix, 'linux', path)
class CPUDependentFreeBSDPathComposer(FreeBSDPathComposer): class CPUDependentFreeBSDPathComposer(FreeBSDPathComposer):
def composeLibBSDPath(self, path, prefix): def composeLibBSDPath(self, path, prefix):
path = super(CPUDependentFreeBSDPathComposer, self).composeLibBSDPath(path, prefix) path = super(CPUDependentFreeBSDPathComposer,
self).composeLibBSDPath(path, prefix)
path = mapCPUDependentPath(path) path = mapCPUDependentPath(path)
return path return path
class CPUDependentRTEMSPathComposer(RTEMSPathComposer): class CPUDependentRTEMSPathComposer(RTEMSPathComposer):
def composeLibBSDPath(self, path, prefix): def composeLibBSDPath(self, path, prefix):
path = super(CPUDependentRTEMSPathComposer, self).composeLibBSDPath(path, prefix) path = super(CPUDependentRTEMSPathComposer,
self).composeLibBSDPath(path, prefix)
path = mapCPUDependentPath(path) path = mapCPUDependentPath(path)
return path return path
class CPUDependentLinuxPathComposer(LinuxPathComposer): class CPUDependentLinuxPathComposer(LinuxPathComposer):
def composeLibBSDPath(self, path, prefix): def composeLibBSDPath(self, path, prefix):
path = super(CPUDependentLinuxPathComposer, self).composeLibBSDPath(path, prefix) path = super(CPUDependentLinuxPathComposer,
self).composeLibBSDPath(path, prefix)
path = mapCPUDependentPath(path) path = mapCPUDependentPath(path)
return path return path
class TargetSourceCPUDependentPathComposer(CPUDependentFreeBSDPathComposer): class TargetSourceCPUDependentPathComposer(CPUDependentFreeBSDPathComposer):
def __init__(self, targetCPU, sourceCPU): def __init__(self, targetCPU, sourceCPU):
self.targetCPU = targetCPU self.targetCPU = targetCPU
self.sourceCPU = sourceCPU self.sourceCPU = sourceCPU
def composeLibBSDPath(self, path, prefix): def composeLibBSDPath(self, path, prefix):
path = super(TargetSourceCPUDependentPathComposer, self).composeLibBSDPath(path, prefix) path = super(TargetSourceCPUDependentPathComposer,
self).composeLibBSDPath(path, prefix)
path = path.replace(self.sourceCPU, self.targetCPU) path = path.replace(self.sourceCPU, self.targetCPU)
return path return path
class BuildSystemFragmentComposer(object): class BuildSystemFragmentComposer(object):
def __init__(self, includes=None): def __init__(self, includes=None):
if type(includes) is not list: if type(includes) is not list:
@ -472,8 +540,8 @@ class BuildSystemFragmentComposer(object):
def compose(self, path): def compose(self, path):
return '' return ''
class SourceFileFragmentComposer(BuildSystemFragmentComposer):
class SourceFileFragmentComposer(BuildSystemFragmentComposer):
def __init__(self, cflags="default", includes=None): def __init__(self, cflags="default", includes=None):
self.cflags, self.includes = _cflagsIncludes(cflags, includes) self.cflags, self.includes = _cflagsIncludes(cflags, includes)
@ -482,15 +550,17 @@ class SourceFileFragmentComposer(BuildSystemFragmentComposer):
flags = self.cflags flags = self.cflags
else: else:
flags = self.cflags + self.includes flags = self.cflags + self.includes
return ['sources', flags, ('default', None)], [path], self.cflags, self.includes return ['sources', flags,
('default', None)], [path], self.cflags, self.includes
class SourceFileIfHeaderComposer(SourceFileFragmentComposer): class SourceFileIfHeaderComposer(SourceFileFragmentComposer):
def __init__(self, headers, cflags="default", includes=None): def __init__(self, headers, cflags="default", includes=None):
if headers is not list: if headers is not list:
headers = [headers] headers = [headers]
self.headers = headers self.headers = headers
super(SourceFileIfHeaderComposer, self).__init__(cflags = cflags, includes = includes) super(SourceFileIfHeaderComposer, self).__init__(cflags=cflags,
includes=includes)
def compose(self, path): def compose(self, path):
r = SourceFileFragmentComposer.compose(self, path) r = SourceFileFragmentComposer.compose(self, path)
@ -503,9 +573,15 @@ class SourceFileIfHeaderComposer(SourceFileFragmentComposer):
r[0][2] = (define_keys.strip(), self.headers) r[0][2] = (define_keys.strip(), self.headers)
return r return r
class TestFragementComposer(BuildSystemFragmentComposer):
def __init__(self, testName, fileFragments, configTest = None, runTest = True, netTest = False, extraLibs = []): class TestFragementComposer(BuildSystemFragmentComposer):
def __init__(self,
testName,
fileFragments,
configTest=None,
runTest=True,
netTest=False,
extraLibs=[]):
self.testName = testName self.testName = testName
self.fileFragments = fileFragments self.fileFragments = fileFragments
self.configTest = configTest self.configTest = configTest
@ -514,20 +590,31 @@ class TestFragementComposer(BuildSystemFragmentComposer):
self.extraLibs = extraLibs self.extraLibs = extraLibs
def compose(self, path): def compose(self, path):
return ['tests', self.testName, ('default', None)], { 'configTest': self.configTest, return ['tests', self.testName, ('default', None)], {
'configTest': self.configTest,
'files': self.fileFragments, 'files': self.fileFragments,
'run': self.runTest, 'run': self.runTest,
'net': self.netTest, 'net': self.netTest,
'libs': self.extraLibs} 'libs': self.extraLibs
}
class TestIfHeaderComposer(TestFragementComposer): class TestIfHeaderComposer(TestFragementComposer):
def __init__(self,
def __init__(self, testName, headers, fileFragments, runTest = True, netTest = False, extraLibs = []): testName,
headers,
fileFragments,
runTest=True,
netTest=False,
extraLibs=[]):
if headers is not list: if headers is not list:
headers = [headers] headers = [headers]
self.headers = headers self.headers = headers
super(TestIfHeaderComposer, self).__init__(testName, fileFragments, 'header', super(TestIfHeaderComposer, self).__init__(testName,
runTest = runTest, netTest = netTest, fileFragments,
'header',
runTest=runTest,
netTest=netTest,
extraLibs=extraLibs) extraLibs=extraLibs)
def compose(self, path): def compose(self, path):
@ -541,14 +628,23 @@ class TestIfHeaderComposer(TestFragementComposer):
r[0][2] = (define_keys.strip(), self.headers) r[0][2] = (define_keys.strip(), self.headers)
return r return r
class TestIfLibraryComposer(TestFragementComposer):
def __init__(self, testName, libraries, fileFragments, runTest = True, netTest = False, extraLibs = []): class TestIfLibraryComposer(TestFragementComposer):
def __init__(self,
testName,
libraries,
fileFragments,
runTest=True,
netTest=False,
extraLibs=[]):
if libraries is not list: if libraries is not list:
libraries = [libraries] libraries = [libraries]
self.libraries = libraries self.libraries = libraries
super(TestIfLibraryComposer, self).__init__(testName, fileFragments, 'library', super(TestIfLibraryComposer, self).__init__(testName,
runTest = runTest, netTest = netTest, fileFragments,
'library',
runTest=runTest,
netTest=netTest,
extraLibs=extraLibs) extraLibs=extraLibs)
def compose(self, path): def compose(self, path):
@ -562,23 +658,24 @@ class TestIfLibraryComposer(TestFragementComposer):
r[0][2] = (define_keys.strip(), self.libraries) r[0][2] = (define_keys.strip(), self.libraries)
return r return r
class KVMSymbolsFragmentComposer(BuildSystemFragmentComposer):
class KVMSymbolsFragmentComposer(BuildSystemFragmentComposer):
def compose(self, path): def compose(self, path):
return ['KVMSymbols', 'files', ('default', None)], [path], self.includes return ['KVMSymbols', 'files',
('default', None)], [path], self.includes
class RPCGENFragmentComposer(BuildSystemFragmentComposer): class RPCGENFragmentComposer(BuildSystemFragmentComposer):
def compose(self, path): def compose(self, path):
return ['RPCGen', 'files', ('default', None)], [path] return ['RPCGen', 'files', ('default', None)], [path]
class RouteKeywordsFragmentComposer(BuildSystemFragmentComposer):
class RouteKeywordsFragmentComposer(BuildSystemFragmentComposer):
def compose(self, path): def compose(self, path):
return ['RouteKeywords', 'files', ('default', None)], [path] return ['RouteKeywords', 'files', ('default', None)], [path]
class LexFragmentComposer(BuildSystemFragmentComposer):
class LexFragmentComposer(BuildSystemFragmentComposer):
def __init__(self, sym, dep, cflags=None, includes=None, build=True): def __init__(self, sym, dep, cflags=None, includes=None, build=True):
self.sym = sym self.sym = sym
self.dep = dep self.dep = dep
@ -586,18 +683,20 @@ class LexFragmentComposer(BuildSystemFragmentComposer):
self.build = build self.build = build
def compose(self, path): def compose(self, path):
d = { 'file': path, d = {
'file': path,
'sym': self.sym, 'sym': self.sym,
'dep': self.dep, 'dep': self.dep,
'build': self.build } 'build': self.build
}
if None not in self.cflags: if None not in self.cflags:
d['cflags'] = self.cflags d['cflags'] = self.cflags
if None not in self.includes: if None not in self.includes:
d['includes'] = self.includes d['includes'] = self.includes
return ['lex', path, ('default', None)], d return ['lex', path, ('default', None)], d
class YaccFragmentComposer(BuildSystemFragmentComposer):
class YaccFragmentComposer(BuildSystemFragmentComposer):
def __init__(self, sym, header, cflags=None, includes=None, build=True): def __init__(self, sym, header, cflags=None, includes=None, build=True):
self.sym = sym self.sym = sym
self.header = header self.header = header
@ -605,22 +704,25 @@ class YaccFragmentComposer(BuildSystemFragmentComposer):
self.build = build self.build = build
def compose(self, path): def compose(self, path):
d = { 'file': path, d = {
'file': path,
'sym': self.sym, 'sym': self.sym,
'header': self.header, 'header': self.header,
'build': self.build } 'build': self.build
}
if None not in self.cflags: if None not in self.cflags:
d['cflags'] = self.cflags d['cflags'] = self.cflags
if None not in self.includes: if None not in self.includes:
d['includes'] = self.includes d['includes'] = self.includes
return ['yacc', path, ('default', None)], d return ['yacc', path, ('default', None)], d
# #
# File - a file in the source we move backwards and forwards. # File - a file in the source we move backwards and forwards.
# #
class File(object): class File(object):
def __init__(self, path, pathComposer, def __init__(self, path, pathComposer, forwardConverter, reverseConverter,
forwardConverter, reverseConverter, buildSystemComposer): buildSystemComposer):
if verbose(verboseMoreDetail): if verbose(verboseMoreDetail):
print("FILE: %-50s F:%-45s R:%-45s" % \ print("FILE: %-50s F:%-45s R:%-45s" % \
(path, (path,
@ -629,7 +731,8 @@ class File(object):
self.path = path self.path = path
self.pathComposer = pathComposer self.pathComposer = pathComposer
self.originPath = self.pathComposer.composeOriginPath(self.path) self.originPath = self.pathComposer.composeOriginPath(self.path)
self.libbsdPath = self.pathComposer.composeLibBSDPath(self.path, LIBBSD_DIR) self.libbsdPath = self.pathComposer.composeLibBSDPath(
self.path, LIBBSD_DIR)
self.forwardConverter = forwardConverter self.forwardConverter = forwardConverter
self.reverseConverter = reverseConverter self.reverseConverter = reverseConverter
self.buildSystemComposer = buildSystemComposer self.buildSystemComposer = buildSystemComposer
@ -637,7 +740,8 @@ class File(object):
def processSource(self, forward): def processSource(self, forward):
if forward: if forward:
if verbose(verboseDetail): if verbose(verboseDetail):
print("process source: %s => %s" % (self.originPath, self.libbsdPath)) print("process source: %s => %s" %
(self.originPath, self.libbsdPath))
self.forwardConverter.convert(self.originPath, self.libbsdPath) self.forwardConverter.convert(self.originPath, self.libbsdPath)
else: else:
if verbose(verboseDetail): if verbose(verboseDetail):
@ -646,7 +750,9 @@ class File(object):
self.reverseConverter.convert(self.libbsdPath, self.originPath) self.reverseConverter.convert(self.libbsdPath, self.originPath)
def getFragment(self): def getFragment(self):
return self.buildSystemComposer.compose(self.pathComposer.composeLibBSDPath(self.path, '')) return self.buildSystemComposer.compose(
self.pathComposer.composeLibBSDPath(self.path, ''))
# #
# Module - logical group of related files we can perform actions on # Module - logical group of related files we can perform actions on
@ -673,7 +779,9 @@ class Module(object):
for f in files: for f in files:
f.processSource(direction) f.processSource(direction)
def addFiles(self, newFiles, buildSystemComposer = BuildSystemFragmentComposer()): def addFiles(self,
newFiles,
buildSystemComposer=BuildSystemFragmentComposer()):
files = [] files = []
for newFile in newFiles: for newFile in newFiles:
assertFile(newFile) assertFile(newFile)
@ -683,14 +791,20 @@ class Module(object):
def addFile(self, f): def addFile(self, f):
self.files += [f] self.files += [f]
def addFiles(self, newFiles, def addFiles(self,
pathComposer, forwardConverter, reverseConverter, newFiles,
assertFile, buildSystemComposer = BuildSystemFragmentComposer()): pathComposer,
forwardConverter,
reverseConverter,
assertFile,
buildSystemComposer=BuildSystemFragmentComposer()):
files = [] files = []
for newFile in newFiles: for newFile in newFiles:
assertFile(newFile) assertFile(newFile)
files += [File(newFile, pathComposer, forwardConverter, files += [
reverseConverter, buildSystemComposer)] File(newFile, pathComposer, forwardConverter, reverseConverter,
buildSystemComposer)
]
return files return files
def addPlainTextFile(self, files): def addPlainTextFile(self, files):
@ -699,71 +813,75 @@ class Module(object):
Converter(), assertNothing) Converter(), assertNothing)
def addKernelSpaceHeaderFiles(self, files): def addKernelSpaceHeaderFiles(self, files):
self.files += self.addFiles(files, self.files += self.addFiles(files, FreeBSDPathComposer(),
FreeBSDPathComposer(), FromFreeBSDToRTEMSHeaderConverter(), FromFreeBSDToRTEMSHeaderConverter(),
FromRTEMSToFreeBSDHeaderConverter(), assertHeaderOrSourceFile) FromRTEMSToFreeBSDHeaderConverter(),
assertHeaderOrSourceFile)
def addUserSpaceHeaderFiles(self, files): def addUserSpaceHeaderFiles(self, files):
self.files += self.addFiles(files, self.files += self.addFiles(
FreeBSDPathComposer(), FromFreeBSDToRTEMSUserSpaceHeaderConverter(), files, FreeBSDPathComposer(),
FromFreeBSDToRTEMSUserSpaceHeaderConverter(),
FromRTEMSToFreeBSDHeaderConverter(), assertHeaderFile) FromRTEMSToFreeBSDHeaderConverter(), assertHeaderFile)
def addRTEMSHeaderFiles(self, files): def addRTEMSHeaderFiles(self, files):
self.files += self.addFiles(files, RTEMSPathComposer(), self.files += self.addFiles(files, RTEMSPathComposer(), NoConverter(),
NoConverter(), NoConverter(), assertHeaderFile) NoConverter(), assertHeaderFile)
def addLinuxHeaderFiles(self, files): def addLinuxHeaderFiles(self, files):
self.files += self.addFiles(files, self.files += self.addFiles(files, PathComposer(), NoConverter(),
PathComposer(), NoConverter(),
NoConverter(), assertHeaderFile) NoConverter(), assertHeaderFile)
def addCPUDependentFreeBSDHeaderFiles(self, files): def addCPUDependentFreeBSDHeaderFiles(self, files):
self.files += self.addFiles(files, self.files += self.addFiles(files, CPUDependentFreeBSDPathComposer(),
CPUDependentFreeBSDPathComposer(), FromFreeBSDToRTEMSHeaderConverter(), FromFreeBSDToRTEMSHeaderConverter(),
FromRTEMSToFreeBSDHeaderConverter(), assertHeaderFile) FromRTEMSToFreeBSDHeaderConverter(),
assertHeaderFile)
def addCPUDependentLinuxHeaderFiles(self, files): def addCPUDependentLinuxHeaderFiles(self, files):
self.files += self.addFiles(files, self.files += self.addFiles(files, CPUDependentLinuxPathComposer(),
CPUDependentLinuxPathComposer(), NoConverter(), NoConverter(), NoConverter(),
NoConverter(), assertHeaderFile) assertHeaderFile)
def addTargetSourceCPUDependentHeaderFiles(self, targetCPUs, sourceCPU, files): def addTargetSourceCPUDependentHeaderFiles(self, targetCPUs, sourceCPU,
files):
for cpu in targetCPUs: for cpu in targetCPUs:
self.files += self.addFiles(files, self.files += self.addFiles(
TargetSourceCPUDependentPathComposer(cpu, sourceCPU), files, TargetSourceCPUDependentPathComposer(cpu, sourceCPU),
FromFreeBSDToRTEMSHeaderConverter(), FromFreeBSDToRTEMSHeaderConverter(), NoConverter(),
NoConverter(), assertHeaderFile) assertHeaderFile)
def addSourceFiles(self, files, sourceFileFragmentComposer): def addSourceFiles(self, files, sourceFileFragmentComposer):
self.files += self.addFiles(files, self.files += self.addFiles(files, PathComposer(), NoConverter(),
PathComposer(), NoConverter(), NoConverter(), assertSourceFile, NoConverter(), assertSourceFile,
sourceFileFragmentComposer) sourceFileFragmentComposer)
def addKernelSpaceSourceFiles(self, files, sourceFileFragmentComposer): def addKernelSpaceSourceFiles(self, files, sourceFileFragmentComposer):
self.files += self.addFiles(files, self.files += self.addFiles(files, FreeBSDPathComposer(),
FreeBSDPathComposer(), FromFreeBSDToRTEMSSourceConverter(), FromFreeBSDToRTEMSSourceConverter(),
FromRTEMSToFreeBSDSourceConverter(), assertSourceFile, FromRTEMSToFreeBSDSourceConverter(),
assertSourceFile,
sourceFileFragmentComposer) sourceFileFragmentComposer)
def addUserSpaceSourceFiles(self, files, sourceFileFragmentComposer): def addUserSpaceSourceFiles(self, files, sourceFileFragmentComposer):
self.files += self.addFiles(files, self.files += self.addFiles(
FreeBSDPathComposer(), files, FreeBSDPathComposer(),
FromFreeBSDToRTEMSUserSpaceSourceConverter(), FromFreeBSDToRTEMSUserSpaceSourceConverter(),
FromRTEMSToFreeBSDSourceConverter(), assertSourceFile, FromRTEMSToFreeBSDSourceConverter(), assertSourceFile,
sourceFileFragmentComposer) sourceFileFragmentComposer)
def addRTEMSSourceFiles(self, files, sourceFileFragmentComposer): def addRTEMSSourceFiles(self, files, sourceFileFragmentComposer):
self.files += self.addFiles(files, self.files += self.addFiles(files, RTEMSPathComposer(), NoConverter(),
RTEMSPathComposer(), NoConverter(), NoConverter(),
assertSourceFile, sourceFileFragmentComposer)
def addLinuxSourceFiles(self, files, sourceFileFragmentComposer):
self.files += self.addFiles(files,
PathComposer(), NoConverter(),
NoConverter(), assertSourceFile, NoConverter(), assertSourceFile,
sourceFileFragmentComposer) sourceFileFragmentComposer)
def addCPUDependentFreeBSDSourceFiles(self, cpus, files, sourceFileFragmentComposer): def addLinuxSourceFiles(self, files, sourceFileFragmentComposer):
self.files += self.addFiles(files, PathComposer(), NoConverter(),
NoConverter(), assertSourceFile,
sourceFileFragmentComposer)
def addCPUDependentFreeBSDSourceFiles(self, cpus, files,
sourceFileFragmentComposer):
for cpu in cpus: for cpu in cpus:
self.initCPUDependencies(cpu) self.initCPUDependencies(cpu)
self.cpuDependentSourceFiles[cpu] += \ self.cpuDependentSourceFiles[cpu] += \
@ -772,7 +890,8 @@ class Module(object):
FromRTEMSToFreeBSDSourceConverter(), assertSourceFile, FromRTEMSToFreeBSDSourceConverter(), assertSourceFile,
sourceFileFragmentComposer) sourceFileFragmentComposer)
def addCPUDependentRTEMSSourceFiles(self, cpus, files, sourceFileFragmentComposer): def addCPUDependentRTEMSSourceFiles(self, cpus, files,
sourceFileFragmentComposer):
for cpu in cpus: for cpu in cpus:
self.initCPUDependencies(cpu) self.initCPUDependencies(cpu)
self.cpuDependentSourceFiles[cpu] += \ self.cpuDependentSourceFiles[cpu] += \
@ -781,7 +900,8 @@ class Module(object):
NoConverter(), assertSourceFile, NoConverter(), assertSourceFile,
sourceFileFragmentComposer) sourceFileFragmentComposer)
def addCPUDependentLinuxSourceFiles(self, cpus, files, sourceFileFragmentComposer): def addCPUDependentLinuxSourceFiles(self, cpus, files,
sourceFileFragmentComposer):
for cpu in cpus: for cpu in cpus:
self.initCPUDependencies(cpu) self.initCPUDependencies(cpu)
self.cpuDependentSourceFiles[cpu] += \ self.cpuDependentSourceFiles[cpu] += \
@ -791,13 +911,15 @@ class Module(object):
sourceFileFragmentComposer) sourceFileFragmentComposer)
def addTest(self, testFragementComposer): def addTest(self, testFragementComposer):
self.files += [File(testFragementComposer.testName, self.files += [
PathComposer(), NoConverter(), NoConverter(), File(testFragementComposer.testName, PathComposer(), NoConverter(),
testFragementComposer)] NoConverter(), testFragementComposer)
]
def addDependency(self, dep): def addDependency(self, dep):
self.dependencies += [dep] self.dependencies += [dep]
# #
# Manager - a collection of modules. # Manager - a collection of modules.
# #
@ -858,9 +980,12 @@ class ModuleManager(object):
def setGenerators(self): def setGenerators(self):
self.generator['convert'] = Converter self.generator['convert'] = Converter
self.generator['no-convert'] = NoConverter self.generator['no-convert'] = NoConverter
self.generator['from-FreeBSD-to-RTEMS-UserSpaceSourceConverter'] = FromFreeBSDToRTEMSUserSpaceSourceConverter self.generator[
self.generator['from-RTEMS-To-FreeBSD-SourceConverter'] = FromRTEMSToFreeBSDSourceConverter 'from-FreeBSD-to-RTEMS-UserSpaceSourceConverter'] = FromFreeBSDToRTEMSUserSpaceSourceConverter
self.generator['buildSystemFragmentComposer'] = BuildSystemFragmentComposer self.generator[
'from-RTEMS-To-FreeBSD-SourceConverter'] = FromRTEMSToFreeBSDSourceConverter
self.generator[
'buildSystemFragmentComposer'] = BuildSystemFragmentComposer
self.generator['file'] = File self.generator['file'] = File
@ -868,7 +993,8 @@ class ModuleManager(object):
self.generator['freebsd-path'] = FreeBSDPathComposer self.generator['freebsd-path'] = FreeBSDPathComposer
self.generator['rtems-path'] = RTEMSPathComposer self.generator['rtems-path'] = RTEMSPathComposer
self.generator['cpu-path'] = CPUDependentFreeBSDPathComposer self.generator['cpu-path'] = CPUDependentFreeBSDPathComposer
self.generator['target-src-cpu--path'] = TargetSourceCPUDependentPathComposer self.generator[
'target-src-cpu--path'] = TargetSourceCPUDependentPathComposer
self.generator['source'] = SourceFileFragmentComposer self.generator['source'] = SourceFileFragmentComposer
self.generator['test'] = TestFragementComposer self.generator['test'] = TestFragementComposer

View File

@ -1,7 +1,10 @@
# SPDX-License-Identifier: BSD-2-Clause
'''LibBSD build configuration to waf integration module.
'''
# Copyright (c) 2015, 2020 Chris Johns <chrisj@rtems.org>. All rights reserved.
# #
# Copyright (c) 2015-2018 Chris Johns <chrisj@rtems.org>. All rights reserved. # Copyright (c) 2009, 2015 embedded brains GmbH. All rights reserved.
#
# Copyright (c) 2009-2015 embedded brains GmbH. All rights reserved.
# #
# embedded brains GmbH # embedded brains GmbH
# Dornierstr. 4 # Dornierstr. 4
@ -20,19 +23,20 @@
# notice, this list of conditions and the following disclaimer in the # notice, this list of conditions and the following disclaimer in the
# documentation and/or other materials provided with the distribution. # documentation and/or other materials provided with the distribution.
# #
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT # ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, # LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT # CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, # SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY # INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT # CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # POSSIBILITY OF SUCH DAMAGE.
from __future__ import print_function from __future__ import print_function
# Python 3 does no longer know the basestring class. Catch that. # Python 3 does no longer know the basestring class. Catch that.
try: try:
basestring basestring
@ -55,11 +59,11 @@ if windows:
else: else:
host_shell = '' host_shell = ''
# #
# The waf builder for libbsd. # The waf builder for libbsd.
# #
class Builder(builder.ModuleManager): class Builder(builder.ModuleManager):
def __init__(self, trace=False): def __init__(self, trace=False):
super(Builder, self).__init__() super(Builder, self).__init__()
self.trace = trace self.trace = trace
@ -82,7 +86,6 @@ class Builder(builder.ModuleManager):
return sources return sources
def generate(self, rtems_version): def generate(self, rtems_version):
def _dataInsert(data, cpu, frag): def _dataInsert(data, cpu, frag):
# #
# The default handler returns an empty string. Skip it. # The default handler returns an empty string. Skip it.
@ -169,7 +172,6 @@ class Builder(builder.ModuleManager):
else: else:
bld.fatal('invalid config test: %s' % (configTest)) bld.fatal('invalid config test: %s' % (configTest))
def build(self, bld): def build(self, bld):
# #
# Localize the config. # Localize the config.
@ -231,16 +233,17 @@ class Builder(builder.ModuleManager):
# Network test configuration # Network test configuration
# #
if not os.path.exists(bld.env.NET_CONFIG): if not os.path.exists(bld.env.NET_CONFIG):
bld.fatal('network configuraiton \'%s\' not found' % (bld.env.NET_CONFIG)) bld.fatal('network configuraiton \'%s\' not found' %
tags = [ 'NET_CFG_INTERFACE_0', (bld.env.NET_CONFIG))
'NET_CFG_SELF_IP', tags = [
'NET_CFG_NETMASK', 'NET_CFG_INTERFACE_0', 'NET_CFG_SELF_IP', 'NET_CFG_NETMASK',
'NET_CFG_PEER_IP', 'NET_CFG_PEER_IP', 'NET_CFG_GATEWAY_IP'
'NET_CFG_GATEWAY_IP' ] ]
try: try:
net_cfg_lines = open(bld.env.NET_CONFIG).readlines() net_cfg_lines = open(bld.env.NET_CONFIG).readlines()
except: except:
bld.fatal('network configuraiton \'%s\' read failed' % (bld.env.NET_CONFIG)) bld.fatal('network configuraiton \'%s\' read failed' %
(bld.env.NET_CONFIG))
lc = 0 lc = 0
sed = 'sed ' sed = 'sed '
for l in net_cfg_lines: for l in net_cfg_lines:
@ -266,7 +269,8 @@ class Builder(builder.ModuleManager):
# #
if 'header-paths' in config: if 'header-paths' in config:
header_build_copy_paths = [ header_build_copy_paths = [
hp for hp in config['header-paths'] if hp[2] != '' and not hp[0].endswith(hp[2]) hp for hp in config['header-paths']
if hp[2] != '' and not hp[0].endswith(hp[2])
] ]
for headers in header_build_copy_paths: for headers in header_build_copy_paths:
target = os.path.join(buildinclude, headers[2]) target = os.path.join(buildinclude, headers[2])
@ -296,6 +300,7 @@ class Builder(builder.ModuleManager):
output += '#define RTEMS_BSD_MODULE_{} 1\n'.format(modname) output += '#define RTEMS_BSD_MODULE_{} 1\n'.format(modname)
output += '#endif /* RTEMS_BSD_MODULES_H */\n' output += '#endif /* RTEMS_BSD_MODULES_H */\n'
self.outputs[0].write(output) self.outputs[0].write(output)
modules_h_file_with_path = os.path.join(buildinclude, modules_h_file_with_path = os.path.join(buildinclude,
module_header_path, module_header_path,
module_header_name) module_header_name)
@ -351,9 +356,7 @@ class Builder(builder.ModuleManager):
"awk 'BEGIN { r = 0 } { if (NF == 1) " + \ "awk 'BEGIN { r = 0 } { if (NF == 1) " + \
"printf \"#define\\tK_%%s\\t%%d\\n\\t{\\\"%%s\\\", K_%%s},\\n\", " + \ "printf \"#define\\tK_%%s\\t%%d\\n\\t{\\\"%%s\\\", K_%%s},\\n\", " + \
"toupper($1), ++r, $1, toupper($1)}' > ${TGT}" "toupper($1), ++r, $1, toupper($1)}' > ${TGT}"
bld(target = rkwname + '.h', bld(target=rkwname + '.h', source=rkwname, rule=rkw_rule)
source = rkwname,
rule = rkw_rule)
# #
# Lex # Lex
@ -397,7 +400,8 @@ class Builder(builder.ModuleManager):
yaccSym = yacc['sym'] yaccSym = yacc['sym']
else: else:
yaccSym = os.path.basename(yaccFile)[:-2] yaccSym = os.path.basename(yaccFile)[:-2]
yaccHeader = '%s/%s' % (os.path.dirname(yaccFile), yacc['header']) yaccHeader = '%s/%s' % (os.path.dirname(yaccFile),
yacc['header'])
if 'cflags' in yacc: if 'cflags' in yacc:
yaccDefines = [d[2:] for d in yacc['cflags']] yaccDefines = [d[2:] for d in yacc['cflags']]
else: else:
@ -408,7 +412,8 @@ class Builder(builder.ModuleManager):
yaccIncludes = [] yaccIncludes = []
yacc_rule = host_shell + '${YACC} -b ' + yaccSym + \ yacc_rule = host_shell + '${YACC} -b ' + yaccSym + \
' -d -p ' + yaccSym + ' ${SRC} && ' + \ ' -d -p ' + yaccSym + ' ${SRC} && ' + \
'sed -e \'/YY_BUF_SIZE/s/16384/1024/\' < ' + yaccSym + '.tab.c > ${TGT} && ' + \ 'sed -e \'/YY_BUF_SIZE/s/16384/1024/\' < ' + \
yaccSym + '.tab.c > ${TGT} && ' + \
'rm -f ' + yaccSym + '.tab.c && mv ' + yaccSym + '.tab.h ' + yaccHeader 'rm -f ' + yaccSym + '.tab.c && mv ' + yaccSym + '.tab.h ' + yaccHeader
if bld.env.AUTO_REGEN: if bld.env.AUTO_REGEN:
bld(target=yaccFile[:-2] + '.c', bld(target=yaccFile[:-2] + '.c',

76
wscript
View File

@ -1,6 +1,10 @@
# # SPDX-License-Identifier: BSD-2-Clause
# RTEMS Project (https://www.rtems.org/) '''RTEMS LibBSD is a transparent source build of the FreeBSD kernel
# source for RTEMS.
To use see README.waf shipped with this file.
'''
# Copyright (c) 2015-2016 Chris Johns <chrisj@rtems.org>. All rights reserved. # Copyright (c) 2015-2016 Chris Johns <chrisj@rtems.org>. All rights reserved.
# #
# Redistribution and use in source and binary forms, with or without # Redistribution and use in source and binary forms, with or without
@ -12,17 +16,17 @@
# notice, this list of conditions and the following disclaimer in the # notice, this list of conditions and the following disclaimer in the
# documentation and/or other materials provided with the distribution. # documentation and/or other materials provided with the distribution.
# #
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT # ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, # LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT # CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, # SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY # INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT # CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # POSSIBILITY OF SUCH DAMAGE.
# #
# RTEMS LibBSD is a transparent source build of the FreeBSD kernel source for RTEMS. # RTEMS LibBSD is a transparent source build of the FreeBSD kernel source for RTEMS.
@ -57,6 +61,7 @@ builders = {}
BUILDSET_DIR = "buildset" BUILDSET_DIR = "buildset"
BUILDSET_DEFAULT = "buildset/default.ini" BUILDSET_DEFAULT = "buildset/default.ini"
def load_ini(conf, f): def load_ini(conf, f):
ini = configparser.ConfigParser() ini = configparser.ConfigParser()
ini.read(f) ini.read(f)
@ -73,8 +78,9 @@ def load_ini(conf, f):
elif os.path.isfile(os.path.join(BUILDSET_DIR, extends)): elif os.path.isfile(os.path.join(BUILDSET_DIR, extends)):
extendfile = os.path.join(BUILDSET_DIR, extends) extendfile = os.path.join(BUILDSET_DIR, extends)
else: else:
conf.fatal("'{}': Invalid file given for general/extends:'{}'" conf.fatal(
.format(f, extends)) "'{}': Invalid file given for general/extends:'{}'".format(
f, extends))
base = load_ini(conf, extendfile) base = load_ini(conf, extendfile)
for s in ini.sections(): for s in ini.sections():
if not base.has_section(s): if not base.has_section(s):
@ -85,6 +91,7 @@ def load_ini(conf, f):
ini = base ini = base
return ini return ini
def load_config(conf, f): def load_config(conf, f):
ini = load_ini(conf, f) ini = load_ini(conf, f)
config = {} config = {}
@ -100,6 +107,7 @@ def load_config(conf, f):
config['modules-enabled'].append(mod) config['modules-enabled'].append(mod)
return config return config
def update_builders(ctx, buildset_opt): def update_builders(ctx, buildset_opt):
global builders global builders
builders = {} builders = {}
@ -125,6 +133,7 @@ def update_builders(ctx, buildset_opt):
builder.generate(rtems_version) builder.generate(rtems_version)
builders[bsname] = builder builders[bsname] = builder
def bsp_init(ctx, env, contexts): def bsp_init(ctx, env, contexts):
# This function generates the builders and adds build-xxx, clean-xxx and # This function generates the builders and adds build-xxx, clean-xxx and
# install-xxx targets for them. # install-xxx targets for them.
@ -143,6 +152,7 @@ def bsp_init(ctx, env, contexts):
for y in contexts: for y in contexts:
newcmd = y.cmd + '-' + builder newcmd = y.cmd + '-' + builder
newvariant = y.variant + '-' + builder newvariant = y.variant + '-' + builder
class context(y): class context(y):
cmd = str(newcmd) cmd = str(newcmd)
variant = str(newvariant) variant = str(newvariant)
@ -158,10 +168,14 @@ def bsp_init(ctx, env, contexts):
commands += [str(cmd)] commands += [str(cmd)]
waflib.Options.commands = commands waflib.Options.commands = commands
def init(ctx): def init(ctx):
rtems.init(ctx, version = rtems_version, long_commands = True, rtems.init(ctx,
version=rtems_version,
long_commands=True,
bsp_init=bsp_init) bsp_init=bsp_init)
def options(opt): def options(opt):
rtems.options(opt) rtems.options(opt)
opt.add_option("--enable-auto-regen", opt.add_option("--enable-auto-regen",
@ -183,24 +197,37 @@ def options(opt):
default="", default="",
dest="freebsd_options", dest="freebsd_options",
help="Set FreeBSD options (developer option).") help="Set FreeBSD options (developer option).")
opt.add_option("--optimization", opt.add_option(
"--optimization",
action="store", action="store",
default="2", default="2",
dest="optimization", dest="optimization",
help = "Set optimization level to OPTIMIZATION (-On compiler flag). Default is 2 (-O2).") help=
opt.add_option("--buildset", "Set optimization level to OPTIMIZATION (-On compiler flag). Default is 2 (-O2)."
)
opt.add_option(
"--buildset",
action="append", action="append",
default=[], default=[],
dest="buildset", dest="buildset",
help = "Select build sets to build. If set to a directory, all .ini file in this directory will be used.") help=
"Select build sets to build. If set to a directory," \
" all .ini file in this directory will be used."
)
def bsp_configure(conf, arch_bsp): def bsp_configure(conf, arch_bsp):
conf.check(header_name="dlfcn.h", features="c") conf.check(header_name="dlfcn.h", features="c")
conf.check(header_name="rtems/pci.h", features="c", mandatory=False) conf.check(header_name="rtems/pci.h", features="c", mandatory=False)
if not rtems.check_posix(conf): if not rtems.check_posix(conf):
conf.fatal("RTEMS kernel POSIX support is disabled; configure RTEMS with --enable-posix") conf.fatal(
"RTEMS kernel POSIX support is disabled; configure RTEMS with --enable-posix"
)
if rtems.check_networking(conf): if rtems.check_networking(conf):
conf.fatal("RTEMS kernel contains the old network support; configure RTEMS with --disable-networking") conf.fatal(
"RTEMS kernel contains the old network support;" \
" configure RTEMS with --disable-networking"
)
env = conf.env.derive() env = conf.env.derive()
for builder in builders: for builder in builders:
ab = conf.env.RTEMS_ARCH_BSP ab = conf.env.RTEMS_ARCH_BSP
@ -210,6 +237,7 @@ def bsp_configure(conf, arch_bsp):
builders[builder].bsp_configure(conf, arch_bsp) builders[builder].bsp_configure(conf, arch_bsp)
conf.setenv(ab) conf.setenv(ab)
def configure(conf): def configure(conf):
if conf.options.auto_regen: if conf.options.auto_regen:
conf.find_program("lex", mandatory=True) conf.find_program("lex", mandatory=True)
@ -226,9 +254,11 @@ def configure(conf):
update_builders(conf, conf.env.BUILDSET) update_builders(conf, conf.env.BUILDSET)
rtems.configure(conf, bsp_configure) rtems.configure(conf, bsp_configure)
def test(bld): def test(bld):
rtems.test_uninstall(bld) rtems.test_uninstall(bld)
def build(bld): def build(bld):
rtems.build(bld) rtems.build(bld)
builders[bld.libbsd_buildset_name].build(bld) builders[bld.libbsd_buildset_name].build(bld)