move lib functions into command file. there are only 2 and they aren'…

…t large

lib/python/qmk/cli/compiledb.py

@@ -1,23 +1,76 @@
 """Creates a compilation database for the given keyboard build.
 """
+
+import json
+import re
+import shlex
 import subprocess
+import sys
 from argparse import FileType
+from functools import lru_cache
+from pathlib import Path
+from subprocess import check_output
+from typing import Dict, List, TextIO
 
 from milc import cli
-
-from qmk.decorators import automagic_keyboard, automagic_keymap
 from qmk.commands import create_make_command
-from qmk.build_log_parse import parse_make_n
 from qmk.constants import QMK_FIRMWARE
-import json
+from qmk.decorators import automagic_keyboard, automagic_keymap
+
+
+@lru_cache(maxsize=10)
+def system_libs(binary: str):
+    """Find the system include directory that the given build tool uses.
+
+    Only tested on OSX+homebrew so far.
+    """
+
+    try:
+        return list(Path(check_output(['which', binary]).rstrip().decode()).resolve().parent.parent.glob("*/include"))
+    except Exception:
+        return []
+
+
+file_re = re.compile(r"""printf "Compiling: ([^"]+)""")
+cmd_re = re.compile(r"""LOG=\$\((.+?)\&\&""")
+
+
+def parse_make_n(f: TextIO) -> List[Dict[str, str]]:
+    """parse the output of `make -n <target>`
+
+    This function makes many assumptions about the format of your build log.
+    This happens to work right now for qmk.
+    """
+
+    state = 'start'
+    this_file = None
+    records = []
+    for line in f:
+        if state == 'start':
+            m = file_re.search(line)
+            if m:
+                this_file = m.group(1)
+                state = 'cmd'
+
+        if state == 'cmd':
+            m = cmd_re.search(line)
+            if m:
+                # we have a hit!
+                this_cmd = m.group(1)
+                args = shlex.split(this_cmd)
+                args += ['-I%s' % s for s in system_libs(args[0])]
+                new_cmd = ' '.join(shlex.quote(s) for s in args if s != '-mno-thumb-interwork')
+                records.append({"directory": str(QMK_FIRMWARE.resolve()), "command": new_cmd, "file": this_file})
+                state = 'start'
 
+    return records
 
 @cli.argument('-kb', '--keyboard', help='The keyboard to build a firmware for. Ignored when a configurator export is supplied.')
 @cli.argument('-km', '--keymap', help='The keymap to build a firmware for. Ignored when a configurator export is supplied.')
 @cli.subcommand('Create a compilation database.')
 @automagic_keyboard
 @automagic_keymap
-def compile(cli):
+def compiledb(cli):
     """Creates a compilation database for the given keyboard build.
 
     Does a make clean, then a make -n for this target and uses the dry-run output to create