lkml.org 
[lkml]   [2023]   [Oct]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    Subject[PATCH v3 01/18] gen_compile_commands: Allow the line prefix to still be cmd_
    From
    Builds in tools still use the cmd_ prefix in .cmd files, so don't
    require the saved part. Name the groups in the line pattern match so
    that changing the regular expression is more robust and works with the
    addition of a new match group.

    Signed-off-by: Ian Rogers <irogers@google.com>
    Reviewed-by: Nick Desaulniers <ndesaulniers@google.com>
    ---
    scripts/clang-tools/gen_compile_commands.py | 6 +++---
    1 file changed, 3 insertions(+), 3 deletions(-)

    diff --git a/scripts/clang-tools/gen_compile_commands.py b/scripts/clang-tools/gen_compile_commands.py
    index a84cc5737c2c..b43f9149893c 100755
    --- a/scripts/clang-tools/gen_compile_commands.py
    +++ b/scripts/clang-tools/gen_compile_commands.py
    @@ -19,7 +19,7 @@ _DEFAULT_OUTPUT = 'compile_commands.json'
    _DEFAULT_LOG_LEVEL = 'WARNING'

    _FILENAME_PATTERN = r'^\..*\.cmd$'
    -_LINE_PATTERN = r'^savedcmd_[^ ]*\.o := (.* )([^ ]*\.[cS]) *(;|$)'
    +_LINE_PATTERN = r'^(saved)?cmd_[^ ]*\.o := (?P<command_prefix>.* )(?P<file_path>[^ ]*\.[cS]) *(;|$)'
    _VALID_LOG_LEVELS = ['DEBUG', 'INFO', 'WARNING', 'ERROR', 'CRITICAL']
    # The tools/ directory adopts a different build system, and produces .cmd
    # files in a different format. Do not support it.
    @@ -213,8 +213,8 @@ def main():
    result = line_matcher.match(f.readline())
    if result:
    try:
    - entry = process_line(directory, result.group(1),
    - result.group(2))
    + entry = process_line(directory, result.group('command_prefix'),
    + result.group('file_path'))
    compile_commands.append(entry)
    except ValueError as err:
    logging.info('Could not add line from %s: %s',
    --
    2.42.0.609.gbb76f46606-goog
    \
     
     \ /
      Last update: 2023-10-09 20:39    [W:6.604 / U:0.096 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site