Skip to content
Closed
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
8 changes: 4 additions & 4 deletions .bazelrc
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ build --tool_java_runtime_version=remotejdk_17
build:_common --@score_baselibs//score/mw/log/flags:KRemote_Logging=False
build:_common --@score_baselibs//score/json:base_library=nlohmann
build:_common --@score_baselibs//score/memory/shared/flags:use_typedshmd=False
build:_common --@score_communication//score/mw/com/flags:tracing_library=stub
build:_common --@score_communication//score/mw/com/flags:tracing_library=@score_baselibs//score/analysis/tracing/generic_trace_library/stub_implementation
build:_common --cxxopt=-Wno-error=mismatched-new-delete
build:_common --host_platform=@score_bazel_platforms//:x86_64-linux-gcc_12.2.0-posix
build:_common --extra_toolchains=@score_toolchains_rust//toolchains/ferrocene:ferrocene_x86_64_unknown_linux_gnu
build:_common --extra_toolchains=@score_gcc_x86_64_toolchain//:x86_64-linux-gcc_12.2.0-posix
build:_common --extra_toolchains=@score_gcc_x86_64_toolchain//:x86_64-linux-gcc_12.2.0

build:qnx-x86_64 --config=_common
build:qnx-x86_64 --noexperimental_merged_skyframe_analysis_execution
Expand All @@ -29,7 +29,7 @@ build:qnx-x86_64 --incompatible_enable_cc_toolchain_resolution
build:qnx-x86_64 --incompatible_strict_action_env
build:qnx-x86_64 --sandbox_writable_path=/var/tmp
build:qnx-x86_64 --platforms=@score_bazel_platforms//:x86_64-qnx-sdp_8.0.0-posix
build:qnx-x86_64 --extra_toolchains=@score_qcc_x86_64_toolchain//:x86_64-qnx-sdp_8.0.0-posix
build:qnx-x86_64 --extra_toolchains=@score_qcc_x86_64_toolchain//:x86_64-qnx-sdp_8.0.0
build:qnx-x86_64 --extra_toolchains=@toolchains_qnx_ifs//:ifs_x86_64
build:qnx-x86_64 --extra_toolchains=@score_toolchains_rust//toolchains/ferrocene:ferrocene_x86_64_pc_nto_qnx800

Expand All @@ -40,7 +40,7 @@ build:itf-qnx-x86_64 --test_arg="--os=qnx"


build:linux-x86_64 --config=_common
build:linux-x86_64 --extra_toolchains=@score_gcc_x86_64_toolchain//:x86_64-linux-gcc_12.2.0-posix
build:linux-x86_64 --extra_toolchains=@score_gcc_x86_64_toolchain//:x86_64-linux-gcc_12.2.0
build:linux-x86_64 --platforms=@score_bazel_platforms//:x86_64-linux-gcc_12.2.0-posix

build:eb-aarch64 --config=_common
Expand Down
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
# Bazel
bazel-*
MODULE.bazel.lock
user.bazelrc

_logs
Expand Down
8,968 changes: 8,968 additions & 0 deletions MODULE.bazel.lock

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bazel_common/score_gcc_toolchains.MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# *******************************************************************************


bazel_dep(name = "score_bazel_cpp_toolchains", version = "0.2.2")
bazel_dep(name = "score_bazel_cpp_toolchains", version = "0.3.1")
gcc = use_extension("@score_bazel_cpp_toolchains//extensions:gcc.bzl", "gcc", dev_dependency = True)

gcc.toolchain(
Expand Down
6 changes: 4 additions & 2 deletions bazel_common/score_modules_target_sw.MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,13 @@ single_version_override(
)

bazel_dep(name = "score_communication")
single_version_override(
git_override(
module_name = "score_communication",
version = "0.1.3",
remote = "https://github.com/eclipse-score/communication.git",
commit = "484f0460285f65f8174ef9bd01b4a15576b80185",
patches = [
"//patches/communication:001-expose-comm-examples.patch",
"//patches/communication:002-modules-visibility.patch",
],
patch_strip = 1,
)
Expand Down
11 changes: 8 additions & 3 deletions known_good.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,17 +38,22 @@
},
"score_communication": {
"repo": "https://github.com/eclipse-score/communication.git",
"version": "0.1.3",
"hash": "484f0460285f65f8174ef9bd01b4a15576b80185",
"bazel_patches": [
"//patches/communication:001-expose-comm-examples.patch"
"//patches/communication:001-expose-comm-examples.patch",
"//patches/communication:002-modules-visibility.patch"
],
"metadata": {
"code_root_path": "//score/mw/com/impl/...",
"exclude_test_targets": [
"//score/mw/com/impl:unit_test_runtime_single_exec",
"//score/mw/com/impl/configuration:config_parser_test",
"//score/mw/com/impl/configuration:configuration_test",
"//score/mw/com/impl/tracing/configuration:tracing_filter_config_parser_test"
"//score/mw/com/impl/tracing/configuration:tracing_filter_config_parser_test",
"//score/mw/com/impl/bindings/lola:transaction_log_rollback_executor_test"
],
"extra_test_config": [
"//score/mw/com/flags:tracing_library=@score_baselibs//score/analysis/tracing/generic_trace_library/stub_implementation"
]
}
},
Expand Down
58 changes: 58 additions & 0 deletions patches/communication/002-modules-visibility.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
diff --git a/MODULE.bazel b/MODULE.bazel
index 2cb39152..521996eb 100644
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -70,7 +70,7 @@ use_repo(

# For the moment we still need the old toolchain for ifs generation.
# Migrate once rules_imagefs is ready to be used (https://github.com/eclipse-score/rules_imagefs/pull/1).
-bazel_dep(name = "score_toolchains_qnx", version = "0.0.7", dev_dependency = True)
+bazel_dep(name = "score_toolchains_qnx", version = "0.0.7")

toolchains_qnx = use_extension(
"@score_toolchains_qnx//:extensions.bzl",
@@ -161,7 +161,7 @@ download_file(
bazel_dep(name = "rules_cc", version = "0.1.5")

bazel_dep(name = "aspect_rules_lint", version = "2.2.0", dev_dependency = True)
-bazel_dep(name = "googletest", version = "1.17.0.bcr.2", dev_dependency = True)
+bazel_dep(name = "googletest", version = "1.17.0.bcr.2")
bazel_dep(name = "google_benchmark", version = "1.9.5", dev_dependency = True)

bazel_dep(name = "rules_rust", version = "0.68.1-score")
@@ -172,7 +172,7 @@ bazel_dep(name = "score_crates", version = "0.0.7", repo_name = "score_communica
bazel_dep(name = "boost.program_options", version = "1.87.0")
bazel_dep(name = "boost.interprocess", version = "1.87.0")

-bazel_dep(name = "download_utils", version = "1.2.2", dev_dependency = True)
+bazel_dep(name = "download_utils", version = "1.2.2")

download_archive = use_repo_rule("@download_utils//download/archive:defs.bzl", "download_archive")

@@ -193,7 +193,7 @@ download_archive(
bazel_dep(name = "nlohmann_json", version = "3.11.3")
bazel_dep(name = "bazel_skylib", version = "1.8.1")

-bazel_dep(name = "rules_doxygen", version = "2.6.1", dev_dependency = True)
+bazel_dep(name = "rules_doxygen", version = "2.6.1")
bazel_dep(name = "score_docs_as_code", version = "3.0.1", dev_dependency = True)

# Force score_docs_as_code to 3.0.1 to resolve compatibility conflict between score_logging and score_baselibs
@@ -215,7 +215,7 @@ bazel_dep(name = "score_logging", version = "0.1.0")
bazel_dep(name = "score_baselibs_rust", version = "0.1.0")

# Doxygen extension for documentation generation
-doxygen_extension = use_extension("@rules_doxygen//:extensions.bzl", "doxygen_extension", dev_dependency = True)
+doxygen_extension = use_extension("@rules_doxygen//:extensions.bzl", "doxygen_extension")
use_repo(doxygen_extension, "doxygen")

# Python 3.12 toolchain for Bazel
@@ -243,7 +243,7 @@ pip.parse(
use_repo(pip, "codeql_coding_standards_pip_hub")

# TRLC dependency for requirements traceability
-bazel_dep(name = "trlc", version = "0.0.0", dev_dependency = True)
+bazel_dep(name = "trlc", version = "0.0.0")
git_override(
module_name = "trlc",
commit = "a4f7e95210d8093ba208b91cbc5b681eae8d502b", # trlc-2.0.3 release
2 changes: 1 addition & 1 deletion rust_coverage/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ rust_coverage_report(
"linux-x86_64",
"ferrocene-coverage",
],
query = 'kind("rust_test", @score_communication//score/mw/com/impl/...) -@score_communication//score/mw/com/impl:unit_test_runtime_single_exec -@score_communication//score/mw/com/impl/configuration:config_parser_test -@score_communication//score/mw/com/impl/configuration:configuration_test -@score_communication//score/mw/com/impl/tracing/configuration:tracing_filter_config_parser_test',
query = 'kind("rust_test", @score_communication//score/mw/com/impl/...) -@score_communication//score/mw/com/impl:unit_test_runtime_single_exec -@score_communication//score/mw/com/impl/configuration:config_parser_test -@score_communication//score/mw/com/impl/configuration:configuration_test -@score_communication//score/mw/com/impl/tracing/configuration:tracing_filter_config_parser_test -@score_communication//score/mw/com/impl/bindings/lola:transaction_log_rollback_executor_test',
visibility = ["//visibility:public"],
)

Expand Down
Loading