Skip to content

logging: Integrate score_log #73

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
prabakaranklst wants to merge 1 commit into
base: main
Choose a base branch
from
Open

logging: Integrate score_log #73

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions .bazelrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,10 @@ build --tool_java_language_version=17
build --java_runtime_version=remotejdk_17
build --tool_java_runtime_version=remotejdk_17

build --@score_baselibs_rust//src/log:safety_level=qm
build --@score_baselibs//score/json:base_library=nlohmann
build --@score_logging//score/mw/log/flags:KRemote_Logging=False

test --test_output=errors

# Ferrocene must be common compiler for HOST. To ensure metadata compatibility for proc macro crates!
Expand Down
37 changes: 37 additions & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 5 additions & 2 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,11 @@ kyron-testing = { path = "src/kyron-testing" }

logging_tracing = { path = "src/logging_tracing", default-features = false }
xtask = { path = "src/xtask" }


# TODO: rev shall be replaced with tag for next release for score_log and stdout_logger.
score_log = { git = "https://github.com/eclipse-score/baselibs_rust.git", rev = "7227b67c45dff719901d8f3763d5a37fb55aa0ad", features = [
"qm",
] }
stdout_logger = { git = "https://github.com/eclipse-score/baselibs_rust.git", rev = "7227b67c45dff719901d8f3763d5a37fb55aa0ad" }
iceoryx2 = { git = "https://github.com/eclipse-iceoryx/iceoryx2.git", rev = "d3d1c9a727d3dc405733081923be5dba8213d6d8", default-features = false }
iceoryx2-cal = { git = "https://github.com/eclipse-iceoryx/iceoryx2.git", rev = "d3d1c9a727d3dc405733081923be5dba8213d6d8" }
iceoryx2-bb-container = { git = "https://github.com/eclipse-iceoryx/iceoryx2.git", rev = "d3d1c9a727d3dc405733081923be5dba8213d6d8" }
Expand Down
21 changes: 21 additions & 0 deletions MODULE.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,27 @@ bazel_dep(name = "score_rust_policies", version = "0.0.3")
bazel_dep(name = "score_process", version = "1.4.3", dev_dependency = True)
bazel_dep(name = "score_platform", version = "0.5.3", dev_dependency = True) # This is main score repo

# S-CORE log dependencies
bazel_dep(name = "score_baselibs", version = "0.2.4")

# TODO: remove git_override and specify correct version for next release.
bazel_dep(name = "score_baselibs_rust", version = "0.0.0")
git_override(
module_name = "score_baselibs_rust",
commit = "7227b67c45dff719901d8f3763d5a37fb55aa0ad",
remote = "https://github.com/eclipse-score/baselibs_rust.git",
)

bazel_dep(name = "score_logging", version = "0.1.0")

# TODO: remove once inherited properly from `score_logging`.
bazel_dep(name = "trlc", version = "0.0.0", dev_dependency = True)
git_override(
module_name = "trlc",
commit = "650b51a47264a4f232b3341f473527710fc32669", # trlc-2.0.2 release
remote = "https://github.com/bmw-software-engineering/trlc.git",
)

# Toolchains and extensions
bazel_dep(name = "score_bazel_cpp_toolchains", version = "0.2.2", dev_dependency = True)
bazel_dep(name = "score_toolchains_rust", version = "0.4.0", dev_dependency = True)
Expand Down
Loading
Loading