From d7852ebf0d746d83f7665e40a0556db9b74b31a9 Mon Sep 17 00:00:00 2001 From: wangbaiping Date: Thu, 22 Aug 2024 23:06:49 +0800 Subject: [PATCH 1/4] tools: update refresh compdb to use build setup Signed-off-by: wangbaiping --- tools/vscode/refresh_compdb.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tools/vscode/refresh_compdb.sh b/tools/vscode/refresh_compdb.sh index 996a9d5761029..5780b5335065a 100755 --- a/tools/vscode/refresh_compdb.sh +++ b/tools/vscode/refresh_compdb.sh @@ -1,5 +1,10 @@ #!/usr/bin/env bash +CURRENT_SCRIPT_DIR="$(realpath "$(dirname "${BASH_SOURCE[0]}")")" + +# shellcheck source=ci/build_setup.sh +. "${CURRENT_SCRIPT_DIR}"/../../ci/build_setup.sh + [[ -z "${SKIP_PROTO_FORMAT}" ]] && tools/proto_format/proto_format.sh fix bazel_or_isk=bazelisk From 524a8a2b1b5491b6a6949391b871d7e120f9c019 Mon Sep 17 00:00:00 2001 From: wangbaiping Date: Fri, 23 Aug 2024 10:25:33 +0800 Subject: [PATCH 2/4] address comment and minor update Signed-off-by: wangbaiping --- ci/do_ci.sh | 4 ++++ tools/gen_compilation_database.py | 5 ++--- tools/vscode/refresh_compdb.sh | 10 +--------- 3 files changed, 7 insertions(+), 12 deletions(-) diff --git a/ci/do_ci.sh b/ci/do_ci.sh index 1d51f478f15c1..c509c5051a450 100755 --- a/ci/do_ci.sh +++ b/ci/do_ci.sh @@ -1042,6 +1042,10 @@ case $CI_TARGET in --trigger-workflow="$WORKFLOW" \ --trigger-inputs="$INPUTS" ;; + + refresh_compdb) + "${CURRENT_SCRIPT_DIR}/../tools/vscode/refresh_compdb.sh" + ;; *) echo "Invalid do_ci.sh target (${CI_TARGET}), see ci/README.md for valid targets." diff --git a/tools/gen_compilation_database.py b/tools/gen_compilation_database.py index 5e7fc75d3e133..625f9487b3e85 100755 --- a/tools/gen_compilation_database.py +++ b/tools/gen_compilation_database.py @@ -22,13 +22,13 @@ def generate_compilation_database(args): if args.exclude_contrib: source_dir_targets.remove("//contrib/...") - subprocess.check_call([args.bazel, *bazel_startup_options, "build"] + bazel_options + [ + subprocess.check_call(["bazel", *bazel_startup_options, "build"] + bazel_options + [ "--aspects=@bazel_compdb//:aspects.bzl%compilation_database_aspect", "--output_groups=compdb_files,header_files" ] + source_dir_targets) execroot = subprocess.check_output([ - args.bazel, *bazel_startup_options, "info", *bazel_options, "execution_root", *bazel_options + "bazel", *bazel_startup_options, "info", *bazel_options, "execution_root", *bazel_options ]).decode().strip() db_entries = [] @@ -128,7 +128,6 @@ def fix_compilation_database(args, db): help= 'Use `clang++` instead of the bazel wrapper for commands. This may help if `clangd` cannot find/run the tools.' ) - parser.add_argument('--bazel', default='bazel') parser.add_argument( 'bazel_targets', nargs='*', default=[ "//source/...", diff --git a/tools/vscode/refresh_compdb.sh b/tools/vscode/refresh_compdb.sh index 5780b5335065a..da41d6f18356f 100755 --- a/tools/vscode/refresh_compdb.sh +++ b/tools/vscode/refresh_compdb.sh @@ -1,16 +1,8 @@ #!/usr/bin/env bash -CURRENT_SCRIPT_DIR="$(realpath "$(dirname "${BASH_SOURCE[0]}")")" - -# shellcheck source=ci/build_setup.sh -. "${CURRENT_SCRIPT_DIR}"/../../ci/build_setup.sh - [[ -z "${SKIP_PROTO_FORMAT}" ]] && tools/proto_format/proto_format.sh fix -bazel_or_isk=bazelisk -command -v bazelisk &> /dev/null || bazel_or_isk=bazel - -opts=(--vscode --bazel="$bazel_or_isk") +opts=(--vscode) [[ -z "${EXCLUDE_CONTRIB}" ]] || opts+=(--exclude_contrib) From c29f2e6b292223f617358efe51ec9d6e5b2d1187 Mon Sep 17 00:00:00 2001 From: wangbaiping Date: Fri, 23 Aug 2024 10:53:30 +0800 Subject: [PATCH 3/4] fix format Signed-off-by: wangbaiping --- tools/gen_compilation_database.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/gen_compilation_database.py b/tools/gen_compilation_database.py index 625f9487b3e85..2dfdaa79fd175 100755 --- a/tools/gen_compilation_database.py +++ b/tools/gen_compilation_database.py @@ -27,9 +27,9 @@ def generate_compilation_database(args): "--output_groups=compdb_files,header_files" ] + source_dir_targets) - execroot = subprocess.check_output([ - "bazel", *bazel_startup_options, "info", *bazel_options, "execution_root", *bazel_options - ]).decode().strip() + execroot = subprocess.check_output( + ["bazel", *bazel_startup_options, "info", *bazel_options, "execution_root", + *bazel_options]).decode().strip() db_entries = [] for db in Path(execroot).glob('**/*.compile_commands.json'): From 6aa6a06d95ac54995ff47d1203bde8cc93a59b9d Mon Sep 17 00:00:00 2001 From: wangbaiping Date: Fri, 23 Aug 2024 11:21:24 +0800 Subject: [PATCH 4/4] fix format Signed-off-by: wangbaiping --- ci/do_ci.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/do_ci.sh b/ci/do_ci.sh index c509c5051a450..4d1b1ea3b1728 100755 --- a/ci/do_ci.sh +++ b/ci/do_ci.sh @@ -1042,7 +1042,7 @@ case $CI_TARGET in --trigger-workflow="$WORKFLOW" \ --trigger-inputs="$INPUTS" ;; - + refresh_compdb) "${CURRENT_SCRIPT_DIR}/../tools/vscode/refresh_compdb.sh" ;;