Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .bazelrc
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ common --http_timeout_scaling=4.0
common --repo_env=ANDROID_HOME=

build --@score_baselibs//score/json:base_library=nlohmann
build --@score_baselibs//score/memory/shared/flags:use_typedshmd=False
build --@score_communication//score/memory/shared/flags:use_typedshmd=False
build --credential_helper="*.qnx.com=%workspace%/.github/tools/qnx_credential_helper.py"

# -------------------------------------------------------------------------------
Expand Down
7 changes: 4 additions & 3 deletions MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,9 @@ bazel_dep(name = "google_benchmark", version = "1.9.5")

bazel_dep(name = "buildifier_prebuilt", version = "8.5.1", dev_dependency = True)

bazel_dep(name = "score_baselibs", version = "0.2.9")
bazel_dep(name = "score_lifecycle_health", version = "0.3.0")
bazel_dep(name = "score_baselibs", version = "0.2.12")
bazel_dep(name = "score_communication", version = "0.4.0")
bazel_dep(name = "score_lifecycle", version = "0.5.0")

# LLVM toolchain — provides @llvm_toolchain//:clang-tidy for the clang-tidy aspect.
llvm = use_extension(
Expand Down Expand Up @@ -127,7 +128,7 @@ use_repo(llvm, "llvm_toolchain", "llvm_toolchain_coverage", "llvm_toolchain_cove

# grpc-java@1.66.0 has a BCR bug (extension no longer generates
# com_envoyproxy_protoc_gen_validate). Pulled transitively via
# score_lifecycle_health -> score_baselibs_rust -> aspect_rules_lint@2.x -> grpc.
# score_baselibs, score_lifecycle and score_tooling.
# Override to a fixed version.
single_version_override(
module_name = "grpc-java",
Expand Down
146 changes: 102 additions & 44 deletions MODULE.bazel.lock

Large diffs are not rendered by default.

9 changes: 0 additions & 9 deletions score/time/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
# *******************************************************************************

load("@score_baselibs//:bazel/unit_tests.bzl", "cc_unit_test_suites_for_host_and_qnx")
load("@score_baselibs//third_party/itf:py_unittest_qnx_test.bzl", "py_unittest_qnx_test")
load("@score_docs_as_code//:docs.bzl", "docs_bundle")

docs_bundle(
Expand All @@ -21,14 +20,6 @@ docs_bundle(
visibility = ["//visibility:public"],
)

py_unittest_qnx_test(
name = "qnx_unit_test_cases",
test_suites = [
"//score/time/high_res_steady_time:qnx_unit_test_cases",
],
visibility = ["//score/time:__pkg__"],
)

cc_unit_test_suites_for_host_and_qnx(
name = "unit_test_suite",
cc_unit_tests = [],
Expand Down
7 changes: 0 additions & 7 deletions score/time/high_res_steady_time/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
# *******************************************************************************

load("@score_baselibs//:bazel/unit_tests.bzl", "cc_unit_test_suites_for_host_and_qnx")
load("@score_baselibs//third_party/itf:py_unittest_qnx_test.bzl", "py_unittest_qnx_test")

# The public interface of the HighResSteadyTime clock domain
alias(
Expand All @@ -37,12 +36,6 @@ alias(
visibility = ["//visibility:public"],
)

py_unittest_qnx_test(
name = "qnx_unit_test_cases",
test_suites = ["//score/time/high_res_steady_time/src:qnx_unit_test_cases"],
visibility = ["//score/time:__pkg__"],
)

cc_unit_test_suites_for_host_and_qnx(
name = "unit_test_suite",
test_suites_from_sub_packages = ["//score/time/high_res_steady_time/src:unit_test_suite"],
Expand Down
9 changes: 0 additions & 9 deletions score/time/high_res_steady_time/src/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@

load("@score_baselibs//:bazel/unit_tests.bzl", "cc_unit_test_suites_for_host_and_qnx")
load("@score_baselibs//score/language/safecpp:toolchain_features.bzl", "COMPILER_WARNING_FEATURES")
load("@score_baselibs//third_party/itf:py_unittest_qnx_test.bzl", "py_unittest_qnx_test")

cc_library(
name = "high_res_steady_clock",
Expand Down Expand Up @@ -62,14 +61,6 @@ cc_library(
],
)

py_unittest_qnx_test(
name = "qnx_unit_test_cases",
test_suites = [
"//score/time/high_res_steady_time/src/details:qnx_unit_test_cases",
],
visibility = ["//score/time/high_res_steady_time:__pkg__"],
)

cc_test(
name = "high_res_steady_clock_adapter_test",
srcs = ["high_res_steady_clock_adapter_test.cpp"],
Expand Down
10 changes: 0 additions & 10 deletions score/time/high_res_steady_time/src/details/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,6 @@
# *******************************************************************************

load("@score_baselibs//:bazel/unit_tests.bzl", "cc_unit_test_suites_for_host_and_qnx")
load("@score_baselibs//third_party/itf:py_unittest_qnx_test.bzl", "py_unittest_qnx_test")

py_unittest_qnx_test(
name = "qnx_unit_test_cases",
test_suites = [
"//score/time/high_res_steady_time/src/details/qtime:qnx_unit_test_cases",
"//score/time/high_res_steady_time/src/details/system_clock:qnx_unit_test_cases",
],
visibility = ["//score/time/high_res_steady_time:__subpackages__"],
)

cc_unit_test_suites_for_host_and_qnx(
name = "unit_test_suite",
Expand Down
11 changes: 0 additions & 11 deletions score/time/high_res_steady_time/src/details/qtime/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
# *******************************************************************************

load("@score_baselibs//score/language/safecpp:toolchain_features.bzl", "COMPILER_WARNING_FEATURES")
load("@score_baselibs//third_party/itf:py_unittest_qnx_test.bzl", "py_unittest_qnx_test")

cc_library(
name = "qclock",
Expand Down Expand Up @@ -88,13 +87,3 @@ cc_test(
"@score_baselibs//score/mw/log:console_only_backend",
],
)

py_unittest_qnx_test(
name = "qnx_unit_test_cases",
test_cases = [
":factory_test",
":high_res_steady_qclock_test",
":tick_provider_test",
],
visibility = ["//score/time/high_res_steady_time/src/details:__pkg__"],
)
2 changes: 1 addition & 1 deletion score/time_daemon/src/application/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ cc_binary(
"//score/time_daemon/src/application/svt:svt_handler",
"//score/time_daemon/src/common:logging_contexts",
"@score_baselibs//score/concurrency",
"@score_lifecycle_health//score/launch_manager:lifecycle_cc",
"@score_lifecycle//score/launch_manager:lifecycle_cc",
# "@score_logging//score/mw/log",
"@score_baselibs//score/mw/log:console_only_backend",
],
Expand Down
4 changes: 2 additions & 2 deletions score/time_daemon/src/ipc/core/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ cc_library(
visibility = ["//score/time_daemon/src/ipc:__subpackages__"],
deps = [
"//score/time_daemon/src/common:logging_contexts",
"@score_baselibs//score/memory/shared",
"@score_baselibs//score/memory/shared/typedshm/typedshm_wrapper:typedmemory",
"@score_baselibs//score/mw/log:frontend",
"@score_communication//score/memory/shared",
"@score_communication//score/memory/shared/typedshm/typedshm_wrapper:typedmemory",
],
)

Expand Down
2 changes: 1 addition & 1 deletion score/time_slave/src/application/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,6 @@ cc_binary(
"//score/time_slave/src/gptp:gptp_engine",
"//score/ts_client/src:gptp_ipc",
"@score_baselibs//score/mw/log:console_only_backend",
"@score_lifecycle_health//score/launch_manager:lifecycle_cc",
"@score_lifecycle//score/launch_manager:lifecycle_cc",
],
)
2 changes: 1 addition & 1 deletion score/ts_client/src/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ cc_library(
"//score/time_slave:__subpackages__",
],
deps = [
"@score_baselibs//score/memory/shared",
"@score_communication//score/memory/shared",
],
)

Expand Down
2 changes: 1 addition & 1 deletion tools/static_analysis/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ Clang's wrapper (`cc_wrapper.sh` from `@llvm_toolchain`) is correctly traced.

The `database_integrity_report.md` lists ~90 extraction errors. These are all
from external repositories (`googletest`, `google_benchmark`, `score_baselibs`,
`score_lifecycle_health`). This is expected: the external sources are compiled
`score_lifecycle`). This is expected: the external sources are compiled
with flags or language extensions that CodeQL's extractor does not fully support.
Findings in `score/**` are not affected.

Expand Down
Loading