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
16 changes: 16 additions & 0 deletions modules/gz-msgs/11.1.0.bcr.1/MODULE.bazel
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
## MODULE.bazel
module(
name = "gz-msgs",
version = "11.1.0.bcr.1",
compatibility_level = 11,
)

bazel_dep(name = "googletest", version = "1.14.0")
bazel_dep(name = "protobuf", version = "29.4", repo_name = "com_google_protobuf")
bazel_dep(name = "rules_license", version = "1.0.0")
bazel_dep(name = "rules_proto", version = "7.1.0")
bazel_dep(name = "rules_python", version = "0.36.0")
bazel_dep(name = "tinyxml2", version = "10.0.0")
bazel_dep(name = "rules_gazebo", version = "0.0.2")
bazel_dep(name = "gz-utils", version = "3.1.0")
bazel_dep(name = "gz-math", version = "8.1.1")
71 changes: 71 additions & 0 deletions modules/gz-msgs/11.1.0.bcr.1/patches/fix_clang_build.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
--- BUILD.bazel
+++ BUILD.bazel
@@ -58,9 +58,13 @@ cc_binary(
"core/generator_lite/Generator.hh",
"core/generator_lite/generator_main.cc",
],
+ visibility = ["//:__subpackages__"],
deps = [
"@com_google_protobuf//:protobuf",
"@com_google_protobuf//:protoc_lib",
+ "@com_google_protobuf//src/google/protobuf/compiler:code_generator",
+ "@com_google_protobuf//src/google/protobuf/io",
+ "@com_google_protobuf//src/google/protobuf/io:printer",
],
)

@@ -83,10 +87,18 @@ py_proto_library(

gz_proto_library(
name = "gzmsgs_cc_proto",
+ features = [
+ # Layering check fails for clang build due to no module exporting
+ # `port_def.inc` and `port_undef.inc`. Unfortunately, the bazel target
+ # that exports these headers in protobuf is private.
+ "-layering_check",
+ ],
proto_deps = [":gzmsgs_proto"],
visibility = ["//visibility:public"],
deps = [
"@com_google_protobuf//:protobuf",
+ "@com_google_protobuf//:protobuf_lite",
+ "@com_google_protobuf//src/google/protobuf/io",
],
)

@@ -128,7 +140,9 @@ cc_library(
":gzmsgs_proto_factory",
"@com_google_protobuf//:protobuf",
"@gz-math",
- "@gz-utils",
+ "@gz-utils//:Environment",
+ "@gz-utils//:ImplPtr",
+ "@gz-utils//:NeverDestroyed",
"@tinyxml2",
],
)
@@ -160,6 +174,7 @@ cc_test(
srcs = ["test/integration/headers.cc"],
deps = [
":gzmsgs_cc_proto",
+ "@googletest//:gtest",
"@googletest//:gtest_main",
],
)
@@ -169,6 +184,7 @@ cc_test(
srcs = ["test/integration/image_msg.cc"],
deps = [
":gzmsgs_cc_proto",
+ "@googletest//:gtest",
"@googletest//:gtest_main",
],
)
@@ -246,6 +262,7 @@ cc_binary(
visibility = ["//visibility:public"],
deps = [
":gz-msgs",
- "@gz-utils//cli",
+ "@gz-utils//cli:GzFormatter",
+ "@gz-utils//cli:cli11",
],
)
8 changes: 8 additions & 0 deletions modules/gz-msgs/11.1.0.bcr.1/patches/fix_tool_loads.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
--- tools/BUILD.bazel
+++ tools/BUILD.bazel
@@ -1,4 +1,5 @@
load("@rules_license//rules:license.bzl", "license")
+load("@rules_python//python:py_binary.bzl", "py_binary")

package(
default_applicable_licenses = ["//:license"],
35 changes: 35 additions & 0 deletions modules/gz-msgs/11.1.0.bcr.1/patches/module_dot_bazel.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
--- MODULE.bazel
+++ MODULE.bazel
@@ -1,7 +1,8 @@
## MODULE.bazel
module(
name = "gz-msgs",
- repo_name = "org_gazebosim_gz-msgs",
+ version = "11.1.0.bcr.1",
+ compatibility_level = 11,
)

bazel_dep(name = "googletest", version = "1.14.0")
@@ -10,20 +11,6 @@
bazel_dep(name = "rules_proto", version = "7.1.0")
bazel_dep(name = "rules_python", version = "0.36.0")
bazel_dep(name = "tinyxml2", version = "10.0.0")
-
-# Gazebo Dependencies
bazel_dep(name = "rules_gazebo", version = "0.0.2")
-bazel_dep(name = "gz-math")
-bazel_dep(name = "gz-utils")
-
-archive_override(
- module_name = "gz-math",
- strip_prefix = "gz-math-gz-math8",
- urls = ["https://github.com/gazebosim/gz-math/archive/refs/heads/gz-math8.tar.gz"],
-)
-
-archive_override(
- module_name = "gz-utils",
- strip_prefix = "gz-utils-gz-utils3",
- urls = ["https://github.com/gazebosim/gz-utils/archive/refs/heads/gz-utils3.tar.gz"],
-)
+bazel_dep(name = "gz-utils", version = "3.1.0")
+bazel_dep(name = "gz-math", version = "8.1.1")
20 changes: 20 additions & 0 deletions modules/gz-msgs/11.1.0.bcr.1/presubmit.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
matrix:
platform:
- ubuntu2004
- macos
- macos_arm64
bazel:
- 8.x
- 7.x
tasks:
verify_targets:
name: Verify build targets
platform: ${{ platform }}
bazel: ${{ bazel }}
build_flags:
- '--cxxopt=-std=c++17'
- '--host_cxxopt=-std=c++17'
build_targets:
- '@gz-msgs'
- '@gz-msgs//:cmd-gz-msgs'
- '@gz-msgs//:gzmsgs_cc_proto'
11 changes: 11 additions & 0 deletions modules/gz-msgs/11.1.0.bcr.1/source.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"url": "https://github.com/gazebosim/gz-msgs/archive/refs/tags/gz-msgs11_11.1.0.tar.gz",
"integrity": "sha256-HqpHUAqopvplvPds+NA8eNKY5tpzDuI3GxGd/3MrY50=",
"strip_prefix": "gz-msgs-gz-msgs11_11.1.0",
"patch_strip": 0,
"patches": {
"fix_clang_build.patch": "sha256-/bzgkrW6wyctTs1OjC/p4eXJ8axrcRP0Rc/J0WQyXcE=",
"fix_tool_loads.patch": "sha256-P+HDs3D3Lb43rF851AWP8lemPf2KY5QtilblnDDp+3E=",
"module_dot_bazel.patch": "sha256-BRRhNeQP8yhXiDPWIs31BbsYLCTBaY0HyamdNHvM26o="
}
}
3 changes: 2 additions & 1 deletion modules/gz-msgs/metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@
"github:gazebosim/gz-msgs"
],
"versions": [
"11.1.0"
"11.1.0",
"11.1.0.bcr.1"
],
"yanked_versions": {}
}
Loading