diff options
| author | whitespace <nobody@nobody> | 2020-10-07 17:22:26 -0400 | 
|---|---|---|
| committer | Quentin Young <qlyoung@nvidia.com> | 2020-10-07 17:22:26 -0400 | 
| commit | 701a01920eee5431d2052aad92aefbdf50ac2139 (patch) | |
| tree | 2bf2339327241f59593b9583b060ebb347db1cea /python/makefile.py | |
| parent | bd407b54d26981f30a95bc316ea2ed965d070c53 (diff) | |
*: reformat python files
We are now using black.
Signed-off-by: Quentin Young <qlyoung@nvidia.com>
Diffstat (limited to 'python/makefile.py')
| -rw-r--r-- | python/makefile.py | 118 | 
1 files changed, 74 insertions, 44 deletions
diff --git a/python/makefile.py b/python/makefile.py index fe20945ccc..10c73df72d 100644 --- a/python/makefile.py +++ b/python/makefile.py @@ -13,69 +13,91 @@ import argparse  from string import Template  from makevars import MakeReVars -argp = argparse.ArgumentParser(description = 'FRR Makefile extensions') -argp.add_argument('--dev-build', action = 'store_const', const = True, -            help = 'run additional developer checks') +argp = argparse.ArgumentParser(description="FRR Makefile extensions") +argp.add_argument( +    "--dev-build", +    action="store_const", +    const=True, +    help="run additional developer checks", +)  args = argp.parse_args() -with open('Makefile', 'r') as fd: +with open("Makefile", "r") as fd:      before = fd.read()  mv = MakeReVars(before) -clippy_scan = mv['clippy_scan'].strip().split() +clippy_scan = mv["clippy_scan"].strip().split()  for clippy_file in clippy_scan: -    assert clippy_file.endswith('.c') +    assert clippy_file.endswith(".c")  # check for files using clippy but not listed in clippy_scan  if args.dev_build:      basepath = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) -    if os.path.exists(os.path.join(basepath, '.git')): -        clippy_ref = subprocess.check_output([ -            'git', '-C', basepath, 'grep', '-l', '-P', '^#\s*include.*_clippy.c', '--', '**.c']).decode('US-ASCII') +    if os.path.exists(os.path.join(basepath, ".git")): +        clippy_ref = subprocess.check_output( +            [ +                "git", +                "-C", +                basepath, +                "grep", +                "-l", +                "-P", +                "^#\s*include.*_clippy.c", +                "--", +                "**.c", +            ] +        ).decode("US-ASCII")          clippy_ref = set(clippy_ref.splitlines())          missing = clippy_ref - set(clippy_scan)          if len(missing) > 0: -            sys.stderr.write('error: files seem to be using clippy, but not listed in "clippy_scan" in subdir.am:\n\t%s\n' % ('\n\t'.join(sorted(missing)))) +            sys.stderr.write( +                'error: files seem to be using clippy, but not listed in "clippy_scan" in subdir.am:\n\t%s\n' +                % ("\n\t".join(sorted(missing))) +            )              sys.exit(1) -clippydep = Template(''' +clippydep = Template( +    """  ${clippybase}.$$(OBJEXT): ${clippybase}_clippy.c  ${clippybase}.lo: ${clippybase}_clippy.c -${clippybase}_clippy.c: $$(CLIPPY_DEPS)''') +${clippybase}_clippy.c: $$(CLIPPY_DEPS)""" +) -clippyauxdep = Template('''# clippy{ +clippyauxdep = Template( +    """# clippy{  # auxiliary clippy target  ${target}: ${clippybase}_clippy.c -# }clippy''') +# }clippy""" +)  lines = before.splitlines() -autoderp = '#AUTODERP# ' +autoderp = "#AUTODERP# "  out_lines = []  bcdeps = [] -make_rule_re = re.compile('^([^:\s]+):\s*([^:\s]+)\s*($|\n)') +make_rule_re = re.compile("^([^:\s]+):\s*([^:\s]+)\s*($|\n)")  while lines:      line = lines.pop(0)      if line.startswith(autoderp): -        line = line[len(autoderp):] +        line = line[len(autoderp) :] -    if line == '# clippy{': +    if line == "# clippy{":          while lines:              line = lines.pop(0) -            if line == '# }clippy': +            if line == "# }clippy":                  break          continue -    if line.startswith('#'): +    if line.startswith("#"):          out_lines.append(line)          continue      full_line = line      full_lines = lines[:] -    while full_line.endswith('\\'): +    while full_line.endswith("\\"):          full_line = full_line[:-1] + full_lines.pop(0)      m = make_rule_re.match(full_line) @@ -87,43 +109,51 @@ while lines:      target, dep = m.group(1), m.group(2) -    if target.endswith('.lo') or target.endswith('.o'): -        if not dep.endswith('.h'): -            bcdeps.append('%s.bc: %s' % (target, target)) -            bcdeps.append('\t$(AM_V_LLVM_BC)$(COMPILE) -emit-llvm -c -o $@ %s' % (dep)) +    if target.endswith(".lo") or target.endswith(".o"): +        if not dep.endswith(".h"): +            bcdeps.append("%s.bc: %s" % (target, target)) +            bcdeps.append("\t$(AM_V_LLVM_BC)$(COMPILE) -emit-llvm -c -o $@ %s" % (dep))      if m.group(2) in clippy_scan: -        out_lines.append(clippyauxdep.substitute(target=m.group(1), clippybase=m.group(2)[:-2])) +        out_lines.append( +            clippyauxdep.substitute(target=m.group(1), clippybase=m.group(2)[:-2]) +        )      out_lines.append(line) -out_lines.append('# clippy{\n# main clippy targets') +out_lines.append("# clippy{\n# main clippy targets")  for clippy_file in clippy_scan: -    out_lines.append(clippydep.substitute(clippybase = clippy_file[:-2])) +    out_lines.append(clippydep.substitute(clippybase=clippy_file[:-2])) -out_lines.append('') +out_lines.append("")  out_lines.extend(bcdeps) -out_lines.append('') +out_lines.append("")  bc_targets = [] -for varname in ['bin_PROGRAMS', 'sbin_PROGRAMS', 'lib_LTLIBRARIES', 'module_LTLIBRARIES', 'noinst_LIBRARIES']: +for varname in [ +    "bin_PROGRAMS", +    "sbin_PROGRAMS", +    "lib_LTLIBRARIES", +    "module_LTLIBRARIES", +    "noinst_LIBRARIES", +]:      bc_targets.extend(mv[varname].strip().split())  for target in bc_targets: -    amtgt = target.replace('/', '_').replace('.', '_').replace('-', '_') -    objs = mv[amtgt + '_OBJECTS'].strip().split() -    objs = [obj + '.bc' for obj in objs] -    deps = mv.get(amtgt + '_DEPENDENCIES', '').strip().split() -    deps = [d + '.bc' for d in deps if d.endswith('.a')] +    amtgt = target.replace("/", "_").replace(".", "_").replace("-", "_") +    objs = mv[amtgt + "_OBJECTS"].strip().split() +    objs = [obj + ".bc" for obj in objs] +    deps = mv.get(amtgt + "_DEPENDENCIES", "").strip().split() +    deps = [d + ".bc" for d in deps if d.endswith(".a")]      objs.extend(deps) -    out_lines.append('%s.bc: %s' % (target, ' '.join(objs))) -    out_lines.append('\t$(AM_V_LLVM_LD)$(LLVM_LINK) -o $@ $^') -    out_lines.append('') +    out_lines.append("%s.bc: %s" % (target, " ".join(objs))) +    out_lines.append("\t$(AM_V_LLVM_LD)$(LLVM_LINK) -o $@ $^") +    out_lines.append("") -out_lines.append('# }clippy') -out_lines.append('') +out_lines.append("# }clippy") +out_lines.append("") -after = '\n'.join(out_lines) +after = "\n".join(out_lines)  if after == before:      sys.exit(0) -with open('Makefile.pyout', 'w') as fd: +with open("Makefile.pyout", "w") as fd:      fd.write(after) -os.rename('Makefile.pyout', 'Makefile') +os.rename("Makefile.pyout", "Makefile")  | 
