From 533808975e5a2e33a84d2cbc38d5b6b2c790f3f7 Mon Sep 17 00:00:00 2001 From: Chris Johns Date: Wed, 4 May 2016 16:24:11 +1000 Subject: Fix coding to be CamelCase. --- builder.py | 72 +++++++++++++++---------------- freebsd-to-rtems.py | 8 ++-- waf_generator.py | 122 ++++++++++++++++++++++++++-------------------------- 3 files changed, 101 insertions(+), 101 deletions(-) diff --git a/builder.py b/builder.py index f380ba9d..aa5d4095 100755 --- a/builder.py +++ b/builder.py @@ -71,7 +71,7 @@ def changedFileSummary(): for f in sorted(filesProcessed): print(' %s' % (f)) -def read_file(name): +def readFile(name): try: contents = codecs.open(name, mode = 'r', encoding = 'utf-8', errors = 'ignore').read() except UnicodeDecodeError as ude: @@ -79,13 +79,13 @@ def read_file(name): sys.exit(1) return contents -def write_file(name, contents): +def writeFile(name, contents): path = os.path.dirname(name) if not os.path.exists(path): try: os.makedirs(path) except OSError as oe: - print('error: cannot create directory: %s: %s' % (dst_path, oe)) + print('error: cannot create directory: %s: %s' % (path, oe)) sys.exit(1) try: codecs.open(name, mode = 'w', encoding = 'utf-8', errors = 'ignore').write(contents) @@ -108,18 +108,18 @@ class error(Exception): # # This stuff needs to move to libbsd.py. # -def common_flags(): +def commonFlags(): return ['-O2', '-g', '-fno-strict-aliasing', '-ffreestanding', '-fno-common'] -def common_warnings(): +def commonWarnings(): return ['-Wall', '-Wno-format'] -def common_no_warnings(): +def commonNoWarnings(): return ['-w'] def includes(): @@ -142,7 +142,7 @@ def includes(): '-ImDNSResponder/mDNSPosix', '-Itestsuite/include'] -def cpu_includes(): +def cpuIncludes(): return ['-Irtemsbsd/@CPU@/include', '-Ifreebsd/sys/@CPU@/include'] @@ -152,7 +152,7 @@ def cflags(): def cxxflags(): return ['-std=gnu++11'] -def header_paths(): +def headerPaths(): # local path wildcard dest path return [('rtemsbsd/include', '*.h', ''), ('rtemsbsd/mghttpd', 'mongoose.h', 'mghttpd'), @@ -232,21 +232,21 @@ def assertSourceFile(path): # class Converter(object): - def convert(self, src, dst, has_source = True, source_filter = None, src_contents = None): + def convert(self, src, dst, hasSource = True, sourceFilter = None, srcContents = None): global filesProcessed, filesProcessedCount if verbose(verboseDebug): print("convert: filter:%s: %s -> %s" % \ - (['yes', 'no'][source_filter is None], src, dst)) + (['yes', 'no'][sourceFilter is None], src, dst)) # # If there is no source raise an error if we expect source else print a # warning and do not try and convert. # - if src_contents is None: + if srcContents is None: if not os.path.exists(src): - if has_source: + if hasSource: raise error('source not found: %s' % (src)) else: print('warning: no source: %s' % (src)) @@ -255,35 +255,35 @@ class Converter(object): # # Files read as a single string if not passed in. # - src_contents = read_file(src) + srcContents = readFile(src) if os.path.exists(dst): - dst_contents = read_file(dst) + dstContents = readFile(dst) else: print('warning: no destination: %s' % (dst)) - dst_contents = '' + dstContents = '' # # Filter the source. # - if source_filter is not None: - src_contents = source_filter(src_contents) + if sourceFilter is not None: + srcContents = sourceFilter(srcContents) # # Split into a list of lines. # - src_lines = src_contents.split(os.linesep) - dst_lines = dst_contents.split(os.linesep) + srcLines = srcContents.split(os.linesep) + dstLines = dstContents.split(os.linesep) if verbose(verboseDebug): - print('Unified diff: %s (lines:%d)' % (src, len(src_lines))) + print('Unified diff: %s (lines:%d)' % (src, len(srcLines))) # # Diff, note there is no line termination on each string. Expand the # generator to list because the generator is not reusable. # - diff = list(difflib.unified_diff(dst_lines, - src_lines, + diff = list(difflib.unified_diff(dstLines, + srcLines, fromfile = src, tofile = dst, n = 5, @@ -303,37 +303,37 @@ class Converter(object): if verbose(verboseDetail): print("UPDATE: %s -> %s" % (src, dst)) if isDryRun == False: - write_file(dst, src_contents) + writeFile(dst, srcContents) else: print("diff -u %s %s" % (src, dst)) for l in diff: print(l) class NoConverter(Converter): - def convert(self, src, dst, has_source = True, source_filter = None): + def convert(self, src, dst, hasSource = True, sourceFilter = None): return '/* EMPTY */\n' class FromFreeBSDToRTEMSHeaderConverter(Converter): - def source_filter(self, data): + def sourceFilter(self, data): data = fixLocalIncludes(data) data = fixIncludes(data) return data def convert(self, src, dst): sconverter = super(FromFreeBSDToRTEMSHeaderConverter, self) - sconverter.convert(src, dst, source_filter = self.source_filter) + sconverter.convert(src, dst, sourceFilter = self.sourceFilter) class FromFreeBSDToRTEMSUserSpaceHeaderConverter(Converter): - def source_filter(self, data): + def sourceFilter(self, data): data = fixIncludes(data) return data def convert(self, src, dst): sconverter = super(FromFreeBSDToRTEMSUserSpaceHeaderConverter, self) - sconverter.convert(src, dst, source_filter = self.source_filter) + sconverter.convert(src, dst, sourceFilter = self.sourceFilter) class FromFreeBSDToRTEMSSourceConverter(Converter): - def source_filter(self, data): + def sourceFilter(self, data): data = fixLocalIncludes(data) data = fixIncludes(data) data = '#include \n\n' + data @@ -341,37 +341,37 @@ class FromFreeBSDToRTEMSSourceConverter(Converter): def convert(self, src, dst): sconverter = super(FromFreeBSDToRTEMSSourceConverter, self) - sconverter.convert(src, dst, source_filter = self.source_filter) + sconverter.convert(src, dst, sourceFilter = self.sourceFilter) class FromFreeBSDToRTEMSUserSpaceSourceConverter(Converter): - def source_filter(self, data): + def sourceFilter(self, data): data = fixIncludes(data) data = '#include \n\n' + data return data def convert(self, src, dst): sconverter = super(FromFreeBSDToRTEMSUserSpaceSourceConverter, self) - sconverter.convert(src, dst, source_filter = self.source_filter) + sconverter.convert(src, dst, sourceFilter = self.sourceFilter) class FromRTEMSToFreeBSDHeaderConverter(Converter): - def source_filter(self, data): + def sourceFilter(self, data): data = revertFixLocalIncludes(data) data = revertFixIncludes(data) return data def convert(self, src, dst): sconverter = super(FromRTEMSToFreeBSDHeaderConverter, self) - sconverter.convert(src, dst, has_source = False, source_filter = self.source_filter) + sconverter.convert(src, dst, hasSource = False, sourceFilter = self.sourceFilter) class FromRTEMSToFreeBSDSourceConverter(Converter): - def source_filter(self, data): + def sourceFilter(self, data): data = re.sub('#include \n\n', '', data) data = re.sub('#include \n\n', '', data) return data def convert(self, src, dst): sconverter = super(FromRTEMSToFreeBSDSourceConverter, self) - sconverter.convert(src, dst, has_source = False, source_filter = self.source_filter) + sconverter.convert(src, dst, hasSource = False, sourceFilter = self.sourceFilter) # # Compose a path based for the various parts of the source tree. diff --git a/freebsd-to-rtems.py b/freebsd-to-rtems.py index 6e6af263..df7bbcaf 100755 --- a/freebsd-to-rtems.py +++ b/freebsd-to-rtems.py @@ -147,11 +147,11 @@ if isEarlyExit == True: sys.exit(0) try: - waf_gen = waf_generator.ModuleManager() - libbsd.sources(waf_gen) + wafGen = waf_generator.ModuleManager() + libbsd.sources(wafGen) if not isOnlyBuildScripts: - waf_gen.processSource(isForward) - waf_gen.generate(libbsd.rtems_version()) + wafGen.processSource(isForward) + wafGen.generate(libbsd.rtems_version()) builder.changedFileSummary() except IOError as ioe: print('error: %s' % (str(ioe))) diff --git a/waf_generator.py b/waf_generator.py index dfc893cd..12895a76 100755 --- a/waf_generator.py +++ b/waf_generator.py @@ -44,14 +44,14 @@ trace = False data = { } -def _add_files(name, files): +def _addFiles(name, files): if type(files) is not list: files = [files] if name not in data: data[name] = [] data[name] += files -def _clfags_includes(cflags, includes): +def _cflagsIncludes(cflags, includes): if type(cflags) is not list: if cflags is not None: _cflags = cflags.split(' ') @@ -68,7 +68,7 @@ def _clfags_includes(cflags, includes): class SourceFileFragmentComposer(builder.BuildSystemFragmentComposer): def __init__(self, cflags = "default", includes = None): - self.cflags, self.includes = _clfags_includes(cflags, includes) + self.cflags, self.includes = _cflagsIncludes(cflags, includes) def compose(self, path): if None in self.includes: @@ -108,7 +108,7 @@ class LexFragmentComposer(builder.BuildSystemFragmentComposer): def __init__(self, sym, dep, cflags = None, includes = None): self.sym = sym self.dep = dep - self.cflags, self.includes = _clfags_includes(cflags, includes) + self.cflags, self.includes = _cflagsIncludes(cflags, includes) def compose(self, path): d = { 'file': path, @@ -125,7 +125,7 @@ class YaccFragmentComposer(builder.BuildSystemFragmentComposer): def __init__(self, sym, header, cflags = None, includes = None): self.sym = sym self.header = header - self.cflags, self.includes = _clfags_includes(cflags, includes) + self.cflags, self.includes = _cflagsIncludes(cflags, includes) def compose(self, path): d = { 'file': path, @@ -149,7 +149,7 @@ class ModuleManager(builder.ModuleManager): def write(self): name = os.path.join(builder.RTEMS_DIR, 'libbsd_waf.py') converter = builder.Converter() - converter.convert(name, name, src_contents = self.script) + converter.convert(name, name, srcContents = self.script) def setGenerators(self): self.generator['convert'] = builder.Converter @@ -173,26 +173,26 @@ class ModuleManager(builder.ModuleManager): def generate(self, rtems_version): - def _source_list(lhs, files, append = False): + def _sourceList(lhs, files, append = False): if append: adder = '+' - adder_space = ' ' + adderSpace = ' ' else: adder = '' - adder_space = '' + adderSpace = '' ll = len(lhs) if len(files) == 1: self.add('%s %s= [%r]' % (lhs, adder, files[0])) elif len(files) == 2: self.add('%s %s= [%r,' % (lhs, adder, files[0])) - self.add('%s %s %r]' % (' ' * ll, adder_space, files[-1])) + self.add('%s %s %r]' % (' ' * ll, adderSpace, files[-1])) elif len(files) > 0: self.add('%s %s= [%r,' % (lhs, adder, files[0])) for f in files[1:-1]: - self.add('%s %s %r,' % (' ' * ll, adder_space, f)) - self.add('%s %s %r]' % (' ' * ll, adder_space, files[-1])) + self.add('%s %s %r,' % (' ' * ll, adderSpace, f)) + self.add('%s %s %r]' % (' ' * ll, adderSpace, files[-1])) - def _data_insert(data, cpu, frag): + def _dataInsert(data, cpu, frag): # # The default handler returns an empty string. Skip it. # @@ -233,10 +233,10 @@ class ModuleManager(builder.ModuleManager): m = self[mn] if m.conditionalOn == "none": for f in m.files: - _data_insert(data, 'all', f.getFragment()) + _dataInsert(data, 'all', f.getFragment()) for cpu, files in sorted(m.cpuDependentSourceFiles.items()): for f in files: - _data_insert(data, cpu, f.getFragment()) + _dataInsert(data, cpu, f.getFragment()) if trace: import pprint @@ -272,13 +272,13 @@ class ModuleManager(builder.ModuleManager): self.add('def build(bld):') self.add(' # C/C++ flags') self.add(' common_flags = []') - for f in builder.common_flags(): + for f in builder.commonFlags(): self.add(' common_flags += ["%s"]' % (f)) self.add(' if bld.env.WARNINGS:') - for f in builder.common_warnings(): + for f in builder.commonWarnings(): self.add(' common_flags += ["%s"]' % (f)) self.add(' else:') - for f in builder.common_no_warnings(): + for f in builder.commonNoWarnings(): self.add(' common_flags += ["%s"]' % (f)) self.add(' cflags = %r + common_flags' % (builder.cflags())) self.add(' cxxflags = %r + common_flags' % (builder.cxxflags())) @@ -291,10 +291,10 @@ class ModuleManager(builder.ModuleManager): self.add('') self.add(' # Include paths') self.add(' includes = []') - self.add(' for i in %r:' % (builder.cpu_includes())) + self.add(' for i in %r:' % (builder.cpuIncludes())) self.add(' includes += ["%s" % (i[2:].replace("@CPU@", bld.get_env()["RTEMS_ARCH"]))]') self.add(' if bld.get_env()["RTEMS_ARCH"] == "i386":') - self.add(' for i in %r:' % (builder.cpu_includes())) + self.add(' for i in %r:' % (builder.cpuIncludes())) self.add(' includes += ["%s" % (i[2:].replace("@CPU@", "x86"))]') for i in builder.includes(): self.add(' includes += ["%s"]' % (i[2:])) @@ -402,13 +402,13 @@ class ModuleManager(builder.ModuleManager): for l in sorted(lexes.keys()): lex = lexes[l]['all'] if 'cflags' in lex: - lex_defines = [d[2:] for d in lex['cflags']] + lexDefines = [d[2:] for d in lex['cflags']] else: - lex_defines = [] + lexDefines = [] if 'includes' in lex: - lex_includes = lex['includes'] + lexIncludes = lex['includes'] else: - lex_includes = [] + lexIncludes = [] self.add(' if bld.env.AUTO_REGEN:') self.add(' bld(target = "%s.c",' % (lex['file'][:-2])) self.add(' source = "%s",' % (lex['file'])) @@ -417,8 +417,8 @@ class ModuleManager(builder.ModuleManager): self.add(' bld.objects(target = "lex_%s",' % (lex['sym'])) self.add(' features = "c",') self.add(' cflags = cflags,') - self.add(' includes = %r + includes,' % (lex_includes)) - self.add(' defines = defines + %r,' % (lex_defines)) + self.add(' includes = %r + includes,' % (lexIncludes)) + self.add(' defines = defines + %r,' % (lexDefines)) self.add(' source = "%s.c")' % (lex['file'][:-2])) self.add(' libbsd_use += ["lex_%s"]' % (lex['sym'])) self.add('') @@ -428,33 +428,33 @@ class ModuleManager(builder.ModuleManager): self.add(' # Yacc') for y in sorted(yaccs.keys()): yacc = yaccs[y]['all'] - yacc_file = yacc['file'] + yaccFile = yacc['file'] if yacc['sym'] is not None: - yacc_sym = yacc['sym'] + yaccSym = yacc['sym'] else: - yacc_sym = os.path.basename(yacc_file)[:-2] - yacc_header = '%s/%s' % (os.path.dirname(yacc_file), yacc['header']) + yaccSym = os.path.basename(yaccFile)[:-2] + yaccHeader = '%s/%s' % (os.path.dirname(yaccFile), yacc['header']) if 'cflags' in yacc: - yacc_defines = [d[2:] for d in yacc['cflags']] + yaccDefines = [d[2:] for d in yacc['cflags']] else: - yacc_defines = [] + yaccDefines = [] if 'includes' in yacc: - yacc_includes = yacc['includes'] + yaccIncludes = yacc['includes'] else: - yacc_includes = [] + yaccIncludes = [] self.add(' if bld.env.AUTO_REGEN:') - self.add(' bld(target = "%s.c",' % (yacc_file[:-2])) - self.add(' source = "%s",' % (yacc_file)) - self.add(' rule = "${YACC} -b %s -d -p %s ${SRC} && ' % (yacc_sym, yacc_sym) + \ - 'sed -e \'/YY_BUF_SIZE/s/16384/1024/\' < %s.tab.c > ${TGT} && ' % (yacc_sym) + \ - 'rm -f %s.tab.c && mv %s.tab.h %s")' % (yacc_sym, yacc_sym, yacc_header)) - self.add(' bld.objects(target = "yacc_%s",' % (yacc_sym)) + self.add(' bld(target = "%s.c",' % (yaccFile[:-2])) + self.add(' source = "%s",' % (yaccFile)) + self.add(' rule = "${YACC} -b %s -d -p %s ${SRC} && ' % (yaccSym, yaccSym) + \ + 'sed -e \'/YY_BUF_SIZE/s/16384/1024/\' < %s.tab.c > ${TGT} && ' % (yaccSym) + \ + 'rm -f %s.tab.c && mv %s.tab.h %s")' % (yaccSym, yaccSym, yaccHeader)) + self.add(' bld.objects(target = "yacc_%s",' % (yaccSym)) self.add(' features = "c",') self.add(' cflags = cflags,') - self.add(' includes = %r + includes,' % (yacc_includes)) - self.add(' defines = defines + %r,' % (yacc_defines)) - self.add(' source = "%s.c")' % (yacc_file[:-2])) - self.add(' libbsd_use += ["yacc_%s"]' % (yacc_sym)) + self.add(' includes = %r + includes,' % (yaccIncludes)) + self.add(' defines = defines + %r,' % (yaccDefines)) + self.add(' source = "%s.c")' % (yaccFile[:-2])) + self.add(' libbsd_use += ["yacc_%s"]' % (yaccSym)) self.add('') # @@ -466,14 +466,14 @@ class ModuleManager(builder.ModuleManager): for flags in sorted(data['sources']): if flags is not 'default': objs += 1 - _source_list(' objs%02d_source' % objs, sorted(data['sources'][flags]['all'])) + _sourceList(' objs%02d_source' % objs, sorted(data['sources'][flags]['all'])) archs = sorted(data['sources'][flags]) for arch in archs: if arch not in ['all', 'cflags', 'includes']: self.add(' if bld.get_env()["RTEMS_ARCH"] == "%s":' % arch) - _source_list(' objs%02d_source' % objs, - sorted(data['sources'][flags][arch]), - append = True) + _sourceList(' objs%02d_source' % objs, + sorted(data['sources'][flags][arch]), + append = True) if 'cflags' in data['sources'][flags]: defines = [d[2:] for d in data['sources'][flags]['cflags']] else: @@ -495,14 +495,14 @@ class ModuleManager(builder.ModuleManager): # We hold the 'default' cflags set of files to the end to create the # static library with. # - _source_list(' source', sorted(data['sources']['default']['all'])) + _sourceList(' source', sorted(data['sources']['default']['all'])) archs = sorted(data['sources']['default']) for arch in archs: if arch is not 'all': self.add(' if bld.get_env()["RTEMS_ARCH"] == "%s":' % arch) - _source_list(' source', - sorted(data['sources']['default'][arch]), - append = True) + _sourceList(' source', + sorted(data['sources']['default'][arch]), + append = True) self.add(' bld.stlib(target = "bsd",') self.add(' features = "c cxx",') self.add(' cflags = cflags,') @@ -518,11 +518,11 @@ class ModuleManager(builder.ModuleManager): # self.add(' # Installs. ') self.add(' bld.install_files("${PREFIX}/" + rtems.arch_bsp_lib_path(bld.env.RTEMS_VERSION, bld.env.RTEMS_ARCH_BSP), ["libbsd.a"])') - header_paths = builder.header_paths() - self.add(' header_paths = [%s,' % (str(header_paths[0]))) - for hp in header_paths[1:-1]: + headerPaths = builder.headerPaths() + self.add(' header_paths = [%s,' % (str(headerPaths[0]))) + for hp in headerPaths[1:-1]: self.add(' %s,' % (str(hp))) - self.add(' %s]' % (str(header_paths[-1]))) + self.add(' %s]' % (str(headerPaths[-1]))) self.add(' for headers in header_paths:') self.add(' ipath = os.path.join(rtems.arch_bsp_include_path(bld.env.RTEMS_VERSION, bld.env.RTEMS_ARCH_BSP), headers[2])') self.add(' start_dir = bld.path.find_dir(headers[0])') @@ -534,14 +534,14 @@ class ModuleManager(builder.ModuleManager): self.add(' # Tests') tests = data['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)) + for testName in sorted(tests): + files = ['testsuite/%s/%s.c' % (testName, f) for f in data['tests'][testName]['all']['files']] + _sourceList(' test_%s' % (testName), sorted(files)) + self.add(' bld.program(target = "%s.exe",' % (testName)) self.add(' features = "cprogram",') self.add(' cflags = cflags,') self.add(' includes = includes,') - self.add(' source = test_%s,' % (test_name)) + self.add(' source = test_%s,' % (testName)) self.add(' use = ["bsd"],') self.add(' lib = ["m", "z"],') self.add(' install_path = None)') -- cgit v1.2.3